[gatein-commits] gatein SVN: r3026 - in portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src: suite/org/exoplatform/portal/selenium and 1 other directory.

Author: mvanco(a)redhat.com Date: 2010-05-10 08:58:15 -0400 (Mon, 10 May 2010) New Revision: 3026 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_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html Log: EPP5 UI tests: added new function clickOnElement - use when clicking on checkboxes (publicMode) - simply click causes failures at IEs 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-05-10 12:58:15 UTC (rev 3026) @@ -90,14 +90,14 @@ sb.append("public String speed = \"100\";\n"); sb.append("public String timeout = \"30000\";\n"); sb.append("public int timeoutSecInt = 30;\n"); - sb.append("public String browser = \"firefox\";\n"); + sb.append("public String browser = \"firefox\";\n"); sb.append("public String host = \"localhost\";\n"); sb.append("public void setSpeed() {\n selenium.setSpeed(speed);\n}\n\n"); sb.append("public void setUp() throws Exception {\n"); sb.append(" browser = System.getProperty(\"selenium.browser\", browser);\n"); sb.append(" timeout = System.getProperty(\"selenium.timeout\", timeout);\n"); sb.append(" timeoutSecInt = Integer.parseInt(timeout)/1000;\n"); - sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n"); + sb.append(" speed = System.getProperty(\"selenium.speed\", speed);\n"); sb.append(" host = System.getProperty(\"selenium.host\", host);\n"); sb.append(" super.setUp(\"http://\" + host + \":8080/portal/\", \"*\" + browser);\n"); sb.append("}\n\n"); @@ -290,7 +290,7 @@ sb.append(param2); sb.append("\")) \nbreak; }\n catch (Exception e) {}\n"); sb.append("Thread.sleep(1000);\n"); - sb.append("}\n"); + sb.append("}\n"); } else if (param1.equals("waitForTextNotPresent")) { sb.append("for (int second = 0;; second++) {\n"); sb.append(getTimeoutMessage(param1)); @@ -298,7 +298,7 @@ sb.append(param2); sb.append("\")) \nbreak; }\n catch (Exception e) {}\n"); sb.append("Thread.sleep(1000);\n"); - sb.append("}\n"); + sb.append("}\n"); } else if (param1.equals("waitForTable")) { sb.append("for (int second = 0;; second++) {\n"); sb.append(getTimeoutMessage(param1)); @@ -422,6 +422,10 @@ sb.append("if (selenium.isTextPresent(\"" + param2 + "\")) {\n"); } else if (param1.equals("endIfTextPresentCondition")) { sb.append("}\n"); + } else if (param1.equals("clickOnElement")) { + sb.append("selenium.click(\""); + sb.append(param2); + sb.append("\");\n"); } else if (param1.length() > 0) { String message = param1 + " was not translated \"" + param2 + "\""; System.err.println("[ERROR] " + message); @@ -524,4 +528,4 @@ private static final String[] _FIX_PARAM_NEW_SUBS = new String[] { "\\n", "\\n" }; public static final String SLASH = "/"; -} +} 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_002_CreateNewPortalWithValidValue.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -137,7 +137,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_003_CreateNewPortalWithBlankName.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -152,13 +152,13 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> <tr> <td>echo</td> - <td>--Choose Edit Permission Setting--</td> + <td>--Choose Edit Permission Setting--</td>p <td></td> </tr> <tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_004_CreateNewPortalWithNameStartNumber.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -147,7 +147,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_008_CreateNewPortalWithNameIsTheSameWithExistingOne.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> @@ -322,7 +322,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_09_009_CreateNewPortalWithPortalNameTheSameWithExistingButDifferentByLowerAndUpperCase.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> @@ -322,11 +322,16 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>waitForElementPresent</td> <td>publicMode</td> <td></td> </tr> <tr> + <td>clickOnElement</td> + <td>publicMode</td> + <td></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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_10_002_DeleteCurrentPortalByLegalUser.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </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-10 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -252,7 +252,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_18_CreateNewPortal.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -112,7 +112,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> 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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -102,7 +102,7 @@ <td></td> </tr> <tr> - <td>clickAt</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> Modified: portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html =================================================================== --- portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-05-10 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_22_CreateAndEditPageAndEditSiteLayoutForPortal.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -113,12 +113,12 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Users</td> + <td>link=Administrators</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>link=Users</td> + <td>link=Administrators</td> <td></td> </tr> <tr> @@ -217,6 +217,21 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>link=Save</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>Portal Setting</td> + <td></td> +</tr> +<tr> <td>clickAt</td> <td>xpath=//div[@id='UIPortalComposer']//a[@class='EdittedSaveButton']</td> <td>1,1</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 12:30:58 UTC (rev 3025) +++ portal/branches/EPP_5_0_Branch/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_VerifyViewRightsPortlet.html 2010-05-10 12:58:15 UTC (rev 3026) @@ -147,7 +147,7 @@ <td></td> </tr> <tr> - <td>click</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr> @@ -157,7 +157,7 @@ <td></td> </tr> <tr> - <td>click</td> + <td>clickOnElement</td> <td>publicMode</td> <td></td> </tr>