Author: manik.surtani(a)jboss.com Date: 2009-02-09 13:43:20 -0500 (Mon, 09 Feb 2009) New Revision: 7670 Modified: core/branches/flat/pom.xml core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java Log: Fixed tests running in maven Modified: core/branches/flat/pom.xml =================================================================== --- core/branches/flat/pom.xml 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/pom.xml 2009-02-09 18:43:20 UTC (rev 7670) @@ -145,18 +145,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.4.3-JBOSS</version> + <!--<version>2.4.3-JBOSS</version>--> + <version>2.4.3</version> <configuration> - <parallel>methods</parallel> - <threadCount>1</threadCount> + <!--<parallel>methods</parallel>--> + <!--<threadCount>1</threadCount>--> <forkMode>none</forkMode> - <trimStackTrace>false</trimStackTrace> - <properties> - <property> - <name>listener</name> - <value>org.horizon.util.UnitTestTestNGListener</value> - </property> - </properties> + <!--<trimStackTrace>false</trimStackTrace>--> + <!--<properties>--> + <!--<property>--> + <!--<name>listener</name>--> + <!--<value>org.horizon.util.UnitTestTestNGListener</value>--> + <!--</property>--> + <!--</properties>--> </configuration> </plugin> <plugin> Modified: core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/src/test/java/org/horizon/BaseClusteredTest.java 2009-02-09 18:43:20 UTC (rev 7670) @@ -96,7 +96,7 @@ return new ReplListener(c); } - @AfterMethod + @AfterMethod(alwaysRun = true) public void cleanupThreadLocals() { TestingUtil.killCacheManagers(cacheManagerThreadLocal.get().toArray(new CacheManager[cacheManagerThreadLocal.get().size()])); cacheManagerThreadLocal.get().clear(); Modified: core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java =================================================================== --- core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-09 18:30:59 UTC (rev 7669) +++ core/branches/flat/src/test/java/org/horizon/manager/CacheManagerComponentRegistryTest.java 2009-02-09 18:43:20 UTC (rev 7670) @@ -25,9 +25,9 @@ public class CacheManagerComponentRegistryTest { DefaultCacheManager cm; - @AfterMethod + @AfterMethod(alwaysRun = true) public void tearDown() { - if (cm != null) cm.stop(); + TestingUtil.killCacheManagers(cm); } public void testForceSharedComponents() throws NamedCacheNotFoundException {