Author: vrockai Date: 2008-12-02 05:30:12 -0500 (Tue, 02 Dec 2008) New Revision: 12329 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/JBossSelenium.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/CMSArchiveUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java Log: removed redundant screenshots and text output 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 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -70,12 +70,8 @@ selenium.select(SEL_THEME, "label=renaissance"); - System.out.println("HOLA2"+selenium.getSelectedLabel(SEL_THEME)); selenium.click(SUB_THEMESEL); selenium.waitForPageToLoad(PAGE_LOAD); - System.out.println("HOLA2"+selenium.getSelectedLabel(SEL_THEME)); - selenium.windowMaximize(); - selenium.captureScreenshot("2x.jpg"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); @@ -84,10 +80,6 @@ selectIfNotSelected(SEL_PAGE,"DashTestPage"); - selenium.windowMaximize(); - selenium.captureScreenshot("2.jpg"); - for (String s: selenium.getSelectOptions(SEL_THEME)) - System.out.println("LABEL!:"+s); Assert.assertEquals(selenium.getSelectedLabel(SEL_THEME), "renaissance", "Previously selected theme other then expected."); } @@ -101,17 +93,10 @@ selenium.windowMaximize(); selectIfNotSelected(SEL_PAGE,"DashTestPage"); - selenium.captureScreenshot("3x1.jpg"); selenium.select(SEL_LAYOUT, "label=generic"); - System.out.println("HOLA3"+selenium.getSelectedLabel(SEL_LAYOUT)); - selenium.captureScreenshot("3x2.jpg"); selenium.click("//input[@name='jbpnsabcsnpbj:_viewRoot:dashboardLayoutForm:j_id12']"); - selenium.captureScreenshot("3x3.jpg"); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.captureScreenshot("3x4.jpg"); - System.out.println("HOLA3"+selenium.getSelectedLabel(SEL_LAYOUT)); - selenium.captureScreenshot("3x.jpg"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); @@ -120,10 +105,6 @@ selectIfNotSelected(SEL_PAGE,"DashTestPage"); - selenium.windowMaximize(); - selenium.captureScreenshot("3.jpg"); - for (String s: selenium.getSelectOptions(SEL_LAYOUT)) - System.out.println("LABEL!:"+s); Assert.assertEquals(selenium.getSelectedLabel(SEL_LAYOUT), "generic", "Previously selected layout other then expected."); } @@ -133,34 +114,21 @@ selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.windowMaximize(); - selenium.captureScreenshot("1x1.jpg"); selenium.click(LNK_CONFIGURE_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.windowMaximize(); - selenium.captureScreenshot("1x21.jpg"); selectIfNotSelected(SEL_PAGE,"DashTestPage"); selenium.click("link=Who's online portlet"); - selenium.captureScreenshot("1x221.jpg"); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.captureScreenshot("1x222.jpg"); waitForElement("portlet-editor-title"); - //selenium.waitForPageToLoad(PAGE_LOAD); - selenium.windowMaximize(); - selenium.captureScreenshot("1x3.jpg"); selenium.click(SUB_ADDCENTER); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.windowMaximize(); - selenium.captureScreenshot("1x4.jpg"); selenium.click(LNK_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); selenium.click("link=DashTestPage"); selenium.waitForPageToLoad(PAGE_LOAD); - selenium.windowMaximize(); - selenium.captureScreenshot("1.jpg"); Assert.assertTrue(selenium.isTextPresent("Current users")); Assert.assertTrue(selenium.isTextPresent("Among them: * logged-in")); 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 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -150,7 +150,6 @@ protected void waitForElement(String locator) { for (int second = 0;; second++) { if (second >= ELEM_TIMEOUT) { - selenium.captureScreenshot("err.jpg"); Assert.fail("Element " + locator + " not found."); } try { Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -42,7 +42,7 @@ } catch (IOException e1) { e1.printStackTrace(); } - + windowMaximize(); captureScreenshot(name +".jpg"); count++; @@ -63,6 +63,7 @@ } catch (IOException e1) { e1.printStackTrace(); } + windowMaximize(); captureScreenshot("shot"+ count +".jpg"); count++; throw new SeleniumException(e); @@ -82,6 +83,7 @@ } catch (IOException e1) { e1.printStackTrace(); } + windowMaximize(); captureScreenshot("shot"+ count +".jpg"); count++; throw new SeleniumException(e); 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 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -23,7 +23,6 @@ @Override public void onTestFailure(ITestResult tr) { - System.out.println("F"); String name = "F_"+tr.getName()+"-" + count ; try { PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name + ".html"))); @@ -32,6 +31,7 @@ } catch (IOException e1) { e1.printStackTrace(); } + selenium.windowMaximize(); selenium.captureScreenshot(name + ".jpg"); count++; } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -43,7 +43,6 @@ @Test(enabled = true, description = "Test archive consisting of two files upload.") public void testArchiveUpload() { - //System.out.println("archive adress:" + WORKSPACE); // canceling at the first stage selenium.click(LNK_ADMIN); @@ -102,7 +101,6 @@ @Test(enabled = true, description = "Test archive consisting of > 100 files upload.") public void testManyFilesArchiveUpload() { - //System.out.println("archive adress:" + WORKSPACE); selenium.click(LNK_ADMIN); selenium.waitForPageToLoad(PAGE_LOAD); @@ -137,7 +135,6 @@ @Test(enabled = true, description = "Test archive consisting of 21MB file upload.") public void testBigArchiveUpload() { - //System.out.println("archive adress:" + WORKSPACE); selenium.click(LNK_ADMIN); selenium.waitForPageToLoad(PAGE_LOAD); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileUploadTestCase.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -89,8 +89,6 @@ selenium.type("title", "file to upload"); selenium.select("language", "label=Afar"); - //System.out.println(WORKSPACE); - selenium.type("response", WORKSPACE + "/test_files/testFile.txt"); selenium.click("submit"); selenium.waitForPageToLoad(PAGE_LOAD); 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 2008-12-02 03:33:35 UTC (rev 12328) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2008-12-02 10:30:12 UTC (rev 12329) @@ -68,7 +68,7 @@ clickIfVisible(TAB_PORTALOBJ_ID); clickIfVisible(LINK_PORTALS_ID); - savePage("4.html"); + Assert.assertFalse(selenium.isTextPresent("TestPortal"), "Not created page already exist."); selenium.type(INPUT_PORTALNAME, "TestPortal");