Author: mvanco(a)redhat.com Date: 2010-05-10 10:46:08 -0400 (Mon, 10 May 2010) New Revision: 3029 Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 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_003_CreateNewPortalWithBlankName.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.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_SNF_PRL_18_CreateNewPortal.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html Log: EPP5 UI tests: removed function clickOnElement, added command fireEvent - calls default selenium.fireEvent(locator, event), changed usage in tests Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-05-10 14:46:08 UTC (rev 3029) @@ -422,9 +422,11 @@ sb.append("if (selenium.isTextPresent(\"" + param2 + "\")) {\n"); } else if (param1.equals("endIfTextPresentCondition")) { sb.append("}\n"); - } else if (param1.equals("clickOnElement")) { - sb.append("selenium.click(\""); + } else if (param1.equals("fireEvent")) { + sb.append("selenium.fireEvent(\""); sb.append(param2); + sb.append("\", \""); + sb.append(param3); sb.append("\");\n"); } else if (param1.length() > 0) { String message = param1 + " was not translated \"" + param2 + "\""; 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-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -137,11 +137,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -152,11 +152,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting--</td>p <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -147,11 +147,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting--</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -157,11 +157,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting--</td> <td></td> @@ -322,11 +327,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting--</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -157,11 +157,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting</td> <td></td> @@ -327,11 +332,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Choose Edit Permission Setting--</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -157,11 +157,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>echo</td> <td>--Edit Permission Setting--</td> <td></td> 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-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -252,11 +252,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Edit Permission Setting</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-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -102,11 +102,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -112,11 +112,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -102,11 +102,16 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Edit Permission Setting</td> <td></td> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html 2010-05-10 13:30:34 UTC (rev 3028) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html 2010-05-10 14:46:08 UTC (rev 3029) @@ -147,21 +147,31 @@ <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>pause</td> <td>3000</td> <td></td> </tr> <tr> - <td>clickOnElement</td> + <td>check</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>fireEvent</td> + <td>publicMode</td> + <td>click</td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Add Permission</td> <td></td>