Author: mvanco(a)redhat.com Date: 2010-05-04 02:54:38 -0400 (Tue, 04 May 2010) New Revision: 2955 Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html Log: EPP5 UI tests: improved tests 20_026, 09_002, 10_002, PRL_18 Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html 2010-05-04 06:23:41 UTC (rev 2954) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html 2010-05-04 06:54:38 UTC (rev 2955) @@ -207,16 +207,11 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td> - <td>Test_POR_09_002</td> + <td>waitForElementPresent</td> + <td>//td[@class='Content']/div[@class='Label' and text()='Test_POR_09_002']</td> + <td></td> </tr> <tr> - <td>verifyText</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td> - <td>Test_POR_09_002</td> -</tr> -<tr> <td>waitForElementPresent</td> <td>link=Home</td> <td></td> @@ -237,14 +232,14 @@ <td></td> </tr> <tr> - <td>waitForText</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td> - <td>Test_POR_09_002</td> + <td>waitForElementPresent</td> + <td>//td[@class='Content']/div[@class='Label' and text()='Test_POR_09_002']</td> + <td></td> </tr> <tr> - <td>verifyText</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[2]/div</td> - <td>Test_POR_09_002</td> + <td>verifyElementPresent</td> + <td>//td[@class='Content']/div[@class='Label' and text()='Test_POR_09_002']</td> + <td></td> </tr> <tr> <td>echo</td> @@ -268,7 +263,7 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_09_002')]</td> <td></td> </tr> <tr> @@ -278,7 +273,7 @@ </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_09_002')]</td> <td></td> </tr> <tr> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-05-04 06:23:41 UTC (rev 2954) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-05-04 06:54:38 UTC (rev 2955) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/public/classic</td> <td></td> </tr> <tr> @@ -22,6 +22,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -97,6 +102,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>name</td> + <td></td> +</tr> +<tr> <td>type</td> <td>name</td> <td>POR_20_026</td> @@ -157,6 +167,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Page Setting</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>portal::classic::POR_20_026</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Go to Site--</td> <td></td> @@ -227,22 +247,37 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Edit Permission Setting</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Select Permission</td> <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>link=Platform</td> <td></td> </tr> @@ -253,6 +288,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Administrators</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=exact:*</td> <td></td> </tr> @@ -287,11 +332,21 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>5000</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--View new portal</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Test_POR_20_026</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Test_POR_20_026</td> <td></td> @@ -412,16 +467,26 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>link=Save</td> + <td>waitForTextNotPresent</td> + <td>Page Setting</td> <td></td> </tr> <tr> + <td>waitForTextPresent</td> + <td>portal::Test_POR_20_026::POR_20_026</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Search new page created--</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> <td>type</td> <td>searchTerm</td> <td>POR_20_026</td> @@ -457,21 +522,11 @@ <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Do you want to delete this page?</td> <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> - <td></td> -</tr> -<tr> - <td>clickAt</td> - <td>xpath=//div[@id='UIPortalApplication']/div[@class='UIPopupWindow UIDragObject']//div[@class='MiddleLeftSideDecorator']//div[@class='UIPopupMessages']/div[@class='MessageActionBar']//a</td> - <td></td> -</tr> -<tr> <td>echo</td> <td>--Delete page of current portal--</td> <td></td> @@ -487,7 +542,7 @@ <td></td> </tr> <tr> - <td>assertConfirmation</td> + <td>waitForConfirmation</td> <td>Do you want to delete this page?</td> <td></td> </tr> @@ -508,7 +563,7 @@ </tr> <tr> <td>open</td> - <td>/portal/private/classic/</td> + <td>/portal/private/classic</td> <td></td> </tr> <tr> @@ -528,12 +583,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_20_026')]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]/tbody/tr/td[3]/a[4]</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=Test_POR_20_026')]</td> <td></td> </tr> <tr> @@ -556,6 +611,16 @@ <td>Test_POR_20_026</td> <td></td> </tr> +<tr> + <td>waitForElementPresent</td> + <td>link=Sign out</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>link=Sign out</td> + <td></td> +</tr> </tbody></table> </body> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-05-04 06:23:41 UTC (rev 2954) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_25_05_002_CutPasteNodeToSameNavigation.html 2010-05-04 06:54:38 UTC (rev 2955) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/public/classic</td> <td></td> </tr> <tr> @@ -137,6 +137,16 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Navigation Management</td> + <td></td> +</tr> +<tr> + <td>pause</td> + <td>3000</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Move node back to original place--</td> <td></td> @@ -182,6 +192,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>2000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Paste Node</td> <td></td> @@ -203,6 +218,11 @@ <td></td> </tr> <tr> + <td>waitForTextNotPresent</td> + <td>Navigation Management</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>--Sign out --</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-05-04 06:23:41 UTC (rev 2954) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-05-04 06:54:38 UTC (rev 2955) @@ -13,7 +13,7 @@ </thead><tbody> <tr> <td>open</td> - <td>/portal/public/classic/</td> + <td>/portal/public/classic</td> <td></td> </tr> <tr> @@ -22,6 +22,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Sign in</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Sign in</td> <td></td> @@ -57,8 +62,13 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Add New Portal</td> + <td></td> +</tr> +<tr> <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']//div[@class='UIAction']//div[@class='ActionButton BlueButton']</td> + <td>link=Add New Portal</td> <td></td> </tr> <tr> @@ -87,21 +97,41 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>publicMode</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Edit Permission Setting</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Edit Permission Setting</td> <td>1,1</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Select Permission</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Select Permission</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Platform</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>link=Platform</td> <td>1,1</td> @@ -132,6 +162,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> + <td>1,1</td> +</tr> +<tr> <td>clickAt</td> <td>xpath=//form[@id='UIPortalForm']//div[@class='UIAction']//div[@class='ActionButton LightBlueStyle']//div[@class='ButtonMiddle']/a</td> <td>1,1</td> @@ -178,12 +213,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UISiteManagement']/table/tbody/tr/td[2]/div</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=test_portal_18')]</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@id='UISiteManagement']/table[2]//a[@class='DeleteIcon']</td> + <td>//a[@class='DeleteIcon' and contains(@href, 'op=DeletePortal&objectId=test_portal_18')]</td> <td></td> </tr> <tr> @@ -192,11 +227,6 @@ <td></td> </tr> <tr> - <td>pause</td> - <td>5000</td> - <td></td> -</tr> -<tr> <td>waitForTextNotPresent</td> <td>test_portal_18</td> <td></td>