[Jboss-cvs] JBossAS SVN: r55853 - in projects/microcontainer/trunk: dependency/src/main/org/jboss/dependency/plugins kernel/src/tests/org/jboss/test/kernel/inject/test

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

Author: alesj
Date: 2006-08-13 12:26:29 -0400 (Sun, 13 Aug 2006)
New Revision: 55853

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java
Log:
AbstractController.allContexts.remove after failure in confiruration phase.
Added NullName expected throwable.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2006-08-13 15:45:00 UTC (rev 55852)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2006-08-13 16:26:29 UTC (rev 55853)
@@ -443,6 +443,7 @@
          {
             log.error("Error installing to " + toState.getStateString() + ": " + context.toShortString(), error);
             uninstallContext(context, ControllerState.NOT_INSTALLED, trace);
+            allContexts.remove(context.getName()); //missing if contexts failes during configuration phase
             errorContexts.add(context);
             context.setError(error);
             return false;

Modified: projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java	2006-08-13 15:45:00 UTC (rev 55852)
+++ projects/microcontainer/trunk/kernel/src/tests/org/jboss/test/kernel/inject/test/PropertyContextualInjectionTestCase.java	2006-08-13 16:26:29 UTC (rev 55853)
@@ -49,6 +49,8 @@
 
    public void testContextualInjection() throws Throwable
    {
+//      enableTrace("org.jboss.kernel");
+//      enableTrace("org.jboss.dependency");
       for(int i = 0; i < PropertyContextualInjectionTestCase.PREFIX.length; i++)
       {
          for(int j = 0; j < PropertyContextualInjectionTestCase.NUMBER.length; j++)
@@ -101,7 +103,8 @@
    {
       boolean isMultiple = testCaseName.indexOf("Multiple") >= 0;
       boolean isNull = testCaseName.indexOf("Null") >= 0;
-      return isMultiple || (isNull && isStrict(testCaseName));
+      boolean isName = testCaseName.indexOf("Name") >= 0;
+      return isMultiple || (isNull && isStrict(testCaseName) || (isNull && isName));
    }
 
    private boolean isStrict(String testCaseName)