[jboss-cvs] JBossAS SVN: r67821 - in trunk/testsuite/src: resources/deployers/jbas2904/ear/META-INF and 1 other directory.

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

Author: alesj
Date: 2007-12-03 19:11:58 -0500 (Mon, 03 Dec 2007)
New Revision: 67821

Modified:
   trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
   trunk/testsuite/src/resources/deployers/jbas2904/ear/META-INF/application.xml
Log:
Fixing Ear 2904 test.

Modified: trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java	2007-12-04 00:10:28 UTC (rev 67820)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java	2007-12-04 00:11:58 UTC (rev 67821)
@@ -6,16 +6,15 @@
  */
 package org.jboss.test.deployers.jbas2904.test;
 
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 import java.util.StringTokenizer;
 import javax.management.ObjectName;
 
 import junit.framework.Test;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentContext;
 import org.jboss.test.deployers.AbstractDeploymentTest;
 
 /**
@@ -42,14 +41,12 @@
    {
       DeploymentUnit topInfo = assertDeployed("testdeployers-jbas2904.ear");
       // Expected ordering of the subdeployments
-      Object actualModules[] = topInfo.getChildren().toArray();
-      ArrayList expectedList = new ArrayList(actualModules.length);
+      List<DeploymentUnit> actualModules = topInfo.getChildren();
+      List<String> expectedList = new ArrayList<String>(actualModules.size());
       System.out.println("Expected Deployment Ordering -------> ");
-      for (int count = 0; count < actualModules.length; count++)
+      for (DeploymentUnit child : actualModules)
       {
-         VFSDeploymentContext child = (VFSDeploymentContext) actualModules[count];
-         URL url = child.getRoot().toURL();
-         String moduleName = getModuleDeployed(url.toString());
+         String moduleName = child.getSimpleName();
          expectedList.add(moduleName);
          // System.out.println(" "+moduleName+" lastDeployed
          // :"+child.lastDeployed);
@@ -59,13 +56,13 @@
 
       Deployments deployment1 = new Deployments(
             "Atestdeployerorder-jbas2904.sar",
-            getMBeanLastDeployment(new ObjectName(
-                  "jboss.jbas2904.test.deployers:service=MBean1")));
+            getMBeanLastDeployment(new ObjectName("jboss.jbas2904.test.deployers:service=MBean1"))
+      );
       Deployments deployment2 = new Deployments(
             "Btestdeployerorder-jbas2904.sar",
-            getMBeanLastDeployment(new ObjectName(
-                  "jboss.jbas2904.test.deployers:service=MBean2")));
-      ArrayList precisionDeployments = new ArrayList();
+            getMBeanLastDeployment(new ObjectName("jboss.jbas2904.test.deployers:service=MBean2"))
+      );
+      List<Deployments> precisionDeployments = new ArrayList<Deployments>();
       precisionDeployments.add(deployment1);
       precisionDeployments.add(deployment2);
       DeploymentInfoComparator comparator = new DeploymentInfoComparator();
@@ -78,10 +75,8 @@
       for (int count = 0; count < preciseModulesExpected.length; count++)
       {
          Deployments deployment = (Deployments) preciseModulesExpected[count];
-         System.out.println("	" + deployment.getDuName() + " : "
-               + deployment.getLastDeployed());
-         String expectedModule = ((Deployments) preciseModulesExpected[count])
-               .getDuName();
+         System.out.println("	" + deployment.getDuName() + " : " + deployment.getLastDeployed());
+         String expectedModule = ((Deployments) preciseModulesExpected[count]).getDuName();
          assertEquals(expectedModules[count], expectedModule);
       }
    }
@@ -102,8 +97,7 @@
       String method = "getLastDeployed";
       Object args[] = {};
       String[] sig = {};
-      Long lastDeployed = (Long) invoke(objName, method, args, sig);
-      return lastDeployed.longValue();
+      return (Long) invoke(objName, method, args, sig);
    }
 }
 
@@ -130,20 +124,18 @@
    }
 }
 
-class DeploymentInfoComparator implements Comparator
+class DeploymentInfoComparator implements Comparator<Deployments>
 {
-   public int compare(Object o1, Object o2)
+   public int compare(Deployments o1, Deployments o2)
    {
-      long deployedTime1 = ((Deployments) o1).getLastDeployed();
-      long deployedTime2 = ((Deployments) o2).getLastDeployed();
+      long deployedTime1 = o1.getLastDeployed();
+      long deployedTime2 = o2.getLastDeployed();
       long timediff = deployedTime1 - deployedTime2;
       int retVal = 0;
-      if (timediff == 0)
-         retVal = retVal;
+      if (timediff > 0)
+         retVal = 1;
       else if (timediff < 0)
          retVal = -1;
-      else
-         retVal = 1;
       return retVal;
    }
 }
\ No newline at end of file

Modified: trunk/testsuite/src/resources/deployers/jbas2904/ear/META-INF/application.xml
===================================================================
--- trunk/testsuite/src/resources/deployers/jbas2904/ear/META-INF/application.xml	2007-12-04 00:10:28 UTC (rev 67820)
+++ trunk/testsuite/src/resources/deployers/jbas2904/ear/META-INF/application.xml	2007-12-04 00:11:58 UTC (rev 67821)
@@ -1,12 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <application version="1.4"
-             xmlns="http://java.sun.com/xml/ns/j2ee" 
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+             xmlns="http://java.sun.com/xml/ns/j2ee"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
              xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee 
                                  http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
->
+      >
 
    <display-name>EAR Deployment Test</display-name>
+
+   <module>
+      <ejb>Atestdeployerorder-jbas2904.sar</ejb>
+   </module>
+   <module>
+      <ejb>Btestdeployerorder-jbas2904.sar</ejb>
+   </module>
+
 </application>