summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorArtur Signell <artur.signell@itmill.com>2010-03-29 16:04:22 +0000
committerArtur Signell <artur.signell@itmill.com>2010-03-29 16:04:22 +0000
commit10bd115ada9b1143129b4e5df695f8a7f65c2aba (patch)
tree1e9f72b5ec3bb95545e481f608c8f305ac8c007d /tests/src
parent7daf49a7b470139a37ab50aa3b067140204be045 (diff)
downloadvaadin-framework-10bd115ada9b1143129b4e5df695f8a7f65c2aba.tar.gz
vaadin-framework-10bd115ada9b1143129b4e5df695f8a7f65c2aba.zip
Fixed Treefiltering testcase + new reference images
svn changeset:12198/svn branch:6.3
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/vaadin/tests/components/tree/TreeFiltering.html37
-rw-r--r--tests/src/com/vaadin/tests/components/tree/TreeFiltering.java2
2 files changed, 30 insertions, 9 deletions
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.html
index d65cd4d104..7c25eee75d 100644
--- 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>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -63,7 +63,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -77,11 +77,16 @@
<td>filter-0</td>
</tr>
<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>waitForVaadin</td>
+ <td></td>
<td></td>
</tr>
<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+ <td>69,10</td>
+</tr>
+<tr>
<td>waitForVaadin</td>
<td></td>
<td></td>
@@ -89,11 +94,26 @@
<tr>
<td>screenCapture</td>
<td></td>
- <td>filter-0-and-num</td>
+ <td>filter-0-no-parents</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VCheckBox[0]/domChild[0]</td>
+ <td>69,10</td>
+</tr>
+<tr>
+ <td>waitForVaadin</td>
+ <td></td>
+ <td></td>
</tr>
<tr>
<td>click</td>
- <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstreeTreeFiltering::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]</td>
<td></td>
</tr>
<tr>
@@ -104,9 +124,8 @@
<tr>
<td>screenCapture</td>
<td></td>
- <td>unfiltered</td>
+ <td>all-removed</td>
</tr>
-
</tbody></table>
</body>
</html>
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java
index 25d7a510f1..bea9fb3377 100644
--- 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 {
final CheckBox filterType = new CheckBox(
"Include parent when filtering", true);
+ filterType.setImmediate(true);
filterType.addListener(new ValueChangeListener() {
public void valueChange(ValueChangeEvent event) {
cont.setIncludeParentsWhenFiltering(((CheckBox) event
.getProperty()).booleanValue());
+ ccTree.requestRepaint();
}
});
addComponent(filterType);