Author: vrockai Date: 2008-10-20 12:56:58 -0400 (Mon, 20 Oct 2008) New Revision: 12102 Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: several fixes Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 15:35:39 UTC (rev 12101) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-10-20 16:56:58 UTC (rev 12102) @@ -80,8 +80,36 @@ protected int countTableRows(String tableLocation){ return Integer.valueOf(selenium.getEval("selenium.countTableRows(\"" + tableLocation + "\")")); } + + // TODO refactor + protected void safeSelect(String locator, String value){ + waitForElement(locator); + + for (int second = 0; ; second++) { + if (second >= ELEM_TIMEOUT) { + Assert.fail("Element "+locator+" not found."); + } + try { + String [] opts = selenium.getSelectOptions(locator); + boolean isAvailable = false; + + for(String opt : opts){ + if (opt.equals(value)){ + isAvailable = true; + } + } + + if (isAvailable) break; + } catch (Exception e) { + } + waitFor(1000); + } + + selenium.select(locator, "label="+value); + } protected void clickAndWait(String locator){ + waitForElement(locator); selenium.click(locator); selenium.waitForPageToLoad(PAGE_LOAD); } @@ -92,6 +120,7 @@ } protected void selectIfNotSelected(String selector, String label) { + waitForElement(selector); if (!selenium.getSelectedLabel(selector).equals(label)) { selenium.select(selector, "label=" + label); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 15:35:39 UTC (rev 12101) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2008-10-20 16:56:58 UTC (rev 12102) @@ -196,14 +196,14 @@ clickIfVisible(ID_LINK_CONSCONF); clickIfVisible(LINK_CONSUMER_HOME); Assert.assertTrue(selenium.isTextPresent("BEAdel")); - selenium.captureScreenshot("tabletable"); + Assert.assertTrue(selenium.isElementPresent(WSRP_CONSUMER_TABLE),"Consumer table not available."); int r = findTableRow(WSRP_CONSUMER_TABLE, "BEAdel", 0)-1; Assert.assertFalse(r < 0,"Consumer BEAdel not found"); selenium.click(MessageFormat.format(LINK_T_CONS_DEL,r)); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.captureScreenshot("delete"); + Assert.assertTrue(selenium.isTextPresent("Delete 'BEAdel' consumer?")); selenium.click(SUBMIT_CONSDEL_CONF); @@ -307,6 +307,7 @@ selenium.type(INPUT_CONSWSDL, address); selenium.click(SUBMIT_REFRESHSAVE); selenium.waitForPageToLoad(PAGE_LOAD); + waitForElement(MessageFormat.format(INPUT_CONS_REGVALUE,0)); selenium.type(MessageFormat.format(INPUT_CONS_REGVALUE,0), "public"); selenium.click(SUBMIT_CONS_REGVAL); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-20 15:35:39 UTC (rev 12101) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/DashboardsTestCase.java 2008-10-20 16:56:58 UTC (rev 12102) @@ -133,11 +133,16 @@ @Test(enabled = true) public void testDashboardTheme() { - selenium.select(T_DH_SEL_LAYOUT, "label=1column"); - selenium.select(T_DH_SEL_THEME, "label=nphalanx"); - selenium.select(T_DH_SEL_RENDERSET, "label=default"); - selenium.click(T_DH_SUB_UPDATE); - selenium.waitForPageToLoad(PAGE_LOAD); + + safeSelect(T_DH_SEL_LAYOUT, "1column"); + + safeSelect(T_DH_SEL_THEME, "nphalanx"); + + safeSelect(T_DH_SEL_RENDERSET, "default"); + + + clickAndWait(T_DH_SUB_UPDATE); + } private void goToDash() { Modified: branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 15:35:39 UTC (rev 12101) +++ branches/JBoss_Portal_Branch_2_6/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2008-10-20 16:56:58 UTC (rev 12102) @@ -53,19 +53,12 @@ @Test(enabled = true) public void testAddName() { - selenium.click(LINK_COUNTPORT); - selenium.waitForPageToLoad(PAGE_LOAD); - //selenium.captureScreenshot("m1.jpg"); - selenium.select(SELECT_LANGUAGE, "label=Czech"); - //selenium.captureScreenshot("m2.jpg"); + clickAndWait(LINK_COUNTPORT); + safeSelect(SELECT_LANGUAGE, "Czech"); final String name = "Administracny"; selenium.type(INPUT_NAME, name); - //selenium.captureScreenshot("m3.jpg"); - selenium.click(SUBMIT_MODIFY_NAME); - selenium.waitForPageToLoad(PAGE_LOAD); - //selenium.captureScreenshot("m4.jpg"); + clickAndWait(SUBMIT_MODIFY_NAME); Assert.assertTrue(findTableRow(TABLE_DISPNAMES, name, 1) >= 0); - //selenium.captureScreenshot("m5.jpg"); } @Test(enabled = true)