[jboss-cvs] JBossAS SVN: r70364 - in projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata: test and 1 other directory.

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

Author: alesj
Date: 2008-03-04 10:01:18 -0500 (Tue, 04 Mar 2008)
New Revision: 70364

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/support/TestClassAnnotation.java
   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/ClassAnnotationTestCase.java
Log:
Removing static usage of MetaData + fixing the test with AOP enabled.

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/support/TestClassAnnotation.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/support/TestClassAnnotation.java	2008-03-04 14:52:18 UTC (rev 70363)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/support/TestClassAnnotation.java	2008-03-04 15:01:18 UTC (rev 70364)
@@ -21,8 +21,6 @@
 */
 package org.jboss.test.kernel.metadata.support;
 
-import org.jboss.test.kernel.metadata.test.AbstractMetaDataTest;
-
 /**
  * TestClassAnnotation.
  * 
@@ -35,7 +33,6 @@
 {
    public TestClassAnnotation()
    {
-      AbstractMetaDataTest.peekMetaData();
    }
    
    @TestAnnotationA("NotOverridden")

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-03-04 14:52:18 UTC (rev 70363)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/AbstractMetaDataTest.java	2008-03-04 15:01:18 UTC (rev 70364)
@@ -28,7 +28,6 @@
 import org.jboss.metadata.spi.repository.MetaDataRepository;
 import org.jboss.metadata.spi.scope.CommonLevels;
 import org.jboss.metadata.spi.scope.ScopeKey;
-import org.jboss.metadata.spi.stack.MetaDataStack;
 import org.jboss.test.AbstractTestDelegate;
 import org.jboss.test.kernel.junit.MicrocontainerTest;
 
@@ -45,25 +44,11 @@
       super(name);
    }
    
-   private static MetaData peekedMetaData;
-
-   public static void peekMetaData()
-   {
-      peekedMetaData = MetaDataStack.peek();
-   }
-   
    protected void setUp() throws Exception
    {
       super.setUp();
-      peekedMetaData = null;
    }
 
-   protected MetaData assertPeekedMetaData()
-   {
-      assertNotNull(peekedMetaData);
-      return peekedMetaData;
-   }
-   
    protected ScopeKey assertRetrievals(String name)
    {
       KernelControllerContext context = getControllerContext(name);

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-03-04 14:52:18 UTC (rev 70363)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/metadata/test/ClassAnnotationTestCase.java	2008-03-04 15:01:18 UTC (rev 70364)
@@ -22,12 +22,14 @@
 package org.jboss.test.kernel.metadata.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;
 
@@ -49,6 +51,22 @@
       super(name);
    }
 
+   protected MetaData assertMetaData()
+   {
+      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;
@@ -56,7 +74,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData metaData = assertPeekedMetaData();
+         MetaData metaData = assertMetaData();
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("NotOverridden", a.value());
          TestAnnotationB b = assertAnnotation(metaData, TestAnnotationB.class);
@@ -78,7 +96,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData metaData = assertPeekedMetaData();
+         MetaData metaData = assertMetaData();
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("Overridden", a.value());
          TestAnnotationB b = assertAnnotation(metaData, TestAnnotationB.class);
@@ -100,7 +118,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData metaData = assertPeekedMetaData();
+         MetaData metaData = assertMetaData();
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("NotOverridden", a.value());
          TestAnnotationB b = assertAnnotation(metaData, TestAnnotationB.class);
@@ -122,7 +140,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData classMetaData = assertPeekedMetaData();
+         MetaData classMetaData = assertMetaData();
          MetaData metaData = classMetaData.getComponentMetaData(new MethodSignature("getSomething"));
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("NotOverridden", a.value());
@@ -151,7 +169,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData classMetaData = assertPeekedMetaData();
+         MetaData classMetaData = assertMetaData();
          MetaData metaData = classMetaData.getComponentMetaData(new MethodSignature("getSomething"));
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("Overridden", a.value());
@@ -180,7 +198,7 @@
       try
       {
          scope = assertRetrievals("Name1");
-         MetaData classMetaData = assertPeekedMetaData();
+         MetaData classMetaData = assertMetaData();
          MetaData metaData = classMetaData.getComponentMetaData(new MethodSignature("getSomething"));
          TestAnnotationA a = assertAnnotation(metaData, TestAnnotationA.class);
          assertEquals("NotOverridden", a.value());