From b8c51727b67c378506a487808c7e4f27962010ed Mon Sep 17 00:00:00 2001 From: Mikael Grankvist Date: Tue, 22 Jun 2010 09:33:49 +0000 Subject: [PATCH] Changed test parallelisation from foreach to for Lifray test update svn changeset:13853/svn branch:6.4 --- .../Add_Sampler_to_Liferay.html | 16 ++++++++-------- .../sampler_deployment_liferay.html | 9 +++++++-- 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 @@ - + Add_Sampler_to_Liferay @@ -37,8 +37,8 @@ 26,13 - pause - 200 + waitForElementPresent + //div[@id='navigation']/ul/li[2]/a/span @@ -52,8 +52,8 @@ 122,21 - pause - 200 + waitForElementPresent + //div[1]/div[1]/span @@ -72,12 +72,12 @@ 76,18 - pause - 3000 + waitForElementPresent + //div[@id='Vaadin']/h2/span - mouseClickAndWait + mouseClick //div[@id='Vaadin-Sampler']/p/a 9,8 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 @@ -16,6 +16,11 @@ /web/guest/sampler + + waitForElementPresent + //div[@id='add-page']/a/span + + waitForVaadin @@ -43,7 +48,7 @@ mouseClick - vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] + vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] 11,12 @@ -63,7 +68,7 @@ mouseClick - vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] + vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0] 11,12 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 @@ - + @@ -106,11 +106,16 @@ - + - + + + + + + @@ -136,7 +141,7 @@ - + -- 2.39.5