Fixed Treefiltering testcase + new reference images

svn changeset:12198/svn branch:6.3

diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
index d65cd4d1042ab86c111d0cf878f3aa3d4d96ff93..7c25eee75de6ed4352727a794b1a0a6029fc6e19 100644 (file)
--- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
+++ b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
@@ -33,7 +33,7 @@
 </tr>\r
 <tr>\r
        <td>click</td>\r
-       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]</td>\r
        <td></td>\r
 </tr>\r
 <tr>\r
@@ -48,7 +48,7 @@
 </tr>\r
 <tr>\r
        <td>click</td>\r
-       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VButton[0]/domChild[0]/domChild[0]</td>\r
        <td></td>\r
 </tr>\r
 <tr>\r
@@ -63,7 +63,7 @@
 </tr>\r
 <tr>\r
        <td>click</td>\r
-       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>\r
        <td></td>\r
 </tr>\r
 <tr>\r
@@ -77,10 +77,15 @@
        <td>filter-0</td>\r
 </tr>\r
 <tr>\r
-       <td>click</td>\r
-       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>\r
+       <td>waitForVaadin</td>\r
+       <td></td>\r
        <td></td>\r
 </tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>\r
+       <td>69,10</td>\r
+</tr>\r
 <tr>\r
        <td>waitForVaadin</td>\r
        <td></td>\r
@@ -89,11 +94,26 @@
 <tr>\r
        <td>screenCapture</td>\r
        <td></td>\r
-       <td>filter-0-and-num</td>\r
+       <td>filter-0-no-parents</td>\r
+</tr>\r
+<tr>\r
+       <td>waitForVaadin</td>\r
+       <td></td>\r
+       <td></td>\r
+</tr>\r
+<tr>\r
+       <td>mouseClick</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>\r
+       <td>69,10</td>\r
+</tr>\r
+<tr>\r
+       <td>waitForVaadin</td>\r
+       <td></td>\r
+       <td></td>\r
 </tr>\r
 <tr>\r
        <td>click</td>\r
-       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]</td>\r
+       <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]</td>\r
        <td></td>\r
 </tr>\r
 <tr>\r
@@ -104,9 +124,8 @@
 <tr>\r
        <td>screenCapture</td>\r
        <td></td>\r
-       <td>unfiltered</td>\r
+       <td>all-removed</td>\r
 </tr>\r
-\r
 </tbody></table>\r
 </body>\r
 </html>\r

diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java
index 25d7a510f18ca1251ae44f80209812a7a09b1025..bea9fb3377fda847e6cb6e6d6e3c0a7e4f993ad9 100644 (file)
--- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java
+++ b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java
@@ -44,11 +44,13 @@ public class TreeFiltering extends TestBase {
 \r
         final CheckBox filterType = new CheckBox(\r
                 "Include parent when filtering", true);\r
+        filterType.setImmediate(true);\r
         filterType.addListener(new ValueChangeListener() {\r
 \r
             public void valueChange(ValueChangeEvent event) {\r
                 cont.setIncludeParentsWhenFiltering(((CheckBox) event\r
                         .getProperty()).booleanValue());\r
+                ccTree.requestRepaint();\r
             }\r
         });\r
         addComponent(filterType);\r