Author: vuthelinh Date: 2010-07-06 21:55:00 -0400 (Tue, 06 Jul 2010) New Revision: 3587 Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html Log: Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-07-07 01:54:33 UTC (rev 3586) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-07-07 01:55:00 UTC (rev 3587) @@ -220,11 +220,21 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Site</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Site</td> <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Delete</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Delete</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-07-07 01:54:33 UTC (rev 3586) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_23_AddNavigation.html 2010-07-07 01:55:00 UTC (rev 3587) @@ -52,8 +52,8 @@ <td></td> </tr> <tr> - <td>open</td> - <td>/portal/private/classic/</td> + <td>waitForElementPresent</td> + <td>link=Group</td> <td></td> </tr> <tr> @@ -97,19 +97,24 @@ <td></td> </tr> <tr> + <td>refreshAndWait</td> + <td></td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-- Select group navigation which added --</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> + <td>//table[2]/tbody/tr/td[3]/a[1]</td> <td></td> </tr> <tr> - <td>click</td> - <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> - <td></td> + <td>clickAt</td> + <td>//table[2]/tbody/tr/td[3]/a[1]</td> + <td>1,1</td> </tr> <tr> <td>echo</td> @@ -217,6 +222,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>2000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UIGroupNavigationGrid']/table[2]/tbody/tr/td[3]/a[1]</td> <td></td> @@ -292,6 +302,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>assertConfirmation</td> <td>Are you sure to delete this navigation?</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-07-07 01:54:33 UTC (rev 3586) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_24_EditNavigationAndEditPropertiesAndDeleteInGroupNavigation.html 2010-07-07 01:55:00 UTC (rev 3587) @@ -52,6 +52,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Group</td> <td></td> @@ -182,6 +187,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Group</td> <td></td> @@ -223,12 +233,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> <td>mouseDownRight</td> - <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-07-07 01:54:33 UTC (rev 3586) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_25_EditPageOfNode.html 2010-07-07 01:55:00 UTC (rev 3587) @@ -57,6 +57,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Group</td> <td></td> @@ -167,6 +172,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='UIGroupNavigationGrid']/table[1]/tbody/tr/td[3]/a[1]</td> <td></td> @@ -177,23 +187,33 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='test_grp_label_25']</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='test_grp_label_25']</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> - <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td>link=Edit Node's Page</td> <td></td> </tr> <tr> <td>click</td> - <td>xpath=//div[@id='UINavigationNodeSelector']//div[@id='NavigationNodePopupMenu']//a[@class='ItemIcon EditPageNode16x16Icon']</td> + <td>link=Edit Node's Page</td> <td></td> </tr> <tr> @@ -268,15 +288,20 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='test_grp_label_25']</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> <td>mouseDownRight</td> - <td>//a[@class='NodeIcon DefaultPageIcon' and @title='test_grp_label_25']</td> + <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[2]/div[1]/a</td> <td></td> </tr> <tr> + <td>pause</td> + <td>1000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Delete Node</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html 2010-07-07 01:54:33 UTC (rev 3586) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_26_MoveUpAndDownANode.html 2010-07-07 01:55:00 UTC (rev 3587) @@ -217,6 +217,11 @@ <td></td> </tr> <tr> + <td>waitForElementNotPresent</td> + <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> + <td></td> +</tr> +<tr> <td>verifyElementNotPresent</td> <td>xpath=//div[@class='TreeContainer JSContainer']/div/div[${nodeLvl}]/div/a[@title='test_grp_label_26']</td> <td></td>