[jboss-cvs] JBossAS SVN: r89522 - in projects/microcontainer/trunk/dependency/src: test/java/org/jboss/test/dependency/controller/test and 1 other directory.

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

Author: alesj
Date: 2009-05-29 03:39:59 -0400 (Fri, 29 May 2009)
New Revision: 89522

Modified:
   projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java
   projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ManualControllerTestCase.java
Log:
Asynch should be the same as auto.
Add test to check if auto doesn't move manual.

Modified: projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java	2009-05-29 07:28:27 UTC (rev 89521)
+++ projects/microcontainer/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerMode.java	2009-05-29 07:39:59 UTC (rev 89522)
@@ -42,7 +42,7 @@
    @XmlEnumValue("On Demand") ON_DEMAND("On Demand", ControllerState.DESCRIBED),
    MANUAL("Manual"),
    DISABLED("Disabled"),
-   ASYNCHRONOUS("Asynchronous");
+   ASYNCHRONOUS("Asynchronous", ControllerState.INSTALLED);
 
    /** The mode string */
    private final String modeString;

Modified: projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ManualControllerTestCase.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ManualControllerTestCase.java	2009-05-29 07:28:27 UTC (rev 89521)
+++ projects/microcontainer/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ManualControllerTestCase.java	2009-05-29 07:39:59 UTC (rev 89522)
@@ -328,4 +328,20 @@
       assertEquals(-1, dependee.instantiateUninstallOrder);
       assertEquals(-1, dependee.describeUninstallOrder);
    }
+
+   public void testManualAndAutoMixed() throws Throwable
+   {
+      ControllerContext manual = createControllerContext("Manual");
+      manual.setMode(ControllerMode.MANUAL);
+      install(manual);
+      assertChange(manual, ControllerState.DESCRIBED, ControllerState.DESCRIBED);
+
+      ControllerContext auto = createControllerContext("Auto");
+      auto.setMode(ControllerMode.AUTOMATIC);
+      install(auto);
+      assertContext(auto);
+
+      // check that the auto doesn't move the manual
+      assertContext(manual, ControllerState.DESCRIBED);
+   }
 }