diff options
| -rw-r--r-- | tests/integration-testscripts/Add_Sampler_to_Liferay.html | 16 | ||||
| -rw-r--r-- | tests/integration-testscripts/sampler_deployment_liferay.html | 9 | ||||
| -rw-r--r-- | tests/test.xml | 13 |
3 files changed, 24 insertions, 14 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> diff --git a/tests/test.xml b/tests/test.xml index 24db864588..82ccad9730 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -17,7 +17,7 @@ <property name="test-output-dir" value="../build/test-output" /> <property name="class-dir" value="${test-output-dir}/classes" /> - <taskdef resource="net/sf/antcontrib/antcontrib.properties"> + <taskdef resource="net/sf/antcontrib/antlib.xml"> <classpath> <pathelement location="../build/lib/ant-contrib-1.0b3.jar"/> </classpath> @@ -106,11 +106,16 @@ </target> <target name="run-tests" depends="compile-tests" if="server.start.succeeded"> - <foreach maxthreads="20" parallel="true" target="execute-tests" param="target"> + <for threadCount="20" parallel="true" keepgoing="true" param="target"> <path> <fileset dir="${test-output-dir}" includes="**/**.java" /> </path> - </foreach> + <sequential> + <antcall target="execute-tests"> + <param name="target" value="@{target}" /> + </antcall> + </sequential> + </for> </target> <!-- This target runs the generated and compiled junit tests --> @@ -136,7 +141,7 @@ <filelist dir="${test-output-dir}" files="${target}" /> </batchtest> </junit> - + </target> <!-- Remove temporary source and compiled java files --> |