Author: vrockai Date: 2008-12-05 10:34:38 -0500 (Fri, 05 Dec 2008) New Revision: 12350 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/JBossSelenium.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java Log: turning off screenshots 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-05 05:54:40 UTC (rev 12349) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossPortalSeleniumTestCase.java 2008-12-05 15:34:38 UTC (rev 12350) @@ -34,7 +34,7 @@ @BeforeClass public void setupChromeForLogin() throws Exception { String browser = System.getProperty("browser"); - selenium = new JBossSelenium("127.0.0.1", 44444, browser, "http://localhost:8080/portal/"); + selenium = new DefaultSelenium("127.0.0.1", 44444, browser, "http://localhost:8080/portal/"); JBossSeleniumTestListener.selenium = selenium; selenium.start(); selenium.setTimeout(PAGE_LOAD); 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-05 05:54:40 UTC (rev 12349) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSelenium.java 2008-12-05 15:34:38 UTC (rev 12350) @@ -19,34 +19,43 @@ @Override public void click(String locator) { try { - super.click(locator); - } - catch (SeleniumException e){ - - String name = "E_"; - Pattern methodname = Pattern.compile("^org.jboss.portal.test.selenium\\S+test\\S+\\(\\S+\\)"); - for(int i=0;i<e.getStackTrace().length;i++){ - String input = e.getStackTrace()[i].toString(); - Matcher match = methodname.matcher(input); - if (match.matches()){ - input = input.replace("org.jboss.portal.test.selenium",""); - input = input.replaceAll("\\(.*\\)",""); - name += input; + try { + super.click(locator); + } + catch (SeleniumException e){ + + String name = "E_"; + Pattern methodname = Pattern.compile("^org.jboss.portal.test.selenium\\S+test\\S+\\(\\S+\\)"); + for(int i=0;i<e.getStackTrace().length;i++){ + String input = e.getStackTrace()[i].toString(); + Matcher match = methodname.matcher(input); + if (match.matches()){ + input = input.replace("org.jboss.portal.test.selenium",""); + input = input.replaceAll("\\(.*\\)",""); + name += input; + } } + name += "."+count; + try { + PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name+".html"))); + out.println(getHtmlSource()); + out.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + try { + windowMaximize(); + captureScreenshot(name + ".jpg"); + } catch (SeleniumException e2) { + e2.printStackTrace(); + } + count++; + + throw new SeleniumException(e); } - name += "."+count; - try { - PrintWriter out = new PrintWriter(new BufferedWriter(new FileWriter(name+".html"))); - out.println(getHtmlSource()); - out.close(); - } catch (IOException e1) { - e1.printStackTrace(); - } - windowMaximize(); - captureScreenshot(name +".jpg"); - count++; - - throw new SeleniumException(e); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); } } 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-05 05:54:40 UTC (rev 12349) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/JBossSeleniumTestListener.java 2008-12-05 15:34:38 UTC (rev 12350) @@ -15,6 +15,7 @@ import org.testng.TestListenerAdapter; import com.thoughtworks.selenium.Selenium; +import com.thoughtworks.selenium.SeleniumException; public class JBossSeleniumTestListener extends TestListenerAdapter {//extends ITestListener { @@ -31,8 +32,14 @@ } catch (IOException e1) { e1.printStackTrace(); } + /* + try { selenium.windowMaximize(); selenium.captureScreenshot(name + ".jpg"); + } catch (SeleniumException e2) { + e2.printStackTrace(); + } + */ count++; }