[jboss-cvs] JBossAS SVN: r99043 - in projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations: test and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2010-01-05 14:10:07 -0500 (Tue, 05 Jan 2010)
New Revision: 99043

Modified:
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderedPluginAnnotationAdapter.java
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/OrderedAnnotationPluginsTestCase.java
Log:
[JBKERNEL-75] Make sure that the bug in removeAnnotationPlugin() is tested in the kernel project

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderedPluginAnnotationAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderedPluginAnnotationAdapter.java	2010-01-05 19:00:48 UTC (rev 99042)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/support/TestOrderedPluginAnnotationAdapter.java	2010-01-05 19:10:07 UTC (rev 99043)
@@ -28,8 +28,10 @@
  */
 public class TestOrderedPluginAnnotationAdapter extends AbstractBeanAnnotationAdapter
 {
+   public static final TestOrderPlugin<Green> PLUGIN_NINE = new TestOrderPlugin<Green>(Green.class, 9); 
+
    public static final TestOrderedPluginAnnotationAdapter INSTANCE = new TestOrderedPluginAnnotationAdapter();
-
+   
    private TestOrderedPluginAnnotationAdapter()
    {
       addAnnotationPlugin(new TestOrderPlugin<Green>(Green.class, 0));
@@ -41,6 +43,6 @@
       addAnnotationPlugin(new TestOrderPlugin<Green>(Green.class, 6));
       addAnnotationPlugin(new TestOrderPlugin<Green>(Green.class, 7));
       addAnnotationPlugin(new TestOrderPlugin<Green>(Green.class, 8));
-      addAnnotationPlugin(new TestOrderPlugin<Green>(Green.class, 9));
+      addAnnotationPlugin(PLUGIN_NINE);
    }
 }

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/OrderedAnnotationPluginsTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/OrderedAnnotationPluginsTestCase.java	2010-01-05 19:00:48 UTC (rev 99042)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/annotations/test/OrderedAnnotationPluginsTestCase.java	2010-01-05 19:10:07 UTC (rev 99043)
@@ -53,20 +53,32 @@
       return TestOrderedPluginAnnotationAdapter.INSTANCE;
    }
 
-   public void testCleanup() throws Throwable
+   public void testOrdered() throws Throwable
    {
+      testOrder(10);
+   }
+   
+   public void testRemovingAndAddingPlugin() throws Throwable
+   {
+      TestOrderedPluginAnnotationAdapter.INSTANCE.removeAnnotationPlugin(TestOrderedPluginAnnotationAdapter.PLUGIN_NINE);
+      testOrder(9);
+      TestOrderedPluginAnnotationAdapter.INSTANCE.addAnnotationPlugin(TestOrderedPluginAnnotationAdapter.PLUGIN_NINE);
+      testOrder(10);
+   }
+
+   private void testOrder(int max) throws Throwable
+   {
       TestOrderPlugin.clear();
       runAnnotationsOnTarget(new TestOrderPluginBean());
       
       List<Integer> applied = TestOrderPlugin.getApplied();
-      assertEquals(10, applied.size());
-      for (int i = 0 ; i < 10 ; i++)
+      assertEquals(max, applied.size());
+      for (int i = 0 ; i < max ; i++)
          assertEquals(Integer.valueOf(i), applied.get(i));
       
       List<Integer> cleaned = TestOrderPlugin.getCleaned();
-      assertEquals(10, cleaned.size());
-      for (int i = 0 ; i < 10 ; i++)
+      assertEquals(max, cleaned.size());
+      for (int i = 0 ; i < max ; i++)
          assertEquals(Integer.valueOf(i), cleaned.get(i));
    }
-
 }