Author: ozizka(a)redhat.com Date: 2009-07-27 20:59:26 -0400 (Mon, 27 Jul 2009) New Revision: 593 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java Log: * JBCache Interceptor test updated Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-28 00:53:07 UTC (rev 592) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-07-28 00:59:26 UTC (rev 593) @@ -38,19 +38,19 @@ public enum DeployableTypes { // Nav tree link label, EmbJopr display name, testdata/$dir, extension, suffix, mime type. - EAR(AppConstants.NAV_EAR, "EAR", "ear", ".ear", null, "application/ear"), - WAR(AppConstants.NAV_WAR, "WAR", "war", ".war", null, "application/war"), - EJB2(AppConstants.NAV_EJB2, "EJB2 JAR", "ejb2", ".jar", null, "application/java-archive"), - EJB3(AppConstants.NAV_EJB3, "EJB3 JAR", "ejb3", ".jar", null, "application/java-archive"), - SAR(AppConstants.NAV_SAR, "SAR", "sar", ".sar", "-service.xml", "application/sar"), - RAR(AppConstants.NAV_RAR, "RAR", "rar", ".rar", null, "application/rar"), - EMB_RAR(AppConstants.NAV_EMB_RAR,"Embedded RAR", "", ".rar", null, "application/rar"), - MC_BEAN(AppConstants.NAV_MC, "?", "mc", "", null, "application/java-archive"), - EMB_WAR(AppConstants.NAV_EMB_WAR,"Embbedded WAR", "", ".war", null, "application/war"), - + EAR(AppConstants.NAV_EAR, "EAR", "ear", ".ear", null, "application/ear"), + WAR(AppConstants.NAV_WAR, "WAR", "war", ".war", null, "application/war"), + EJB2(AppConstants.NAV_EJB2, "EJB2 JAR", "ejb2", ".jar", null, "application/java-archive"), + EJB3(AppConstants.NAV_EJB3, "EJB3 JAR", "ejb3", ".jar", null, "application/java-archive"), + SAR(AppConstants.NAV_SAR, "SAR", "sar", ".sar", "-service.xml", "application/sar"), + RAR(AppConstants.NAV_RAR, "RAR", "rar", ".rar", null, "application/rar"), + EMB_RAR(AppConstants.NAV_EMB_RAR, "Embedded RAR", "", ".rar", null, "application/rar"), + MC_BEAN(AppConstants.NAV_MC, "?", "mc", "", null, "application/java-archive"), + EMB_WAR(AppConstants.NAV_EMB_WAR, "Embbedded WAR", "", ".war", null, "application/war"), + // TODO: Create a superclass for non-app resource types - ResourceTypes. - JBCACHE(AppConstants.NAV_JBCACHE, "JBoss Cache", null, null, null, null), // TODO: Should be JBoss - HBN(AppConstants.NAV_HBN, "Hibernate", null, null, null, null); + JBCACHE(AppConstants.NAV_JBCACHE, "JBoss Cache", "jbcache", null, null, null), + HBN(AppConstants.NAV_HBN, "Hibernate", "hbn", null, null, null); static{ Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java 2009-07-28 00:53:07 UTC (rev 592) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/jbcache/JBossCacheInterceptorTest.java 2009-07-28 00:59:26 UTC (rev 593) @@ -56,7 +56,6 @@ ejtt.deployment.undeployViaEmbJopr( DeployableTypes.EAR, JBCACHE_TEST_EAR ); - } @@ -71,6 +70,9 @@ if( isJBossConfigWithoutCache() ) return; + ejtt.deployment.deployViaEmbJopr( DeployableTypes.EAR, ejtt.getTestFilePath(this.APP_TYPE, JBCACHE_TEST_EAR)); + + final String BEAN_JNDI = "TestOperationBean/remote"; // Query the bean. @@ -109,6 +111,8 @@ props.setProperty("Average Read Time", "0.0ms"); ejtt.getTabMenu().getTabContentBox().getTableUnderHeader(LABEL_NUMERIC_METRICS).checkValues(props); + ejtt.deployment.undeployViaEmbJopr( DeployableTypes.EAR, JBCACHE_TEST_EAR ); + }