Author: ozizka(a)redhat.com Date: 2009-11-04 19:33:32 -0500 (Wed, 04 Nov 2009) New Revision: 833 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java Log: * EmbJoprTestCase: minor updates (logging, htmlunit.browser prop val lower-cased) Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-11-04 23:31:32 UTC (rev 832) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-11-05 00:33:32 UTC (rev 833) @@ -121,9 +121,8 @@ log.info("Java home: " +System.getProperty("java.home")); // JBoss AS version - String version = Package.getPackage("org.jboss.system.server") - .getImplementationVersion(); - log.info("Detected AS version: " + version); + String version = Package.getPackage("org.jboss.system.server").getImplementationVersion(); + log.info("Detected AS version: " + version + " // Package.getPackage(\"org.jboss.system.server\").getImplementationVersion();"); isJBoss4 = version.startsWith("4"); @@ -131,7 +130,8 @@ BrowserVersion browserVersion = BrowserVersion.FIREFOX_3; - String browserProp = System.getProperty("htmlunit.browser"); + String browserProp = System.getProperty("htmlunit.browser", "ff3").toLowerCase(); + if( "ff3".equals(browserProp) || "firefox3".equals(browserProp) ){ browserVersion = BrowserVersion.FIREFOX_3; }else @@ -163,15 +163,18 @@ wcSpec.setInitialRequestStrategy(new JoprLoginStrategy( this.getLoginUser(), this.getLoginPass())); // logs in this.webClient = wcSpec.getWebClient(); - + JSFSession jsfSession = new JSFSession(wcSpec); this.client = jsfSession.getJSFClientSession(); - this.server = jsfSession.getJSFServerSession(); + this.server = jsfSession.getJSFServerSession(); this.ejtt = new EmbJoprTestToolkit(client, server); this.ejtt.setCurrentTest(this); } + + + /** Tear down: Close all windows, clear cache, cookies. */ @Override protected void tearDown() throws Exception {