[infinispan-commits] Infinispan SVN: r970 - in trunk/core/src/test/java/org/infinispan: test and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-10-19 11:53:34 -0400 (Mon, 19 Oct 2009)
New Revision: 970

Modified:
   trunk/core/src/test/java/org/infinispan/jndi/BindingTest.java
   trunk/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
   trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
Log:
[ISPN-153] (Test that Infinispan Cache and CacheManager instances can be bound to JNDI) Removed dependsOnMethods since lower level @AfterClass are called from leaf all the way up to ancestor.

Modified: trunk/core/src/test/java/org/infinispan/jndi/BindingTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jndi/BindingTest.java	2009-10-19 14:16:33 UTC (rev 969)
+++ trunk/core/src/test/java/org/infinispan/jndi/BindingTest.java	2009-10-19 15:53:34 UTC (rev 970)
@@ -66,9 +66,8 @@
       props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
    }
 
-   @Override
    @AfterClass
-   public void preDestroy() throws Exception {
+   public void stopNaming() throws Exception {
       namingServer.destroy();
       namingMain.stop();
    }

Modified: trunk/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java	2009-10-19 14:16:33 UTC (rev 969)
+++ trunk/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java	2009-10-19 15:53:34 UTC (rev 970)
@@ -35,7 +35,7 @@
 public class AbstractInfinispanTest {
    
    @AfterClass(alwaysRun=true)
-   protected void zzzNullifyInstanceFields() {
+   protected void nullifyInstanceFields() {
       for(Class<?> current = this.getClass();current.getSuperclass() != null; current = current.getSuperclass()) {
          Field[] fields = current.getDeclaredFields();
          for(Field f:fields) {

Modified: trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-10-19 14:16:33 UTC (rev 969)
+++ trunk/core/src/test/java/org/infinispan/test/SingleCacheManagerTest.java	2009-10-19 15:53:34 UTC (rev 970)
@@ -45,19 +45,8 @@
    protected void createBeforeMethod() throws Exception {
       if (cleanup == CleanupPhase.AFTER_METHOD) cacheManager = createCacheManager();
    }
-
-   /**
-    * This method will always be called before {@link #destroyAfterClass()}.  If you override this, make sure you
-    * annotate the overridden method with {@link org.testng.annotations.AfterClass}.
-    *
-    * @throws Exception Just in case
-    */
-   @AfterClass
-   public void preDestroy() throws Exception {
-      // no op, made for overriding.
-   }
    
-   @AfterClass(alwaysRun=true, dependsOnMethods = "org.infinispan.*.preDestroy")
+   @AfterClass(alwaysRun=true)
    protected void destroyAfterClass() {
       if (cleanup == CleanupPhase.AFTER_TEST) TestingUtil.killCacheManagers(cacheManager);
    }