diff options
| author | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-24 06:15:05 +0000 |
|---|---|---|
| committer | Mikael Grankvist <mikael.grankvist@itmill.com> | 2010-06-24 06:15:05 +0000 |
| commit | 6b6663f6333f05c3fdc10bd25520d3bdf4192480 (patch) | |
| tree | 6b5979f52146e8b603744c4466a480c5c21d59dd | |
| parent | 82a2d57c5417977c60fc3a57eceb88abd25b1780 (diff) | |
| download | vaadin-framework-6b6663f6333f05c3fdc10bd25520d3bdf4192480.tar.gz vaadin-framework-6b6663f6333f05c3fdc10bd25520d3bdf4192480.zip | |
Added fork to test javac task.
Liferay test target and timing changes.
svn changeset:13884/svn branch:6.4
| -rw-r--r-- | tests/integration-testscripts/Add_Sampler_to_Liferay.html | 14 | ||||
| -rw-r--r-- | tests/integration-testscripts/sampler_deployment_liferay.html | 7 | ||||
| -rw-r--r-- | tests/test.xml | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/tests/integration-testscripts/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Add_Sampler_to_Liferay.html index 7a2a759c82..09a3b7b02a 100644 --- a/tests/integration-testscripts/Add_Sampler_to_Liferay.html +++ b/tests/integration-testscripts/Add_Sampler_to_Liferay.html @@ -53,7 +53,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[1]/div[1]/span</td> + <td>layoutTemplateId1</td> <td></td> </tr> <tr> @@ -73,7 +73,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='Vaadin']/h2/span</td> + <td>//div[@id='Vaadin-Sampler']/p/a</td> <td></td> </tr> <tr> @@ -81,6 +81,16 @@ <td>//div[@id='Vaadin-Sampler']/p/a</td> <td>9,8</td> </tr> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>waitForVaadin</td> + <td></td> + <td></td> +</tr> </tbody></table> </body> diff --git a/tests/integration-testscripts/sampler_deployment_liferay.html b/tests/integration-testscripts/sampler_deployment_liferay.html index 3ac9b306e8..48ba029153 100644 --- a/tests/integration-testscripts/sampler_deployment_liferay.html +++ b/tests/integration-testscripts/sampler_deployment_liferay.html @@ -17,18 +17,13 @@ <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> </tr> <tr> <td>mouseClick</td> - <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> + <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td> <td>9,12</td> </tr> <tr> diff --git a/tests/test.xml b/tests/test.xml index 82ccad9730..cd17e85022 100644 --- a/tests/test.xml +++ b/tests/test.xml @@ -52,7 +52,7 @@ <!-- This target complies the generated java junit tests. --> <target name="compile-tests" depends="create-tests"> <mkdir dir="${class-dir}" /> - <javac srcdir="${test-output-dir}" destdir="${class-dir}" debug="on"> + <javac srcdir="${test-output-dir}" destdir="${class-dir}" debug="on" fork="yes"> <classpath> <path refid="classpath" /> </classpath> |