[jboss-cvs] JBossAS SVN: r58276 - in trunk/testsuite/src/main/org/jboss/test/deployers: . client/test ear/test ejb/test jbas2904/test rar/test sar/test web/test
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Nov 11 20:59:34 EST 2006
Author: scott.stark at jboss.org
Date: 2006-11-11 20:59:20 -0500 (Sat, 11 Nov 2006)
New Revision: 58276
Modified:
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/client/test/UnpackedClientDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/UnpackedEARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/EJBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/UnpackedEJBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/RARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/UnpackedRARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/SARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/UnpackedSARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/web/test/UnpackedWEBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/web/test/WEBDeploymentUnitTestCase.java
Log:
Update for VDF changes
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -1,6 +1,6 @@
/*
* JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -22,14 +22,13 @@
package org.jboss.test.deployers;
import java.net.URL;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import javax.management.MBeanServerConnection;
-import org.jboss.deployment.DeploymentInfo;
-import org.jboss.deployment.DeploymentState;
+import org.jboss.deployers.spi.structure.DeploymentContext;
+import org.jboss.deployers.spi.structure.DeploymentState;
import org.jboss.deployment.MainDeployerMBean;
import org.jboss.test.JBossTestCase;
@@ -37,6 +36,7 @@
* Abstract deployment test.
*
* @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @author Scott.Stark at jboss.org
* @version $Revision$
*/
public class AbstractDeploymentTest extends JBossTestCase
@@ -71,24 +71,35 @@
public static final String notSar1Deployment = "mbean1-not.asar";
public static final String notSar1DeploymentUnpacked = "unpacked-mbean1-not.asar";
- protected DeploymentInfo assertDeployed(String deployment) throws Exception
+ protected DeploymentContext assertDeployed(String deployment) throws Exception
{
- DeploymentInfo result = getDeploymentInfo(deployment);
+ DeploymentContext result = getDeploymentInfo(deployment);
assertNotNull("Unable to retrieve deployment info for " + deployment, result);
return result;
}
-
+
+ protected void assertDeployed(String deployment, Set expected) throws Exception
+ {
+ DeploymentContext topInfo = assertDeployed(deployment);
+ CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
+ visitor.start(topInfo);
+ assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ }
+
protected void assertNotDeployed(String deployment) throws Exception
{
- DeploymentInfo result = getDeploymentInfo(deployment);
+ DeploymentContext result = getDeploymentInfo(deployment);
assertNull("Should not be deployed " + result, result);
}
- protected DeploymentInfo getDeploymentInfo(String deployment) throws Exception
+ protected DeploymentContext getDeploymentInfo(String deployment) throws Exception
{
MBeanServerConnection server = getServer();
URL deployURL = getDeployURL(deployment);
- return (DeploymentInfo) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeployment", new Object[] { deployURL } , new String[] { URL.class.getName() });
+ String[] sig = { URL.class.getName() };
+ Object[] args = {deployURL};
+ DeploymentContext dc = (DeploymentContext) server.invoke(MainDeployerMBean.OBJECT_NAME, "getDeployment", args, sig);
+ return dc;
}
public AbstractDeploymentTest(String test)
@@ -98,52 +109,68 @@
public static class DeploymentInfoVisitor
{
- public void start(DeploymentInfo topLevel)
+ public void start(DeploymentContext topLevel)
{
doVisit(topLevel);
}
- protected void doVisit(DeploymentInfo info)
+ protected void doVisit(DeploymentContext info)
{
visit(info);
- Set subDeployments = info.subDeployments;
+ Set<DeploymentContext> subDeployments = info.getChildren();
if (subDeployments == null || subDeployments.size() == 0)
return;
for (Iterator i = subDeployments.iterator(); i.hasNext(); )
{
- DeploymentInfo child = (DeploymentInfo) i.next();
+ DeploymentContext child = (DeploymentContext) i.next();
doVisit(child);
}
}
- public void visit(DeploymentInfo info)
+ public void visit(DeploymentContext info)
{
}
}
public class CheckExpectedDeploymentInfoVisitor extends DeploymentInfoVisitor
{
- protected HashSet expected;
+ protected Set expected;
- public CheckExpectedDeploymentInfoVisitor(HashSet expected)
+ public CheckExpectedDeploymentInfoVisitor(Set expected)
{
this.expected = expected;
}
- public void visit(DeploymentInfo info)
+ public void visit(DeploymentContext info)
{
- String shortName = info.shortName;
+ String shortName = shortNameFromDeploymentName(info.getName());
log.info("Found deployment " + shortName);
boolean found = expected.remove(shortName);
if (found == false)
fail(shortName + " not expected, or duplicate?");
else
{
- DeploymentState state = info.state;
- assertEquals("Should be fully deployed: " + shortName + " state=" + state, DeploymentState.STARTED, state);
+ DeploymentState state = info.getState();
+ assertEquals("Should be fully deployed: " + shortName + " state=" + state, DeploymentState.DEPLOYED, state);
}
}
}
+ /**
+ * A utility method that takes a deployment unit name and strips it down to the base war
+ * name without the .war suffix.
+ * @param name - the DeploymentUnit name.
+ */
+ public static String shortNameFromDeploymentName(String name)
+ {
+ String shortName = name.trim();
+ String[] parts = name.split("/|!");
+ if( parts.length > 1 )
+ {
+ shortName = parts[parts.length-1];
+ }
+ return shortName;
+ }
+
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/client/test/ClientDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(client1Deployment);
- DeploymentInfo topInfo = assertDeployed(client1Deployment);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(client1Deployment, expected);
}
public ClientDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/client/test/UnpackedClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/client/test/UnpackedClientDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/client/test/UnpackedClientDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(client1DeploymentUnpacked);
- DeploymentInfo topInfo = assertDeployed(client1DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(client1DeploymentUnpacked, expected);
}
public UnpackedClientDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,6 +25,7 @@
import junit.framework.Test;
+import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
@@ -50,7 +51,7 @@
expected.add(service1Deployment);
expected.add(sar1Deployment);
- DeploymentInfo topInfo = assertDeployed(ear1Deployment);
+ DeploymentContext topInfo = assertDeployed(ear1Deployment);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/EARNoAppXmlDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -24,6 +24,7 @@
import java.util.HashSet;
import org.jboss.test.deployers.AbstractDeploymentTest;
+import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.deployment.DeploymentInfo;
import junit.framework.Test;
@@ -50,7 +51,7 @@
expected.add(rar1Deployment);
expected.add(client1Deployment);
- DeploymentInfo topInfo = assertDeployed(earNoAppXml);
+ DeploymentContext topInfo = assertDeployed(earNoAppXml);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/PartUnpackedEARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,6 +25,7 @@
import junit.framework.Test;
+import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
@@ -50,7 +51,7 @@
expected.add(service1Deployment);
expected.add(sar1Deployment);
- DeploymentInfo topInfo = assertDeployed(ear1DeploymentUnpacked);
+ DeploymentContext topInfo = assertDeployed(ear1DeploymentUnpacked);
CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
visitor.start(topInfo);
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/UnpackedEARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/UnpackedEARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ear/test/UnpackedEARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -50,12 +49,9 @@
expected.add(service1Deployment);
expected.add(sar1DeploymentUnpacked);
- DeploymentInfo topInfo = assertDeployed(ear2DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(ear2DeploymentUnpacked, expected);
}
-
+
public UnpackedEARDeploymentUnitTestCase(String test)
{
super(test);
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/EJBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/EJBDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/EJBDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(bean1Deployment);
- DeploymentInfo topInfo = assertDeployed(bean1Deployment);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(bean1Deployment, expected);
}
public EJBDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/UnpackedEJBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/UnpackedEJBDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/UnpackedEJBDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(bean1DeploymentUnpacked);
- DeploymentInfo topInfo = assertDeployed(bean1DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(bean1DeploymentUnpacked, expected);
}
public UnpackedEJBDeploymentUnitTestCase(String 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 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/jbas2904/test/EARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -19,6 +19,7 @@
import junit.framework.Test;
+import org.jboss.deployers.spi.structure.DeploymentContext;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
@@ -41,91 +42,116 @@
public static Test suite() throws Exception
{
- return getDeploySetup(EARDeploymentUnitTestCase.class, "testdeployers-jbas2904.ear");
+ return getDeploySetup(EARDeploymentUnitTestCase.class,
+ "testdeployers-jbas2904.ear");
}
- public void testEARDeployment() throws Exception{
- DeploymentInfo topInfo = assertDeployed("testdeployers-jbas2904.ear");
- //Expected ordering of the subdeployments
- Object actualModules[] = (topInfo.subDeployments).toArray();
- ArrayList expectedList = new ArrayList(actualModules.length);
- System.out.println("Expected Deployment Ordering -------> ");
- for(int count = 0;count<actualModules.length;count++){
- DeploymentInfo child = (DeploymentInfo)actualModules[count];
- URL url = child.url;
- String moduleName = getModuleDeployed(url.toString());
- expectedList.add(moduleName);
- System.out.println(" "+moduleName+" lastDeployed :"+child.lastDeployed);
- }
- //Expected Deployment Ordering Array
- Object expectedModules[] = expectedList.toArray();
-
+ public void testEARDeployment() throws Exception
+ {
+ DeploymentContext topInfo = assertDeployed("testdeployers-jbas2904.ear");
+ // Expected ordering of the subdeployments
+ Object actualModules[] = topInfo.getChildren().toArray();
+ ArrayList expectedList = new ArrayList(actualModules.length);
+ System.out.println("Expected Deployment Ordering -------> ");
+ for (int count = 0; count < actualModules.length; count++)
+ {
+ DeploymentContext child = (DeploymentContext) actualModules[count];
+ URL url = child.getRoot().toURL();
+ String moduleName = getModuleDeployed(url.toString());
+ expectedList.add(moduleName);
+ // System.out.println(" "+moduleName+" lastDeployed
+ // :"+child.lastDeployed);
+ }
+ // Expected Deployment Ordering Array
+ Object expectedModules[] = expectedList.toArray();
- Deployments deployment1 = new Deployments("Atestdeployerorder-jbas2904.sar",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();
- precisionDeployments.add(deployment1);
- precisionDeployments.add(deployment2);
- DeploymentInfoComparator comparator = new DeploymentInfoComparator();
- Collections.sort(precisionDeployments,comparator);
- //Actual Deployment Ordering Array
- Object preciseModulesExpected[] = precisionDeployments.toArray();
- assertEquals(expectedModules.length,preciseModulesExpected.length);
+ Deployments deployment1 = new Deployments(
+ "Atestdeployerorder-jbas2904.sar",
+ 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();
+ precisionDeployments.add(deployment1);
+ precisionDeployments.add(deployment2);
+ DeploymentInfoComparator comparator = new DeploymentInfoComparator();
+ Collections.sort(precisionDeployments, comparator);
+ // Actual Deployment Ordering Array
+ Object preciseModulesExpected[] = precisionDeployments.toArray();
+ assertEquals(expectedModules.length, preciseModulesExpected.length);
- System.out.println("Final Deployment Ordering ------->");
- 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();
- assertEquals(expectedModules[count],expectedModule);
- }
+ System.out.println("Final Deployment Ordering ------->");
+ 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();
+ assertEquals(expectedModules[count], expectedModule);
+ }
}
- private String getModuleDeployed(String tempUrl){
- StringTokenizer st = new StringTokenizer(tempUrl,"/");
- String moduleName = "";
- while (st.hasMoreTokens()) {
- moduleName = st.nextToken();
- }
- return moduleName;
+ private String getModuleDeployed(String tempUrl)
+ {
+ StringTokenizer st = new StringTokenizer(tempUrl, "/");
+ String moduleName = "";
+ while (st.hasMoreTokens())
+ {
+ moduleName = st.nextToken();
+ }
+ return moduleName;
}
-private long getMBeanLastDeployment(ObjectName objName) throws Exception {
- String method = "getLastDeployed";
- Object args[] = {};
- String[] sig = {};
- Long lastDeployed = (Long)invoke(objName,method,args,sig);
- return lastDeployed.longValue();
- }
+ private long getMBeanLastDeployment(ObjectName objName) throws Exception
+ {
+ String method = "getLastDeployed";
+ Object args[] = {};
+ String[] sig = {};
+ Long lastDeployed = (Long) invoke(objName, method, args, sig);
+ return lastDeployed.longValue();
+ }
}
+
class Deployments
{
- private String duName;
- private long lastDeployed;
- public Deployments(String duName,long lastDeployed){
- this.duName=duName;
- this.lastDeployed=lastDeployed;
- }
- public String getDuName(){
- return duName;
- }
- public long getLastDeployed(){
- return lastDeployed;
- }
+ private String duName;
+
+ private long lastDeployed;
+
+ public Deployments(String duName, long lastDeployed)
+ {
+ this.duName = duName;
+ this.lastDeployed = lastDeployed;
+ }
+
+ public String getDuName()
+ {
+ return duName;
+ }
+
+ public long getLastDeployed()
+ {
+ return lastDeployed;
+ }
}
-class DeploymentInfoComparator implements Comparator {
- public int compare(Object o1, Object o2) {
- long deployedTime1 = ((Deployments)o1).getLastDeployed();
- long deployedTime2 = ((Deployments)o2).getLastDeployed();
- long timediff = deployedTime1 - deployedTime2;
- int retVal = 0;
- if(timediff == 0)
- retVal = retVal;
- else if(timediff <0)
- retVal = -1;
- else
- retVal = 1;
- return retVal;
- }
+
+class DeploymentInfoComparator implements Comparator
+{
+ public int compare(Object o1, Object o2)
+ {
+ long deployedTime1 = ((Deployments) o1).getLastDeployed();
+ long deployedTime2 = ((Deployments) o2).getLastDeployed();
+ long timediff = deployedTime1 - deployedTime2;
+ int retVal = 0;
+ if (timediff == 0)
+ retVal = retVal;
+ else if (timediff < 0)
+ retVal = -1;
+ else
+ retVal = 1;
+ return retVal;
+ }
}
\ No newline at end of file
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/RARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/RARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/RARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -43,10 +42,7 @@
expected.add(rar1Deployment);
expected.add(rarjar1Deployment);
- DeploymentInfo topInfo = assertDeployed(rar1Deployment);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(rar1Deployment, expected);
}
public RARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/UnpackedRARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/UnpackedRARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/UnpackedRARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -43,10 +42,7 @@
expected.add(rar1DeploymentUnpacked);
expected.add(rarjar1Deployment);
- DeploymentInfo topInfo = assertDeployed(rar1DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(rar1DeploymentUnpacked, expected);
}
public UnpackedRARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/SARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/SARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/SARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(sar1Deployment);
- DeploymentInfo topInfo = assertDeployed(sar1Deployment);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(sar1Deployment, expected);
}
public SARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/UnpackedSARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/UnpackedSARDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/UnpackedSARDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(sar1DeploymentUnpacked);
- DeploymentInfo topInfo = assertDeployed(sar1DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(sar1DeploymentUnpacked, expected);
}
public UnpackedSARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/web/test/UnpackedWEBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/web/test/UnpackedWEBDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/web/test/UnpackedWEBDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(web1DeploymentUnpacked);
- DeploymentInfo topInfo = assertDeployed(web1DeploymentUnpacked);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(web1DeploymentUnpacked, expected);
}
public UnpackedWEBDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/web/test/WEBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/web/test/WEBDeploymentUnitTestCase.java 2006-11-12 01:58:28 UTC (rev 58275)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/web/test/WEBDeploymentUnitTestCase.java 2006-11-12 01:59:20 UTC (rev 58276)
@@ -25,7 +25,6 @@
import junit.framework.Test;
-import org.jboss.deployment.DeploymentInfo;
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -42,10 +41,7 @@
final HashSet expected = new HashSet();
expected.add(web1Deployment);
- DeploymentInfo topInfo = assertDeployed(web1Deployment);
- CheckExpectedDeploymentInfoVisitor visitor = new CheckExpectedDeploymentInfoVisitor(expected);
- visitor.start(topInfo);
- assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
+ assertDeployed(web1Deployment, expected);
}
public WEBDeploymentUnitTestCase(String test)
More information about the jboss-cvs-commits
mailing list