Author: vrockai Date: 2009-01-13 08:25:21 -0500 (Tue, 13 Jan 2009) New Revision: 12483 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java Log: portlet instances Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -42,10 +42,18 @@ @Test(enabled = true) public void testCreatePage() { //selenium.setSpeed("0"); + selenium.setSpeed("6000"); selenium.click(LNK_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + + //selenium.waitForPageToLoad(PAGE_LOAD); + + + selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + + selenium.setSpeed("0"); + //selenium.waitForPageToLoad(PAGE_LOAD); + selenium.type(INP_PAGENAME, "DashTestPage"); clickAndWait(SUB_CREATEPAGE); @@ -64,7 +72,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,"DashTestPage"); @@ -89,7 +103,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selenium.windowMaximize(); selectIfNotSelected(SEL_PAGE,"DashTestPage"); @@ -116,7 +136,13 @@ selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,"DashTestPage"); selenium.click("link=Who's online portlet"); selenium.waitForPageToLoad(PAGE_LOAD); @@ -143,7 +169,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selenium.type(INP_PAGENAME, pageName); selenium.click(SUB_CREATEPAGE); @@ -183,7 +215,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,pageName); selenium.addSelection(SEL_CENTER_REGION, "label=ExceptionPortletWindow"); @@ -205,7 +243,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,"DashTestPage"); @@ -228,7 +272,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,"DashTestPage"); selenium.select(SEL_CONTENT_TYPE, "label=widget/google"); selenium.waitForPageToLoad(PAGE_LOAD); @@ -257,7 +307,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selenium.type(INP_PAGENAME, pageName); selenium.click(SUB_CREATEPAGE); selenium.waitForPageToLoad(PAGE_LOAD); @@ -305,7 +361,13 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selectIfNotSelected(SEL_PAGE,pageName); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -26,7 +26,7 @@ protected Selenium selenium; // Generic timeout in miliseconds - protected static final String PAGE_LOAD = "12000000"; + protected static final String PAGE_LOAD = "1200000"; // Element timeout in seconds protected static final int ELEM_TIMEOUT = 220; Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -22,32 +22,42 @@ protected static Selenium selenium; protected static int count; protected static boolean screenshot = false; + protected static boolean htmlSource = false; static { String ss = System.getProperty("screenshot"); - if("true".equals(ss)){ + if ("true".equals(ss)) { screenshot = true; } + + String sh = System.getProperty("html-src"); + if ("true".equals(ss)) { + htmlSource = true; + } } - + @Override public void onTestFailure(ITestResult tr) { + String name = "F_" + tr.getName() + "-" + count; - try { - PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name + ".html"))); - out.println(selenium.getHtmlSource()); - out.close(); - } catch (IOException e1) { - e1.printStackTrace(); + + if (htmlSource) { + try { + PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name + ".html"))); + out.println(selenium.getHtmlSource()); + out.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } } - if (screenshot) + if (screenshot){ try { selenium.windowMaximize(); selenium.captureScreenshot(name + ".jpg"); } catch (SeleniumException e2) { e2.printStackTrace(); } - + } count++; } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -193,7 +193,7 @@ } - @Test(enabled = true, description = "Set admin/secRole read permissions, login as user w secRole.") + @Test(enabled = true, dependsOnMethods={"testSetRoleReadPer2"}, description = "Set admin/secRole read permissions, login as user w secRole.") public void testSetRoleReadPer1() { login("admin", "admin"); @@ -290,7 +290,7 @@ logout(); } - @Test(enabled = true, description = "Subpage permission test") + @Test(enabled = true, dependsOnMethods={"testSetRoleReadPer1"},description = "Subpage permission test") public void testSubpageSecurity() { selenium.open("/portal/portal/default"); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -65,7 +65,6 @@ selenium.click("link=Admin"); selenium.waitForPageToLoad(PAGE_LOAD); - clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); @@ -228,16 +227,22 @@ // click on the page layout selenium.click(MessageFormat.format(PAG_TL_LAYOUT, r)); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.waitForPageToLoad(PAGE_LOAD); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } selenium.click("link=Who's online portlet"); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); selenium.type(INP_WINDOW_NAME, windowName); selenium.click(SUB_LAYOUT_ADD_CENTER); - selenium.waitForPageToLoad("30000"); + selenium.waitForPageToLoad(PAGE_LOAD); Assert.assertTrue(selenium.isTextPresent(windowName)); selenium.open("/portal/auth/portal/mimikry"); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-13 13:24:44 UTC (rev 12482) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-13 13:25:21 UTC (rev 12483) @@ -13,7 +13,7 @@ private static final String SUBMIT_SECURITY_UPDATE = "//input[contains(@id,'common-edit-security-form:update')]"; private static final String SUBMIT_SECURITY_CANCEL = "//input[contains(@id,'common-edit-security-form:cancel')]"; - private static final String LINK_20_PAGE = "Link=20"; + private static final String LINK_20_PAGE = "link=20"; private static final String LINK_PREF_WELCOMEPORT = "//a[contains(@id,'security-JSPPortletInstance')]"; private static final String TABLE_PREF_KEY = "//form[contains(@id,'common-edit-pref-form')]/table"; @@ -27,12 +27,12 @@ private static final String INPUT_PREF_APPEND = "//input[contains(@id,'common-edit-exisiting-form:pref-input-0')]"; private static final String SUBMIT_PREF_CANCEL = "//input[contains(@id,':cancel')]"; private static final String LINK_CURUSER_PREFERENCES = "//a[contains(@id,'instances-form:preference-CurrentUsersPortletInstance')]"; - private static final String LINK_DEL_EXCEPTPORT = "//a[contains(@id,'instances-form:delete-ExceptionPortletInstance')]"; + private static final String LINK_DEL_EXCEPTPORT = "//a[contains(@id,'instances-form:delete-GoogleMapPortletInstance')]"; private static final String SUBMIT_PI_DELETE_CONF = "//input[contains(@id,'confirm-delete-form1:delete')]"; private static final String SUBMIT_PI_DELETE_CANC = "//input[contains(@id,'confirm-delete-form1:cancel')]"; private static final String T_LINK_DELETENAME = "//a[contains(@id,''instance-display-form:locale-datatable:{0}:delete-link'')]"; private static final String T_LINK_MODIFYNAME = "//a[contains(@id,''instance-display-form:locale-datatable:{0}:edit-link'')]"; - private static final String LINK_COUNTPORT = "//a[contains(@id,'instances-form:CounterPortletInstance')]"; + private static final String LINK_COUNTPORT = "//a[contains(@id,'instances-form:CurrentUsersPortletInstance')]"; private static final String SUBMIT_MODIFY_NAME = "//input[contains(@id,'add-display-name-form:addDisplay')]"; private static final String INPUT_NAME = "//input[contains(@id,'add-display-name-form:newName')]"; private static final String SELECT_LANGUAGE = "//select[contains(@id,'add-display-name-form:locales')]"; @@ -124,8 +124,8 @@ String instance_name = "JSPPortletInstance"; String table = "instancesTable2"; - selenium.click(LINK_20_PAGE); - selenium.waitForPageToLoad(PAGE_LOAD); + //selenium.click(LINK_20_PAGE); + //selenium.waitForPageToLoad(PAGE_LOAD); int r = findTableRow(table, instance_name, 0); @@ -147,9 +147,9 @@ // then cancel goToPI(); - selenium.click(LINK_20_PAGE); +// selenium.click(LINK_20_PAGE); +// selenium.waitForPageToLoad(PAGE_LOAD); - selenium.waitForPageToLoad(PAGE_LOAD); r = findTableRow(table, instance_name, 0); selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); selenium.waitForPageToLoad("30000"); @@ -167,8 +167,8 @@ // then really stop the greetings portlet goToPI(); //selenium.setSpeed("5000"); - selenium.click(LINK_20_PAGE); - selenium.waitForPageToLoad(PAGE_LOAD); +// selenium.click(LINK_20_PAGE); + // selenium.waitForPageToLoad(PAGE_LOAD); r = findTableRow(table, instance_name, 0); selenium.click(MessageFormat.format(LNK_SEC_BUTTON, r)); selenium.waitForPageToLoad("30000");