Commit 4c1e7333 authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

officejs_ui_test: use clickAndWait in xhtml_style

The previous pattern of using click and then pause is fragile and seems
to be the cause for test failures.
parent 4a277d91
...@@ -454,20 +454,10 @@ ...@@ -454,20 +454,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -494,20 +484,10 @@ ...@@ -494,20 +484,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -334,20 +334,10 @@ ...@@ -334,20 +334,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -454,20 +454,10 @@ ...@@ -454,20 +454,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>2000</td> <td>2000</td>
...@@ -499,20 +489,10 @@ ...@@ -499,20 +489,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>pause</td> <td>pause</td>
<td>2000</td> <td>2000</td>
......
...@@ -454,20 +454,10 @@ ...@@ -454,20 +454,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -494,20 +484,10 @@ ...@@ -494,20 +484,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -367,20 +367,10 @@ For that I'm using this undocumented triggerOnKeyDown() method --> ...@@ -367,20 +367,10 @@ For that I'm using this undocumented triggerOnKeyDown() method -->
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -457,20 +457,10 @@ ...@@ -457,20 +457,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -497,20 +487,10 @@ ...@@ -497,20 +487,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -447,20 +447,10 @@ ...@@ -447,20 +447,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -487,20 +477,10 @@ ...@@ -487,20 +477,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -457,20 +457,10 @@ ...@@ -457,20 +457,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -497,20 +487,10 @@ ...@@ -497,20 +487,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -272,20 +272,10 @@ ...@@ -272,20 +272,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -454,20 +454,10 @@ ...@@ -454,20 +454,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -494,20 +484,10 @@ ...@@ -494,20 +484,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -444,20 +444,10 @@ ...@@ -444,20 +444,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -484,20 +474,10 @@ ...@@ -484,20 +474,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -159,20 +159,10 @@ ...@@ -159,20 +159,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>waitForElementPresent</td> <td>waitForElementPresent</td>
<td>//div[@class="listbox-container"]</td> <td>//div[@class="listbox-container"]</td>
......
...@@ -454,20 +454,10 @@ ...@@ -454,20 +454,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -494,20 +484,10 @@ ...@@ -494,20 +484,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -455,20 +455,10 @@ ...@@ -455,20 +455,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
...@@ -495,20 +485,10 @@ ...@@ -495,20 +485,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
...@@ -380,20 +380,10 @@ ...@@ -380,20 +380,10 @@
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
<td>click</td> <td>clickAndWait</td>
<td>//button[@title="Show All"]</td> <td>//button[@title="Show All"]</td>
<td></td> <td></td>
</tr> </tr>
<tr>
<td>pause</td>
<td>1000</td>
<td></td>
</tr>
<tr>
<td>waitForElementPresent</td>
<td>//input[@name="listbox_title"]</td>
<td></td>
</tr>
<tr> <tr>
<td>type</td> <td>type</td>
<td>name=listbox_title</td> <td>name=listbox_title</td>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment