changeset 28:e424915d876f

merge
author Alexandre (Shura) Iline <alexandre.iline@sun.com>
date Thu, 14 Jun 2012 23:58:26 +0400
parents 47f7c93c8605 6ec444f9f17d
children fe969660ac2e
files tools/Jemmy/JemmyFX/nbproject/build-impl.xml tools/Jemmy/JemmyFX/nbproject/genfiles.properties tools/Jemmy/JemmyFX/nbproject/project.properties tools/Jemmy/JemmyFX/nbproject/project.xml tools/Jemmy/JemmyFX/test/org/jemmy/fx/control/TreeApp.java
diffstat 3 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/tools/Jemmy/JemmyFX/nbproject/project.properties	Thu Jun 14 23:47:38 2012 +0400
+++ b/tools/Jemmy/JemmyFX/nbproject/project.properties	Thu Jun 14 23:58:26 2012 +0400
@@ -72,8 +72,10 @@
 platform.active=default_platform
 project.GlassImage=../GlassImage
 project.GlassRobot=../GlassRobot
+project.JemmyFXBrowser=../JemmyFXBrowser
 reference.GlassImage.jar=${project.GlassImage}/dist/GlassImage.jar
 reference.GlassRobot.jar=${project.GlassRobot}/dist/GlassRobot.jar
+reference.JemmyFXBrowser.jar=${project.JemmyFXBrowser}/dist/JemmyFXBrowser.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -136,7 +138,9 @@
     ${reference.GlassRobot.jar}:\
     ${file.reference.JemmyBrowser.jar}:\
     ${file.reference.JemmyCore.jar}:\
-    ${file.reference.junit.jar}
+    ${file.reference.junit.jar}:\
+    ${reference.GlassImage.jar}:\
+    ${reference.GlassRobot.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-processor org.jemmy.dock.DockGenerator -s ${basedir}/docks
 javac.deprecation=false
@@ -146,7 +150,8 @@
 javac.target=1.5
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}
+    ${build.classes.dir}:\
+    ${reference.JemmyFXBrowser.jar}
 javadoc.additionalparam=
 javadoc.author=false
 javadoc.encoding=${source.encoding}
--- a/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/TextInputControlWrap.java	Thu Jun 14 23:47:38 2012 +0400
+++ b/tools/Jemmy/JemmyFX/src/org/jemmy/fx/control/TextInputControlWrap.java	Thu Jun 14 23:58:26 2012 +0400
@@ -55,8 +55,8 @@
     }
 
     public static final String IS_FOCUSED_PROP_NAME = "isFocused";
-    SelectionText inputter;
-    TextInputFocus focus = null;
+    private SelectionText inputter;
+    private TextInputFocus focus = null;
 
     /**
      *
@@ -232,6 +232,7 @@
         return inputter.selection();
     }
 
+    @Override
     public Focus focuser() {
         if(focus == null) {
             focus = new TextInputFocus();
--- a/tools/Jemmy/JemmyFX/test/org/jemmy/fx/control/TreeTest.java	Thu Jun 14 23:47:38 2012 +0400
+++ b/tools/Jemmy/JemmyFX/test/org/jemmy/fx/control/TreeTest.java	Thu Jun 14 23:58:26 2012 +0400
@@ -75,11 +75,12 @@
     public void tearDown() {
     }
 
-    //@Test
+    @Test
     public void lookup() {
         new ScrollBarDock(tree.wrap().as(Parent.class, Node.class)).asScroll().caret().to(0);
-        assertTrue(3
-                < tree.asItemParent().
+        new TreeItemDock(tree.asItemParent(), new EqualsLookup("01")).asTreeItem().expand();
+        assertTrue(2
+                <= tree.asItemParent().
                 lookup(new ByToStringLookup<Object>("01", StringComparePolicy.SUBSTRING)).size());
         assertEquals(1,
                 tree.asItemParent().
@@ -98,7 +99,7 @@
         }
     }
 
-    //@Test
+    @Test
     public void tree() {
         tree.asTree().selector().select(new ByToStringLookup("0"));
         assertEquals("000", tree.asTree().selector().select(new ByToStringLookup("00"), new ByToStringLookup("000")).getControl());
@@ -109,7 +110,7 @@
         assertEquals("023", tree.asTree().selector().select(new ByToStringLookup("02"), new ByToStringLookup("023")).getControl());
     }
 
-    //@Test
+    @Test
     public void collapseAll() {
         new TreeItemDock(tree.asItemParent(), new EqualsLookup("0")).asTreeItem().expand();
         new TreeItemDock(tree.asItemParent(), new EqualsLookup("02")).asTreeItem().expand();
@@ -125,7 +126,7 @@
         new TreeItemDock(tree.asItemParent(), new EqualsLookup("02")).asTreeItem().expand();
     }
 
-    //@Test
+    @Test
     public void edit() {
         tree.asItemParent().setEditor(new TextFieldCellEditor());
         tree.asTree().selector().select(new ByToStringLookup("00"), new ByToStringLookup("00c"));
@@ -144,7 +145,7 @@
         assertEquals(3, tree.wrap().getControl().getSelectionModel().getSelectedItems().size());
     }
 
-    //@Test
+    @Test
     public void wrap() {
         Parent<String> p = tree.wrap().as(Parent.class, String.class);
         p.lookup().size();