[jboss-cvs] JBossAS SVN: r71905 - in projects/jboss-cl/trunk: classloading/src/tests/org/jboss/test/classloading/dependency/test and 1 other directory.

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

Author: alesj
Date: 2008-04-10 07:12:11 -0400 (Thu, 10 Apr 2008)
New Revision: 71905

Modified:
   projects/jboss-cl/trunk/build/pom.xml
   projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java
Log:
Updating to new MC 2.0.0.Beta13.

Modified: projects/jboss-cl/trunk/build/pom.xml
===================================================================
--- projects/jboss-cl/trunk/build/pom.xml	2008-04-10 10:38:37 UTC (rev 71904)
+++ projects/jboss-cl/trunk/build/pom.xml	2008-04-10 11:12:11 UTC (rev 71905)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.jboss</groupId>
     <artifactId>jboss-parent</artifactId>
-    <version>4-beta-1</version>
+    <version>4-beta-2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jboss.cl</groupId>
@@ -32,7 +32,7 @@
 
   <properties>
     <version.jboss.man>2.0.0.Beta12</version.jboss.man>
-    <version.jboss.microcontainer>2.0.0.Beta12</version.jboss.microcontainer>
+    <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
     <version.jboss.common.core>2.2.4.GA</version.jboss.common.core>
     <version.jboss.common.logging.spi>2.0.4.GA</version.jboss.common.logging.spi>
     <version.jboss.common.logging.log4j>2.0.4.GA</version.jboss.common.logging.log4j>

Modified: projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java
===================================================================
--- projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java	2008-04-10 10:38:37 UTC (rev 71904)
+++ projects/jboss-cl/trunk/classloading/src/tests/org/jboss/test/classloading/dependency/test/AbstractMockClassLoaderUnitTest.java	2008-04-10 11:12:11 UTC (rev 71905)
@@ -24,7 +24,6 @@
 import java.util.Collections;
 
 import junit.framework.Test;
-
 import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
 import org.jboss.beans.metadata.plugins.InstallCallbackMetaData;
 import org.jboss.beans.metadata.plugins.UninstallCallbackMetaData;
@@ -39,6 +38,7 @@
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoaderPolicyModule;
 import org.jboss.classloading.spi.dependency.policy.mock.MockClassLoadingMetaData;
 import org.jboss.dependency.spi.ControllerState;
+import org.jboss.dependency.spi.ControllerStateModel;
 import org.jboss.kernel.Kernel;
 import org.jboss.kernel.plugins.bootstrap.AbstractBootstrap;
 import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
@@ -78,7 +78,10 @@
    
    protected MockClassLoaderPolicyModule assertModule(KernelControllerContext context) throws Exception
    {
-      assertEquals(context.getName() + " should be installed: " + context.getState() + " unresolved=" + context.getDependencyInfo().getUnresolvedDependencies(), ControllerState.INSTALLED, context.getState());
+      ControllerStateModel states = context.getController().getStates();
+      ControllerState state = context.getState();
+      ControllerState next = states.getNextState(state);
+      assertEquals(context.getName() + " should be installed: " + state + " unresolved=" + context.getDependencyInfo().getUnresolvedDependencies(next), ControllerState.INSTALLED, context.getState());
       Object target = context.getTarget();
       assertNotNull(target);
       return assertInstanceOf(target, MockClassLoaderPolicyModule.class);