Author: smcgowan(a)redhat.com Date: 2009-10-29 23:21:35 -0400 (Thu, 29 Oct 2009) New Revision: 827 Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java Log: test changes needed with this branch Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/pom.xml 2009-10-30 03:21:35 UTC (rev 827) @@ -7,7 +7,10 @@ <jvm.args.debug></jvm.args.debug> <!-- Used by the -Pdebug profile. --> <jvm.args.profiler></jvm.args.profiler> <!-- Used by the -Pprofile profile. --> <jvm.args.exposejmx></jvm.args.exposejmx> <!-- Expose JMX - used to enable the Hibernate statistics. --> + <jvm.args.common>-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${project.build.directory}/heapdump-sun -Xmx1536m -XX:PermSize=256m -XX:MaxPermSize=512m</jvm.args.common> + <jvm.args.vendor-specific></jvm.args.vendor-specific> + <cargo.jboss.configuration>default</cargo.jboss.configuration><!-- JBoss AS configuration. --> <cargo.jboss.bind.address>localhost</cargo.jboss.bind.address><!-- Address for JBoss AS to bind to. --> <htmlunit.browser>ff3</htmlunit.browser><!-- ff2 | ff3 | ie6 | ie7 --> @@ -392,7 +395,7 @@ <containerId>jboss5x</containerId> <home>${JBOSS_HOME}</home> <!-- Binaries used by Cargo. --> <log>${basedir}/target/jboss5.x.logs/cargo.log</log> - <timeout>300000</timeout> <!-- 5 minutes --> + <timeout>420000</timeout> <!-- 7 minutes --> <systemProperties> <!-- Used in jboss-log4j.xml. See /testdata/... --> <jboss.server.log.threshold>ALL</jboss.server.log.threshold> @@ -407,6 +410,7 @@ <jsfunit.jboss.home.dir>${basedir}/target/jboss5x</jsfunit.jboss.home.dir> <htmlunit.browser>${htmlunit.browser}</htmlunit.browser> <jsfunit.jboss.isSecured>${jboss.isSecured}</jsfunit.jboss.isSecured> + <jboss.platform.mbeanserver>true</jboss.platform.mbeanserver> <!-- Makes the JVM resource appear. --> </systemProperties> </container> @@ -687,7 +691,15 @@ </build> </profile> <!-- "profile" profile (JBoss Profiler) --> + <!-- Bind to all IPs --> + <profile> + <id>bind-all</id> + <properties> + <cargo.jboss.bind.address>0.0.0.0</cargo.jboss.bind.address> + </properties> + </profile> + <!-- Hudson profile (commented out - hesitating to hard-code version dir to pom.xml) <profile> <id>running-in-hudson</id> Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-10-30 03:21:35 UTC (rev 827) @@ -54,7 +54,7 @@ static{ - EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule"; + EJB2.jmxMBeanNameFormat = "jboss.j2ee:module=\"%s\",service=EjbModule,*"; EJB3.jmxMBeanNameFormat = "jboss.j2ee:ear=%1$s,jar=%1$s,service=EJB3"; } @@ -128,14 +128,14 @@ //public static final String NAV_EJB = "EJB Application (EJB JAR)s"; public static final String NAV_EJB2 = "EJB2 JARs"; public static final String NAV_EJB3 = "EJB3 JARs"; - public static final String NAV_EAR = "EARs"; + public static final String NAV_EAR = "Enterprise Application (EAR)s"; public static final String NAV_SAR = "SARs"; public static final String NAV_MC = "MC Beans"; public static final String NAV_PAR = "PARs"; - public static final String NAV_RAR = "RARs"; - public static final String NAV_WAR = "WARs"; - public static final String NAV_EMB_WAR = "Embedded WARs"; - public static final String NAV_EMB_RAR = "Embedded RARs"; + public static final String NAV_RAR = "Resource Adapter Archive (RAR)s"; + public static final String NAV_WAR = "Web Application (WAR)s"; + public static final String NAV_EMB_WAR = "Embedded Web Application (WAR)s"; + public static final String NAV_EMB_RAR = "Embedded Resource Adapter Archive (RAR)s"; // Non-app resource types. public static final String NAV_SBM = "Service Binding Manager"; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbJoprTestConstants.java 2009-10-30 03:21:35 UTC (rev 827) @@ -20,10 +20,10 @@ public static String SYSPROP_CARGO_JBOSS_HOME_DIR = "jsfunit.jboss.home.dir"; - //public static final String AS_NODE_NAME_FORMAT = "JBoss AS 5 (%s)"; - public static final String AS_NODE_NAME_FORMAT = "JBoss EAP 5 (%s)"; - //public static final String AS_NODE_DESCRIPTION = "JBoss Application Server"; - public static final String AS_NODE_DESCRIPTION = "JBoss Enterprise Application Platform (EAP)"; + public static final String AS_NODE_NAME_FORMAT = "JBoss AS 5 (%s)"; + //public static final String AS_NODE_NAME_FORMAT = "JBoss EAP 5 (%s)"; + public static final String AS_NODE_DESCRIPTION = "JBoss Application Server"; + //public static final String AS_NODE_DESCRIPTION = "JBoss Enterprise Application Platform (EAP)"; public static final String LABEL_AS_SERVERS_SUMMARY = "JBoss Application Server"; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/EmbjoprTestCase.java 2009-10-30 03:21:35 UTC (rev 827) @@ -1082,6 +1082,8 @@ * @param secured If true, JAAS secured ManagementView is used. */ protected boolean isDeployed(String deployment, boolean secured) throws Exception { + deployment = deployment.replace("/", System.getProperty("file.separator")); + ManagementView currentProfileView = getCurrentProfileView(secured); ManagedDeployment managedDeployment = null; Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/HelloJoprTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -103,7 +103,7 @@ // Click the nav tree. - String linkLabel = "WARs"; + String linkLabel = "Web Application (WAR)s"; //HtmlAnchor warLink = getNavTreeLink(linkLabel); HtmlAnchor warLink = ejtt.navTree.getNodeLink(linkLabel); warLink.click(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/app/war/WarTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -489,6 +489,7 @@ String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME; + path = path.replace("/", System.getProperty("file.separator")); assertEquals(path, props.getProperty("Path").trim()); assertEquals("no", props.getProperty("Exploded?").trim()); @@ -843,6 +844,7 @@ log.debug("Traits: "+ props.toString()); String path = ejtt.getDeployDir()+"/"+DEPLOYABLE_NAME; + path = path.replace("/", System.getProperty("file.separator")); assertEquals(path, props.getProperty("Path").trim()); @@ -921,6 +923,7 @@ */ public void testDeployUnpackedWar() throws IOException, EmbJoprTestException { + final String DEPLOYABLE_NAME = WAR_UNPACKED; // Deploy the unpacked WAR. // We have to use hotdeploy - can't upload a directory. @@ -946,8 +949,12 @@ ejtt.getNavTree().getNodeByLabel(NAV_WAR).click(); - ContentTableRow row = ejtt.getDefaultContentTable().getFirstRowContainingLink(WAR_UNPACKED); + //ContentTableRow row = ejtt.getDefaultContentTable().getFirstRowContainingLink(WAR_UNPACKED); + if( ! ejtt.deployment.isDeployedAccordingToEmbJopr(APP_TYPE, WAR_UNPACKED) ) + throw new EmbJoprTestException("Unpacked hotdeployed war not found: "+WAR_UNPACKED, this); + + // TODO: Finish // TODO: Check whether Exploded?: yes. EMBJOPR-95 Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheDataContainerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -51,6 +51,9 @@ /** Helper method - performs an operation, collects the results and checks whether the values are as expected. */ public void checkOperationResults( String opName, Properties expected, ValuesValidator validator ) throws EmbJoprTestException, IOException { + // For all calling test. + if( isJBossConfigWithoutCache() ) return; + ejtt.navTree.getNodeByLabel(JBCACHE_HA_PARTITION).expand(); ejtt.navTree.getNodeByLabel(SUBNODE_DATA_CONTAINER).click(); ejtt.getTabMenu().clickControlTab(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRegionManagerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -58,6 +58,8 @@ */ public void testJBossCacheRegionManagerMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); @@ -74,6 +76,8 @@ */ public void testJBossCacheRegionManagerControl() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickControlTab(); ejtt.operations.performOperation(LABEL_DUMP_REGIONS); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheRpcManagerTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -62,6 +62,8 @@ */ public void testJBossCacheRpcManagerMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTestBase.java 2009-10-30 03:21:35 UTC (rev 827) @@ -34,8 +34,11 @@ protected static final String SUBNODE_TX_INTERCEPTOR = "Tx Interceptor"; + /** + * Some JBoss AS configurations don't have Cache included - + * in that case, skip all JBoss Cache tests (don't fail). + */ - protected boolean isJBossConfigWithoutCache(){ boolean isJBossConfigWithoutCache = ! ejtt.getJBossConfig().equals("all"); if( isJBossConfigWithoutCache ) @@ -45,8 +48,4 @@ } - - - - }// class Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTransactionTableTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -62,6 +62,8 @@ */ public void testJBossCacheTransactionTableMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab(); @@ -82,6 +84,8 @@ */ public void testJBossCacheTransactionTableControl() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickControlTab(); ejtt.operations.performOperation(LABEL_RESET_STATISTICS); Modified: branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java =================================================================== --- branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java 2009-10-29 22:55:47 UTC (rev 826) +++ branches/EmbJopr_1_3_3_MyFaces/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheTxInterceptorTest.java 2009-10-30 03:21:35 UTC (rev 827) @@ -66,6 +66,8 @@ */ public void testJBossCacheTxInterceptorMetrics() throws IOException, EmbJoprTestException { + if( isJBossConfigWithoutCache() ) return; + navigateToNode(); ejtt.getTabMenu().clickMetricsTab();