Author: mvanco(a)redhat.com Date: 2010-03-18 10:04:25 -0400 (Thu, 18 Mar 2010) New Revision: 2297 Modified: 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_SNF_PRL_12_Portlet.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html Log: Selenium tests fixes: SNF_PRL_19 - unreachable waitForElement, SNF_PRL_27 - unreachable waitForElement, SNF_PRL_12 - swapped div numbers, SeleniumTestCaseGenerator - wrong generation of dragAndDropToObject 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-18 13:42:55 UTC (rev 2296) +++ portal/trunk/testsuite/selenium-snifftests/src/main/java/org/exoplatform/portal/selenium/SeleniumTestCaseGenerator.java 2010-03-18 14:04:25 UTC (rev 2297) @@ -393,7 +393,7 @@ sb.append("String ").append(param3).append(" = selenium.getXpathCount(\"").append(param2).append( "\").toString();\n"); } else if (param1.equals("dragAndDropToObject")) { - sb.append("selenium.dragAndDropToObject(\"").append(param2).append("\",\"").append(param2).append("\");\n"); + sb.append("selenium.dragAndDropToObject(\"").append(param2).append("\",\"").append(param3).append("\");\n"); } else if (param1.equals("componentExoContextMenu")) { sb.append("selenium.getEval(\"selenium.doComponentExoContextMenu(\\\"").append(param2) .append("\\\")\");\n"); @@ -510,4 +510,4 @@ private static final String[] _FIX_PARAM_NEW_SUBS = new String[] { "\\n", "\\n" }; public static final String SLASH = "/"; -} \ No newline at end of file +} Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-03-18 13:42:55 UTC (rev 2296) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_12_Portlet.html 2010-03-18 14:04:25 UTC (rev 2297) @@ -88,7 +88,7 @@ </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> <td></td> </tr> <tr> @@ -113,7 +113,7 @@ </tr> <tr> <td>clickAt</td> - <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[2]//a</td> + <td>xpath=//div[@class='UIVerticalSlideTabs']//div[@class='UIVTabContent']//div[3]//a</td> <td></td> </tr> <tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-03-18 13:42:55 UTC (rev 2296) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_19_EditPortal.html 2010-03-18 14:04:25 UTC (rev 2297) @@ -68,6 +68,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>//a[@title='Administration']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@title='Administration']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>css=div#Administration/ApplicationRegistryPortlet</td> <td></td> </tr> Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html =================================================================== --- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html 2010-03-18 13:42:55 UTC (rev 2296) +++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/Test_SNF_PRL_27_CreateAndEditPageAndEditSiteLayoutForGroup.html 2010-03-18 14:04:25 UTC (rev 2297) @@ -113,6 +113,16 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>//a[@title='Administration']</td> + <td></td> +</tr> +<tr> + <td>clickAt</td> + <td>//a[@title='Administration']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>//div[@id='Administration/AccountPortlet']</td> <td></td> </tr>