From f34695c63cb4a212671cd8c03721c0ed8cad3282 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 3 Aug 2011 10:45:37 +0000 Subject: [PATCH] #7266 removed dependencies from integration tests to Sampler: Liferay 5; fixed Liferay 5 portlet 2 integration test svn changeset:20096/svn branch:6.7 --- .../Liferay-5/Add_Sampler_to_Liferay.html | 97 ------------------- ...tegration-test-liferay-5.2.3-portlet2.html | 16 +-- ...ntegration-test-liferay-5.2.3-sampler.html | 82 ---------------- tests/integration_tests.xml | 49 +--------- 4 files changed, 10 insertions(+), 234 deletions(-) delete mode 100644 tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html delete mode 100644 tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html diff --git a/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html b/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html deleted file mode 100644 index 1148be05fe..0000000000 --- a/tests/integration-testscripts/Liferay-5/Add_Sampler_to_Liferay.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - -Add_Sampler_to_Liferay - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Add_Sampler_to_Liferay
open/web/guest
mouseClickAndWaitlink=Login as bruno48,8
mouseClick//div[@id='add-page']/a/span44,113
enterCharacternew_pagesampler
mouseClicklink=Save26,13
waitForElementPresent//div[@id='navigation']/ul/li[2]/a/span
mouseClickAndWaitlink=sampler39,25
mouseClicklink=Layout Template122,21
waitForElementPresentlayoutTemplateId1
mouseClicklayoutTemplateId165,78
mouseClickAndWaitdocument.forms[1].elements[14]23,12
mouseClicklink=Add Application76,18
waitForElementPresent//div[@id='Vaadin-Sampler']/p/a
mouseClick//div[@id='Vaadin-Sampler']/p/a9,8
pause500
waitForVaadin
- - diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html index 349c6fe806..4a1cb480b6 100644 --- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html +++ b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html @@ -38,12 +38,12 @@ waitForElementPresent - //div[@id='navigation']/ul/li[3]/a/span + //div[@id='navigation']/ul/li[2]/a/span mouseClickAndWait - //div[@id='navigation']/ul/li[3]/a/span + //div[@id='navigation']/ul/li[2]/a/span 19,8 @@ -93,32 +93,32 @@ mouseClick - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0] + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0] 24,10 click - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0] mouseClick - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1] + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1] 9,11 mouseClick - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8 + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8 158,17 click - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0] assertText - vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10714::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0] + vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0] New York diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html deleted file mode 100644 index 889dac5030..0000000000 --- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-sampler.html +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - -sampler_deployment_liferay - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sampler_deployment_liferay
open/web/guest/sampler
waitForVaadin
mouseClickvaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]9,12
waitForVaadin
pause500
mouseClickvaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]11,12
waitForVaadin
pause500
screenCapturetooltips
mouseClickvaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]11,12
waitForVaadin
pause500
screenCaptureicons
- - diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml index 71e8901137..1d6ba4fc9a 100644 --- a/tests/integration_tests.xml +++ b/tests/integration_tests.xml @@ -159,45 +159,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -205,7 +169,7 @@ - + @@ -527,15 +491,6 @@ - - - - - - - - - -- 2.39.5