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

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

Author: kabir.khan at jboss.com
Date: 2010-01-05 14:00:48 -0500 (Tue, 05 Jan 2010)
New Revision: 99042

Modified:
   projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
Log:
[JBKERNEL-75] Fix the remaining tests

Modified: projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java
===================================================================
--- projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java	2010-01-05 18:43:39 UTC (rev 99041)
+++ projects/kernel/trunk/aop-mc-int/src/test/java/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java	2010-01-05 19:00:48 UTC (rev 99042)
@@ -43,16 +43,16 @@
       {
       }
       
-//      getAssertInstalledLifecycleCallback("DescribeAdvice1");
-//      getAssertInstalledLifecycleCallback("DescribeAdvice2");
-//      getAssertInstalledLifecycleCallback("InstantiateAdvice1");
-//      getAssertInstalledLifecycleCallback("InstantiateAdvice2");
-//      getAssertInstalledLifecycleCallback("ConfigureAdvice1");
-//      getAssertInstalledLifecycleCallback("ConfigureAdvice2");
-//      getAssertInstalledLifecycleCallback("CreateAdvice1");
-//      getAssertInstalledLifecycleCallback("CreateAdvice2");
-//      getAssertInstalledLifecycleCallback("StartAdvice1");
-//      getAssertInstalledLifecycleCallback("StartAdvice2");
+      getAssertInstalledLifecycleCallback("DescribeAdvice1");
+      getAssertInstalledLifecycleCallback("DescribeAdvice2");
+      getAssertInstalledLifecycleCallback("InstantiateAdvice1");
+      getAssertInstalledLifecycleCallback("InstantiateAdvice2");
+      getAssertInstalledLifecycleCallback("ConfigureAdvice1");
+      getAssertInstalledLifecycleCallback("ConfigureAdvice2");
+      getAssertInstalledLifecycleCallback("CreateAdvice1");
+      getAssertInstalledLifecycleCallback("CreateAdvice2");
+      getAssertInstalledLifecycleCallback("StartAdvice1");
+      getAssertInstalledLifecycleCallback("StartAdvice2");
       getAssertInstalledLifecycleCallback("InstallAdvice1");
       getAssertInstalledLifecycleCallback("InstallAdvice2");
 
@@ -68,16 +68,16 @@
       assertFalse(startNotInvoked.isUninstalledContext());
       
       //Lifecycle callbacks from previous states should have had uninstall called
-//      getAssertUninstalledLifecycleCallback("DescribeAdvice1");
-//      getAssertUninstalledLifecycleCallback("DescribeAdvice2");
-//      getAssertUninstalledLifecycleCallback("InstantiateAdvice1");
-//      getAssertUninstalledLifecycleCallback("InstantiateAdvice2");
-//      getAssertUninstalledLifecycleCallback("ConfigureAdvice1");
-//      getAssertUninstalledLifecycleCallback("ConfigureAdvice2");
-//      getAssertUninstalledLifecycleCallback("CreateAdvice1");
-//      getAssertUninstalledLifecycleCallback("CreateAdvice2");
-//      getAssertUninstalledLifecycleCallback("StartAdvice1");
-//      getAssertUninstalledLifecycleCallback("StartAdvice2");
+      getAssertUninstalledLifecycleCallback("DescribeAdvice1");
+      getAssertUninstalledLifecycleCallback("DescribeAdvice2");
+      getAssertUninstalledLifecycleCallback("InstantiateAdvice1");
+      getAssertUninstalledLifecycleCallback("InstantiateAdvice2");
+      getAssertUninstalledLifecycleCallback("ConfigureAdvice1");
+      getAssertUninstalledLifecycleCallback("ConfigureAdvice2");
+      getAssertUninstalledLifecycleCallback("CreateAdvice1");
+      getAssertUninstalledLifecycleCallback("CreateAdvice2");
+      getAssertUninstalledLifecycleCallback("StartAdvice1");
+      getAssertUninstalledLifecycleCallback("StartAdvice2");
       getAssertUninstalledLifecycleCallback("InstallAdvice1");
       getAssertUninstalledLifecycleCallback("InstallAdvice2");
    }

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2010-01-05 18:43:39 UTC (rev 99041)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/annotations/CommonAnnotationAdapter.java	2010-01-05 19:00:48 UTC (rev 99042)
@@ -156,7 +156,7 @@
             Map<Class<? extends Annotation>, Set<T>> pluginsForType = pluginsMap.get(type);
             if (pluginsForType != null)
             {
-               Set<T> plugins = pluginsForType.remove(plugin.getAnnotation());
+               Set<T> plugins = pluginsForType.get(plugin.getAnnotation());
                if (plugins != null)
                {
                   plugins.remove(plugin);
@@ -237,7 +237,7 @@
             Map<Class<? extends Annotation>, Set<T>> pluginsForType = metaAnnotationsPluginsMap.get(type);
             if (pluginsForType != null)
             {
-               Set<T> plugins = pluginsForType.remove(((MetaAnnotationPlugin<?, ?>)plugin).getMetaAnnotation());
+               Set<T> plugins = pluginsForType.get(((MetaAnnotationPlugin<?, ?>)plugin).getMetaAnnotation());
                if (plugins != null)
                {
                   plugins.remove(plugin);