[jboss-cvs] JBossAS SVN: r71297 - in trunk/testsuite: src/main/org/jboss/test/kernel/deployment/jboss/beans/dependspojo and 1 other directories.

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

Author: adrian at jboss.org
Date: 2008-03-26 09:26:05 -0400 (Wed, 26 Mar 2008)
New Revision: 71297

Modified:
   trunk/testsuite/imports/sections/kernel.xml
   trunk/testsuite/src/main/org/jboss/test/kernel/deployment/jboss/beans/dependspojo/SimpleService.java
   trunk/testsuite/src/resources/kernel/deployment/dependspojoear/META-INF/application.xml
Log:
Fix the old MC tests. It didn't deploy because of a broken application.xml and it was making incorrect assumptions about dependent state.

Modified: trunk/testsuite/imports/sections/kernel.xml
===================================================================
--- trunk/testsuite/imports/sections/kernel.xml	2008-03-26 11:36:23 UTC (rev 71296)
+++ trunk/testsuite/imports/sections/kernel.xml	2008-03-26 13:26:05 UTC (rev 71297)
@@ -66,6 +66,7 @@
          </fileset>
          <fileset dir="${build.lib}">
             <include name="testkernel-dependspojo.beans"/>
+            <include name="tests-dummy.jar"/>
          </fileset>
       </jar>
    </target>

Modified: trunk/testsuite/src/main/org/jboss/test/kernel/deployment/jboss/beans/dependspojo/SimpleService.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/kernel/deployment/jboss/beans/dependspojo/SimpleService.java	2008-03-26 11:36:23 UTC (rev 71296)
+++ trunk/testsuite/src/main/org/jboss/test/kernel/deployment/jboss/beans/dependspojo/SimpleService.java	2008-03-26 13:26:05 UTC (rev 71297)
@@ -22,6 +22,8 @@
 package org.jboss.test.kernel.deployment.jboss.beans.dependspojo;
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.List;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -108,7 +110,7 @@
    {
       log("create()");
       state = CREATED;
-      checkDependencies(CREATED);
+      checkDependencies(CREATED, STARTED);
    }
    
    public void start() throws Exception
@@ -129,7 +131,7 @@
    {
       log("destroy()");
       state = DESTROYED;      
-      checkDependencies(STOPPED);
+      checkDependencies(STOPPED, STARTED);
    }
    
    // protected -----------------------------------------------------
@@ -144,8 +146,9 @@
       return BASE_JNDI_NAME + '/' + name;
    }
    
-   protected void checkDependencies(String desiredState)
+   protected void checkDependencies(String... desiredStates)
    {
+      List<String> desired = Arrays.asList(desiredStates);
       if (depends != null)
       {
          for (int i = 0; i < depends.length; i++)
@@ -153,14 +156,9 @@
             try
             {
                SimpleService other = (SimpleService)ctx.lookup(getJndiName(depends[i]));
-               if (other.getState().equals(desiredState))
-               {
-                  log(depends[i] + " is " + other.getState());
-               }
-               else
-               {
-                  throw new IllegalStateException(depends[i] + " not " + desiredState);
-               }
+               log(depends[i] + " is " + other.getState());
+               if (desired.contains(other.getState()) == false)
+                  throw new IllegalStateException(depends[i] + " at " + other.getState() + " not in " + desired);
             }
             catch (NamingException e)
             {

Modified: trunk/testsuite/src/resources/kernel/deployment/dependspojoear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/kernel/deployment/dependspojoear/META-INF/application.xml	2008-03-26 11:36:23 UTC (rev 71296)
+++ trunk/testsuite/src/resources/kernel/deployment/dependspojoear/META-INF/application.xml	2008-03-26 13:26:05 UTC (rev 71297)
@@ -9,5 +9,7 @@
 
    <display-name>Kernel EAR Deployment Test</display-name>
 
+   <module><java>tests-dummy.jar</java></module>
+
 </application>