diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-22 09:33:49 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-22 09:33:49 +0000 |
| commit | b8c51727b67c378506a487808c7e4f27962010ed (patch) | |
| tree | a2d397a75ca0f9ed8066e2d7c48fdb7cd563ea93 /tests/integration-testscripts | |
| parent | a021d2727fefac758919367a4f27b1032ec5f94e (diff) | |
| download | vaadin-framework-b8c51727b67c378506a487808c7e4f27962010ed.tar.gz vaadin-framework-b8c51727b67c378506a487808c7e4f27962010ed.zip | |
Changed test parallelisation from foreach to for
Lifray test update
svn changeset:13853/svn branch:6.4
Diffstat (limited to 'tests/integration-testscripts')
| -rw-r--r-- | tests/integration-testscripts/Add_Sampler_to_Liferay.html | 16 | ||||
| -rw-r--r-- | tests/integration-testscripts/sampler_deployment_liferay.html | 9 |
2 files changed, 15 insertions, 10 deletions
diff --git a/tests/integration-testscripts/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Add_Sampler_to_Liferay.html index cf17217c22..7a2a759c82 100644 --- a/tests/integration-testscripts/Add_Sampler_to_Liferay.html +++ b/tests/integration-testscripts/Add_Sampler_to_Liferay.html @@ -3,7 +3,7 @@ <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://192.168.56.102:8080/" /> +<link rel="selenium.base" href="http://rndtestlinux.office.itmill.com:8080/" /> <title>Add_Sampler_to_Liferay</title> </head> <body> @@ -37,8 +37,8 @@ <td>26,13</td> </tr> <tr> - <td>pause</td> - <td>200</td> + <td>waitForElementPresent</td> + <td>//div[@id='navigation']/ul/li[2]/a/span</td> <td></td> </tr> <tr> @@ -52,8 +52,8 @@ <td>122,21</td> </tr> <tr> - <td>pause</td> - <td>200</td> + <td>waitForElementPresent</td> + <td>//div[1]/div[1]/span</td> <td></td> </tr> <tr> @@ -72,12 +72,12 @@ <td>76,18</td> </tr> <tr> - <td>pause</td> - <td>3000</td> + <td>waitForElementPresent</td> + <td>//div[@id='Vaadin']/h2/span</td> <td></td> </tr> <tr> - <td>mouseClickAndWait</td> + <td>mouseClick</td> <td>//div[@id='Vaadin-Sampler']/p/a</td> <td>9,8</td> </tr> diff --git a/tests/integration-testscripts/sampler_deployment_liferay.html b/tests/integration-testscripts/sampler_deployment_liferay.html index 72eaa21371..3ac9b306e8 100644 --- a/tests/integration-testscripts/sampler_deployment_liferay.html +++ b/tests/integration-testscripts/sampler_deployment_liferay.html @@ -17,6 +17,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[@id='add-page']/a/span</td> + <td></td> +</tr> +<tr> <td>waitForVaadin</td> <td></td> <td></td> @@ -43,7 +48,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> + <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,12</td> </tr> <tr> @@ -63,7 +68,7 @@ </tr> <tr> <td>mouseClick</td> - <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> + <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>11,12</td> </tr> <tr> |