Author: mvanco(a)redhat.com Date: 2010-03-25 08:10:07 -0400 (Thu, 25 Mar 2010) New Revision: 2365 Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 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_21_ChangeUsingPortal.html Log: GTNPORTAL-960 - selenium.host variable to run tests on any host, fixed tests: Test_POR_14_01_043, Test_SNF_PRL_20, Test_POR_20_026, Test_SNF_PRL_21 - speed issues with other DBs, added waiting on needed place, removed useless waiting Modified: portal/trunk/testsuite/selenium-snifftests/pom.xml =================================================================== --- portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/pom.xml 2010-03-25 12:10:07 UTC (rev 2365) @@ -17,6 +17,7 @@ <selenium.browser>firefox</selenium.browser> <selenium.timeout>10000</selenium.timeout> <selenium.speed>300</selenium.speed> + <selenium.host>localhost</selenium.host> <org.selenium.maven-plugin.version>1.0</org.selenium.maven-plugin.version> </properties> @@ -147,6 +148,10 @@ <name>selenium.timeout</name> <value>${selenium.timeout}</value> </property> + <property> + <name>selenium.host</name> + <value>${selenium.host}</value> + </property> </systemProperties> </configuration> </execution> Modified: portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-25 12:10:07 UTC (rev 2365) @@ -90,14 +90,16 @@ 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(" super.setUp(\"http://localhost:8080/portal/\", \"*\" + browser);\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"); } Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html 2010-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_14_01_043_CheckShowSiteEditorMenu.html 2010-03-25 12:10:07 UTC (rev 2365) @@ -603,25 +603,40 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>link=Group</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> <td>clickAt</td> - <td>link=Group</td> + <td>link=Users and groups management</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> - <td>link=Users and groups management</td> + <td>searchTerm</td> <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Users and groups management</td> + <td>type</td> + <td>searchTerm</td> + <td>POR_14_043</td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=User Name</td> +</tr> +<tr> + <td>click</td> + <td>xpath=//form[@id='UISearchForm']/div[2]/a</td> <td></td> </tr> <tr> + <td>pause</td> + <td>5000</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>xpath=//img[@alt='DeleteUser']</td> <td></td> @@ -637,6 +652,16 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>5000</td> + <td></td> +</tr> +<tr> + <td>waitForTextNotPresent</td> + <td>POR_14_043</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Sign out</td> <td></td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_POR_20_026_CreateSameNamePortalPagesInDifferentPortals.html 2010-03-25 12:10:07 UTC (rev 2365) @@ -487,6 +487,11 @@ <td></td> </tr> <tr> + <td>open</td> + <td>/portal/private/classic/</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Site</td> <td></td> @@ -517,6 +522,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>5000</td> + <td></td> +</tr> +<tr> <td>waitForTextNotPresent</td> <td>Test_POR_20_026</td> <td></td> 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-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_20_DeletePortal.html 2010-03-25 12:10:07 UTC (rev 2365) @@ -179,7 +179,7 @@ <tr> <td>verifyTextPresent</td> <td>test_portal_name_20</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>echo</td> @@ -202,6 +202,11 @@ <td></td> </tr> <tr> + <td>pause</td> + <td>5000</td> + <td></td> +</tr> +<tr> <td>waitForTextNotPresent</td> <td>test_portal_name_20</td> <td></td> @@ -209,7 +214,7 @@ <tr> <td>verifyTextNotPresent</td> <td>test_portal_name_20</td> - <td>1,1</td> + <td></td> </tr> <tr> <td>waitForElementPresent</td> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-03-25 11:10:41 UTC (rev 2364) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_21_ChangeUsingPortal.html 2010-03-25 12:10:07 UTC (rev 2365) @@ -197,26 +197,11 @@ <td></td> </tr> <tr> - <td>clickAt</td> - <td>link=Site</td> + <td>pause</td> + <td>5000</td> <td></td> </tr> <tr> - <td>waitForTextPresent</td> - <td>Portal Navigation</td> - <td></td> -</tr> -<tr> - <td>refresh</td> - <td></td> - <td></td> -</tr> -<tr> - <td>waitForTextPresent</td> - <td>Portal Navigation</td> - <td></td> -</tr> -<tr> <td>waitForTextNotPresent</td> <td>test_portal_name_21</td> <td></td>