[embjopr-commits] EMBJOPR SVN: r420 - in trunk/jsfunit: src/test/java/org/jboss/jopr/jsfunit and 1 other directory.

Author: ozizka(a)redhat.com Date: 2009-05-15 10:02:54 -0400 (Fri, 15 May 2009) New Revision: 420 Modified: trunk/jsfunit/ trunk/jsfunit/pom.xml trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java Log: Done JBQA-2344 - excecute automated tests using IE7 Property changes on: trunk/jsfunit ___________________________________________________________________ Name: svn:ignore - nb-configuration.xml target nbactions.xml + nb-configuration.xml TEST-TestSuite-01.xsl CHANGES.txt pom_1.xml TEST-TestSuite-02.xsl pom_05-XSLT.xml pom_3.xml pom_2.xml pom_pure_maven.xml target TEST-TestSuite.xsl pom_4.xml nbactions.xml Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-05-14 22:58:57 UTC (rev 419) +++ trunk/jsfunit/pom.xml 2009-05-15 14:02:54 UTC (rev 420) @@ -7,6 +7,7 @@ <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address> <cargo.plugin.version>1.0.1-SNAPSHOT</cargo.plugin.version><!-- Was: 1.0-SNAPSHOT --> <jvm.args.debug></jvm.args.debug> + <htmlunit.browser>ff3</htmlunit.browser><!-- ff2 | ff3 | ie6 | ie7 --> </properties> <parent> Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-14 22:58:57 UTC (rev 419) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-05-15 14:02:54 UTC (rev 420) @@ -153,7 +153,7 @@ public static final String WAR_UNPACKED_ZIP = "unpacked-web1.war.zip"; - // RAR + // RAR public static final String BASIC_RAR = "jbosstestadapter.rar"; Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-05-14 22:58:57 UTC (rev 419) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-05-15 14:02:54 UTC (rev 420) @@ -110,7 +110,30 @@ .getImplementationVersion(); log.info("Detected AS version: " + version); isJBoss4 = version.startsWith("4"); + + + // Browser branch and version + + BrowserVersion browser = BrowserVersion.FIREFOX_3; + + String browserProp = System.getProperty("htmlunit.browser"); + if( "ff3".equals(browserProp) || "firefox3".equals(browserProp) ){ + browser = BrowserVersion.FIREFOX_3; + }else + if( "ff2".equals(browserProp) || "firefox2".equals(browserProp) ){ + browser = BrowserVersion.FIREFOX_2; + }else + if( "ie7".equals(browserProp) || "internetexplorer7".equals(browserProp) ){ + browser = BrowserVersion.INTERNET_EXPLORER_7_0; + }else + if( "ie6".equals(browserProp) || "internetexplorer6".equals(browserProp) ){ + browser = BrowserVersion.INTERNET_EXPLORER_6_0; + } + log.info("Simulating browser: "+browser.getNickName() + "('htmlunit.browser' sysprop: "+browserProp+")"); + + + // Initial JSF request WebClientSpec wcSpec = new WebClientSpec("/", BrowserVersion.FIREFOX_3);