[jboss-cvs] JBossAS SVN: r76914 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-08-11 09:13:30 -0400 (Mon, 11 Aug 2008)
New Revision: 76914

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/CachingMetaDataRepositoryTestCase.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/ClassAnnotationTestCase.java
Log:
Caching metadata repository test - tear down.

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java	2008-08-11 13:06:57 UTC (rev 76913)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java	2008-08-11 13:13:30 UTC (rev 76914)
@@ -30,6 +30,7 @@
 import org.jboss.metadata.spi.scope.ScopeKey;
 import org.jboss.test.AbstractTestDelegate;
 import org.jboss.test.kernel.junit.MicrocontainerTest;
+import org.jboss.dependency.spi.ScopeInfo;
 
 /**
  * MetaData Test Case.
@@ -49,6 +50,17 @@
       super.setUp();
    }
 
+   protected MetaData assertMetaData(String name)
+   {
+      KernelControllerContext context = getControllerContext(name);
+      assertNotNull(context);
+      ScopeInfo scopeInfo = context.getScopeInfo();
+      assertNotNull(scopeInfo);
+      MetaData metaData = scopeInfo.getMetaData();
+      assertNotNull(metaData);
+      return metaData;
+   }
+
    protected ScopeKey assertRetrievals(String name)
    {
       KernelControllerContext context = getControllerContext(name);

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/CachingMetaDataRepositoryTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/CachingMetaDataRepositoryTestCase.java	2008-08-11 13:06:57 UTC (rev 76913)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/CachingMetaDataRepositoryTestCase.java	2008-08-11 13:13:30 UTC (rev 76914)
@@ -22,8 +22,6 @@
 package org.jboss.test.kernel.metadata.test;
 
 import junit.framework.Test;
-import org.jboss.dependency.spi.ScopeInfo;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
 import org.jboss.kernel.spi.metadata.KernelMetaDataRepository;
 import org.jboss.metadata.spi.MetaData;
@@ -57,20 +55,16 @@
       return MicrocontainerTest.getDelegate(clazz);
    }
 
-   protected MetaData assertMetaData()
+   @Override
+   protected void tearDown() throws Exception
    {
-      return assertMetaData("Name1");
+      System.clearProperty(KernelMetaDataRepository.class.getName());      
+      super.tearDown();
    }
 
-   protected MetaData assertMetaData(String name)
+   protected MetaData assertMetaData()
    {
-      KernelControllerContext context = getControllerContext(name);
-      assertNotNull(context);
-      ScopeInfo scopeInfo = context.getScopeInfo();
-      assertNotNull(scopeInfo);
-      MetaData metaData = scopeInfo.getMetaData();
-      assertNotNull(metaData);
-      return metaData;
+      return assertMetaData("Name1");
    }
 
    public void testTouchCachingMetaDataRepository() throws Exception

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/ClassAnnotationTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/ClassAnnotationTestCase.java	2008-08-11 13:06:57 UTC (rev 76913)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/ClassAnnotationTestCase.java	2008-08-11 13:13:30 UTC (rev 76914)
@@ -21,18 +21,15 @@
 */
 package org.jboss.test.kernel.metadata.test;
 
+import junit.framework.Test;
 import org.jboss.kernel.spi.deployment.KernelDeployment;
-import org.jboss.kernel.spi.dependency.KernelControllerContext;
 import org.jboss.metadata.spi.MetaData;
 import org.jboss.metadata.spi.scope.ScopeKey;
 import org.jboss.metadata.spi.signature.MethodSignature;
 import org.jboss.test.kernel.metadata.support.TestAnnotationA;
 import org.jboss.test.kernel.metadata.support.TestAnnotationB;
 import org.jboss.test.kernel.metadata.support.TestAnnotationC;
-import org.jboss.dependency.spi.ScopeInfo;
 
-import junit.framework.Test;
-
 /**
  * ClassAnnotationTestCase.
  * 
@@ -56,17 +53,6 @@
       return assertMetaData("Name1");
    }
 
-   protected MetaData assertMetaData(String name)
-   {
-      KernelControllerContext context = getControllerContext(name);
-      assertNotNull(context);
-      ScopeInfo scopeInfo = context.getScopeInfo();
-      assertNotNull(scopeInfo);
-      MetaData metaData = scopeInfo.getMetaData();
-      assertNotNull(metaData);
-      return metaData;
-   }
-
    public void testClassAnnotationNoOverride() throws Throwable
    {
       ScopeKey scope = null;