]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7e2d226)
Fixes tests broken by accessability fixes #11874 and #11820
authorJohn Ahlroos <john@vaadin.com>
Thu, 15 Aug 2013 06:32:54 +0000 (09:32 +0300)
committerJohn Ahlroos <john@vaadin.com>
Thu, 15 Aug 2013 06:55:18 +0000 (09:55 +0300)
Both WAI-ARIA fixes improves the accessability by adding a hidden
element into the dom for the screen readers. Unfortunatly this
broke tests based on a certain DOM path.

Change-Id: I64631f22d7ef0bbb840131802dab1e50e9dac913

uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html patch | blob | history
uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html patch | blob | history
uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html patch | blob | history
uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html patch | blob | history
uitest/src/com/vaadin/tests/components/uitest/UIScrollTest.html patch | blob | history
uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html patch | blob | history
uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html patch | blob | history

diff --git a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
index f20967c8de86f04f24742914e7006d06dc683bc8..e7d437eeca5e7915acb6fa86c0e46984550db653 100644 (file)
--- a/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
+++ b/uitest/src/com/vaadin/tests/application/TerminalErrorNotification.html
@@ -28,7 +28,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestsapplicationTerminalErrorNotification::Root/VNotification[0]/HTML[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestsapplicationTerminalErrorNotification::Root/VNotification[0]/HTML[0]/domChild[1]</td>
        <td>Got an exception: You asked for it</td>
 </tr>
 </tbody></table>
diff --git a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html
index e03027f308ddc94a1bddb5e307fcdbac9956c140..150ab3ff3db738864d9edb75636fe6396c6454ff 100644 (file)
--- a/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html
+++ b/uitest/src/com/vaadin/tests/application/VaadinSessionAttribute.html
@@ -23,7 +23,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>//body/div[2]</td>
+       <td>//body/div[2]//h1</td>
        <td>42 &amp; 84</td>
 </tr>
 </tbody></table>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index bab6c8dc163cd82917b6e7ad496b9067879da1c5..e24f4ddca48d4e200733908e57bb09209ecdf97c 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
@@ -33,7 +33,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]/HTML[0]/domChild[1]</td>
        <td>TF Value on the server:fooo</td>
 </tr>
 <tr>
@@ -63,7 +63,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]/HTML[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]/HTML[0]/domChild[1]</td>
        <td>TF Value on the server:baar</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html b/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
index c2481e6be6ff096899d0758e450e1e4e1f2126ac..441324bb6afea139990f77d8b80b8dc3b128bb95 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableWithBrokenGeneratorAndContainer.html
@@ -3,7 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:9999/" />
 <title>TableWithBrokenGeneratorAndContainer</title>
 </head>
 <body>
@@ -163,7 +162,7 @@
 <!--error notification-->
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentstableTableWithBrokenGeneratorAndContainer::Root/VNotification[0]/HTML[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentstableTableWithBrokenGeneratorAndContainer::Root/VNotification[0]/HTML[0]/domChild[1]</td>
        <td>Problem updating table. Please try again later</td>
 </tr>
 <!--table should be empty-->
diff --git a/uitest/src/com/vaadin/tests/components/uitest/UIScrollTest.html b/uitest/src/com/vaadin/tests/components/uitest/UIScrollTest.html
index b5326e4660a5c46628e8bed21e715bd2878e13ae..acbe30c5d23dc54fdb271555fd287d6e469c9504 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/uitest/UIScrollTest.html
+++ b/uitest/src/com/vaadin/tests/components/uitest/UIScrollTest.html
@@ -43,7 +43,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>//div[@id='runcomvaadintestscomponentsuitestUIScrollTest-1797389287-overlays']/div</td>
+       <td>//div[@id='runcomvaadintestscomponentsuitestUIScrollTest-1797389287-overlays']//h1</td>
        <td>Scrolled to 1020 px</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
index a9a6fd621e29df1f6da350423c3e623d4290b645..85ab67e4f65873f34bf61924ecee27010fe135d9 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowCaptionTest.html
@@ -3,7 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://arturwin.office.itmill.com:8888/" />
 <title>New Test</title>
 </head>
 <body>
@@ -18,7 +17,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>Short</td>
 </tr>
 <tr>
@@ -43,7 +42,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>This is a semi-long text that might wrap.</td>
 </tr>
 <tr>
@@ -68,7 +67,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td></td>
 </tr>
 
diff --git a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html b/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
index dcdfa05687b43348ac5e75ddc469b7b62cd14e1a..a27963a06668af2c9a42b6883da8ea198e282e2c 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
+++ b/uitest/src/com/vaadin/tests/components/window/WindowMaximizeRestoreTest.html
@@ -3,7 +3,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8888/run/" />
 <title>WindowMaximizeRestoreTest</title>
 </head>
 <body>
@@ -19,59 +18,59 @@
 <!--Test maximize-restore button-->
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>Window 1</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>7,8</td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-restorebox</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>9,7</td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <!--test double click on header-->
 <tr>
        <td>doubleClickAt</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-restorebox</td>
 </tr>
 <tr>
        <td>doubleClickAt</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <!--Resizable = false should hide max-restore button-->
 <tr>
        <td>assertVisible</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td></td>
 </tr>
 <tr>
@@ -81,7 +80,7 @@
 </tr>
 <tr>
        <td>assertNotVisible</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td></td>
 </tr>
 <!--Test server side max-restore-->
@@ -92,7 +91,7 @@
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-restorebox</td>
 </tr>
 <tr>
@@ -102,28 +101,28 @@
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <!--test double click on header doesn't work-->
 <tr>
        <td>doubleClickAt</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <tr>
        <td>doubleClickAt</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertCSSClass</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>v-window-maximizebox</td>
 </tr>
 <tr>
@@ -149,7 +148,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>10,8</td>
 </tr>
 <tr>
@@ -175,7 +174,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>6,11</td>
 </tr>
 <tr>
@@ -185,7 +184,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[2]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[3]</td>
        <td>7,5</td>
 </tr>
 <tr>
@@ -210,12 +209,12 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[1]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>6,11</td>
 </tr>
 <tr>
        <td>doubleClickAt</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>113,10</td>
 </tr>
 <tr>
@@ -226,27 +225,27 @@
 <!--Test that size and position is preserved when maximizing and restoring-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>8,4</td>
 </tr>
 <tr>
        <td>dragAndDrop</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>-200,-200</td>
 </tr>
 <tr>
        <td>dragAndDrop</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[4]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]</td>
        <td>+100,+100</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>6,5</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[1]</td>
+       <td>vaadin=runcomvaadintestscomponentswindowWindowMaximizeRestoreTest::/VWindow[0]/domChild[0]/domChild[0]/domChild[2]</td>
        <td>5,8</td>
 </tr>
 <tr>
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework