[jboss-cvs] JBossAS SVN: r67751 - in trunk: testsuite/src/main/org/jboss/test/deployers and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Dec 2 18:59:37 EST 2007
Author: alesj
Date: 2007-12-02 18:59:36 -0500 (Sun, 02 Dec 2007)
New Revision: 67751
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotClientDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotUnpackedClientDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotEJBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotUnpackedEJBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotRARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotUnpackedRARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotSARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotUnpackedSARDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotUnpackedWEBDeploymentUnitTestCase.java
trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotWEBDeploymentUnitTestCase.java
Log:
Initial deployers tests fix.
Modified: trunk/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/ServletBootstrapListener.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -83,7 +83,7 @@
}
- public static HashSet ignoredJars = new HashSet();
+ public static Set<Object> ignoredJars = new HashSet<Object>();
static
{
@@ -141,7 +141,7 @@
createKernel();
ServletContext servletContext = servletContextEvent.getServletContext();
- String aop = (String) servletContext.getInitParameter("jboss-aop-deployments");
+ String aop = servletContext.getInitParameter("jboss-aop-deployments");
if (aop == null) aop = "ejb3-interceptors-aop.xml";
@@ -162,7 +162,7 @@
}
}
- String deployments = (String) servletContext.getInitParameter("jboss-kernel-deployments");
+ String deployments = servletContext.getInitParameter("jboss-kernel-deployments");
if (deployments == null) deployments = "embedded-jboss-beans.xml";
@@ -174,7 +174,7 @@
deployXmlResource(token);
}
- String scan = (String) servletContext.getInitParameter("automatic-scan");
+ String scan = servletContext.getInitParameter("automatic-scan");
if (scan != null && !scan.equals("false")) return;
Set libJars = servletContext.getResourcePaths("/WEB-INF/lib");
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/AbstractDeploymentTest.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -22,7 +22,7 @@
package org.jboss.test.deployers;
import java.net.URL;
-import java.util.Iterator;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.management.MBeanServerConnection;
@@ -95,6 +95,7 @@
assertTrue("Expected subdeployments: " + expected, expected.isEmpty());
}
+ @Deprecated
protected void assertNotDeployed(String deployment) throws Exception
{
DeploymentUnit result = getDeploymentUnit(deployment);
@@ -117,6 +118,60 @@
return invokeMainDeployer("isDeployed", args, sig, Boolean.class);
}
+ protected void assertNoChildContexts(String deployment) throws Exception
+ {
+ DeploymentUnit unit = getDeploymentUnit(deployment);
+ assertChildContexts(unit);
+ }
+
+ protected void assertChildContexts(String deployment, String... paths) throws Exception
+ {
+ DeploymentUnit unit = getDeploymentUnit(deployment);
+ assertChildContexts(unit, paths);
+ }
+
+ protected void assertChildContexts(DeploymentUnit unit, String... paths)
+ {
+ List<String> expected = new ArrayList<String>();
+ if (paths != null)
+ {
+ for (String path : paths)
+ expected.add(path);
+ }
+ List<DeploymentUnit> children = unit.getChildren();
+ assertNotNull(children);
+ assertEquals("Expected " + expected + " got " + simplePrint(children), expected.size(), children.size());
+
+ for (String path : expected)
+ {
+ boolean found = false;
+ for (DeploymentUnit child : children)
+ {
+ if (path.equals(child.getRelativePath()))
+ found = true;
+ }
+ if (found == false)
+ fail("Expected " + path + " in " + children);
+ }
+ }
+
+ protected static String simplePrint(List<DeploymentUnit> children)
+ {
+ StringBuilder builder = new StringBuilder();
+ boolean first = false;
+ builder.append("[");
+ for (DeploymentUnit child : children)
+ {
+ if (first == false)
+ first = true;
+ else
+ builder.append(", ");
+ builder.append(child.getRelativePath());
+ }
+ builder.append("]");
+ return builder.toString();
+ }
+
public AbstractDeploymentTest(String test)
{
super(test);
@@ -136,10 +191,9 @@
List<DeploymentUnit> subDeployments = info.getChildren();
if (subDeployments == null || subDeployments.size() == 0)
return;
-
- for (Iterator i = subDeployments.iterator(); i.hasNext(); )
+
+ for (DeploymentUnit child : subDeployments)
{
- DeploymentUnit child = (DeploymentUnit) i.next();
doVisit(child);
}
}
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotClientDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotClientDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -22,7 +22,6 @@
package org.jboss.test.deployers.client.test;
import junit.framework.Test;
-
import org.jboss.test.deployers.AbstractDeploymentTest;
/**
@@ -36,7 +35,7 @@
public void testNotClientDeployment() throws Exception
{
- assertNotDeployed(notClient1Deployment);
+ assertNoChildContexts(notClient1Deployment);
}
public NotClientDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotUnpackedClientDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotUnpackedClientDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/client/test/NotUnpackedClientDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotClientDeployment() throws Exception
{
- assertNotDeployed(notClient1DeploymentUnpacked);
+ assertNoChildContexts(notClient1DeploymentUnpacked);
}
public NotUnpackedClientDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotEJBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotEJBDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotEJBDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotEJBDeployment() throws Exception
{
- assertNotDeployed(notBean1Deployment);
+ assertNoChildContexts(notBean1Deployment);
}
public NotEJBDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotUnpackedEJBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotUnpackedEJBDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/ejb/test/NotUnpackedEJBDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotEJBDeployment() throws Exception
{
- assertNotDeployed(notBean1DeploymentUnpacked);
+ assertNoChildContexts(notBean1DeploymentUnpacked);
}
public NotUnpackedEJBDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotRARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotRARDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotRARDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotRARDeployment() throws Exception
{
- assertNotDeployed(notRar1Deployment);
+ assertNoChildContexts(notRar1Deployment);
}
public NotRARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotUnpackedRARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotUnpackedRARDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/rar/test/NotUnpackedRARDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotRARDeployment() throws Exception
{
- assertNotDeployed(notRar1DeploymentUnpacked);
+ assertChildContexts(notRar1DeploymentUnpacked, rarjar1Deployment);
}
public NotUnpackedRARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotSARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotSARDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotSARDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotSARDeployment() throws Exception
{
- assertNotDeployed(notSar1Deployment);
+ assertNoChildContexts(notSar1Deployment);
}
public NotSARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotUnpackedSARDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotUnpackedSARDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/sar/test/NotUnpackedSARDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotSARDeployment() throws Exception
{
- assertNotDeployed(notSar1DeploymentUnpacked);
+ assertNoChildContexts(notSar1DeploymentUnpacked);
}
public NotUnpackedSARDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotUnpackedWEBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotUnpackedWEBDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotUnpackedWEBDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotWEBDeployment() throws Exception
{
- assertNotDeployed(notWeb1DeploymentUnpacked);
+ assertNoChildContexts(notWeb1DeploymentUnpacked);
}
public NotUnpackedWEBDeploymentUnitTestCase(String test)
Modified: trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotWEBDeploymentUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotWEBDeploymentUnitTestCase.java 2007-12-02 23:43:33 UTC (rev 67750)
+++ trunk/testsuite/src/main/org/jboss/test/deployers/web/test/NotWEBDeploymentUnitTestCase.java 2007-12-02 23:59:36 UTC (rev 67751)
@@ -36,7 +36,7 @@
public void testNotWEBDeployment() throws Exception
{
- assertNotDeployed(notWeb1Deployment);
+ assertNoChildContexts(notWeb1Deployment);
}
public NotWEBDeploymentUnitTestCase(String test)
More information about the jboss-cvs-commits
mailing list