[jboss-cvs] JBossAS SVN: r75536 - projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search.

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

Author: alesj
Date: 2008-07-09 05:43:47 -0400 (Wed, 09 Jul 2008)
New Revision: 75536

Modified:
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/AbstractSearchAnnotationSupportTest.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/OrderSearchAnnotationSupportTestCase.java
Log:
Add search plugin at setup, remove at tear down.

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/AbstractSearchAnnotationSupportTest.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/AbstractSearchAnnotationSupportTest.java	2008-07-09 09:40:20 UTC (rev 75535)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/AbstractSearchAnnotationSupportTest.java	2008-07-09 09:43:47 UTC (rev 75536)
@@ -49,13 +49,19 @@
       super(name);
    }
 
-   protected BeanAnnotationAdapter getBeanAnnotationAdapterClass()
+   protected void setUp() throws Exception
    {
+      super.setUp();
+
       AbstractBeanAnnotationAdapter adapter = BasicBeanAnnotationAdapter.INSTANCE;
       adapter.addAnnotationPlugin(SearchPropertyAnnotationPlugin.INSTANCE);
-      return adapter;
    }
 
+   protected BeanAnnotationAdapter getBeanAnnotationAdapterClass()
+   {
+      return BasicBeanAnnotationAdapter.INSTANCE;
+   }
+
    protected void tearDown() throws Exception
    {
       AbstractBeanAnnotationAdapter adapter = BasicBeanAnnotationAdapter.INSTANCE;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/OrderSearchAnnotationSupportTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/OrderSearchAnnotationSupportTestCase.java	2008-07-09 09:40:20 UTC (rev 75535)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/annotations/test/search/OrderSearchAnnotationSupportTestCase.java	2008-07-09 09:43:47 UTC (rev 75536)
@@ -29,9 +29,6 @@
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
-import org.jboss.kernel.plugins.annotations.AbstractBeanAnnotationAdapter;
-import org.jboss.kernel.plugins.annotations.BasicBeanAnnotationAdapter;
-import org.jboss.kernel.plugins.annotations.SearchPropertyAnnotationPlugin;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.test.kernel.annotations.support.SearchInjection;
 
@@ -52,14 +49,6 @@
       return suite(OrderSearchAnnotationSupportTestCase.class);
    }
 
-   protected void setUp() throws Exception
-   {
-      super.setUp();
-
-      AbstractBeanAnnotationAdapter adapter = BasicBeanAnnotationAdapter.INSTANCE;
-      adapter.addAnnotationPlugin(SearchPropertyAnnotationPlugin.INSTANCE);
-   }
-
    public void testWrongOrder() throws Throwable
    {
       KernelController controller = getController();