[jboss-cvs] JBossAS SVN: r72362 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/resources/test/mdbsessionpoolclear and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 17 10:40:31 EDT 2008
Author: smcgowan at redhat.com
Date: 2008-04-17 10:40:31 -0400 (Thu, 17 Apr 2008)
New Revision: 72362
Added:
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbsessionpoolclear-mq-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-mq-service.xml
Removed:
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml
Modified:
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java
Log:
JBPAPP-418: fix test suite issues building between jbm and mq
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-04-17 14:23:32 UTC (rev 72361)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-04-17 14:40:31 UTC (rev 72362)
@@ -693,7 +693,7 @@
</zipfileset>
</ear>
- <mq2jbm basedir="${resources}/test/mdb"/>
+ <mq2jbm basedir="${resources}/test/ear"/>
<copy todir="${build.lib}">
<fileset dir="${resources}/test/ear">
@@ -2691,12 +2691,9 @@
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus*.class"/>
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3*.class"/>
</fileset>
- <fileset dir="${resources}/test/mdbsessionpoolclear">
- <include name="*.xml"/>
- </fileset>
</jar>
- <jar jarfile="${build.lib}/mdbsessionpoolclear-test.jar">
+ <jar jarfile="${build.lib}/mdbsessionpoolclear-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb21*.class"/>
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus.class"/>
@@ -2727,6 +2724,15 @@
<include name="META-INF/ra.xml"/>
</fileset>
</jar>
+
+ <mq2jbm basedir="${resources}/test/mdbsessionpoolclear"/>
+
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/mdbsessionpoolclear">
+ <include name="*.xml"/>
+ </fileset>
+ </copy>
+
</target>
<target name="mdb"
@@ -2749,13 +2755,14 @@
</fileset>
</jar>
+ <mq2jbm basedir="${resources}/test/mdb"/>
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/mdb">
<include name="*.xml"/>
</fileset>
</copy>
- <mq2jbm basedir="${resources}/test/mdb"/>
</target>
<target name="mdbtopic"
Copied: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbsessionpoolclear-mq-service.xml (from rev 72324, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml)
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbsessionpoolclear-mq-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbsessionpoolclear-mq-service.xml 2008-04-17 14:40:31 UTC (rev 72362)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=mdbsessionpoolclearQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=ejb3mdbsessionpoolclearQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Copied: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-mq-service.xml (from rev 71977, branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml)
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-mq-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-mq-service.xml 2008-04-17 14:40:31 UTC (rev 72362)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=mdbsessionpoolclearQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+
+ <mbean code="org.jboss.mq.server.jmx.Queue"
+ name="jboss.mq.destination:service=Queue,name=ejb3mdbsessionpoolclearQueue">
+ <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+ </mbean>
+</server>
Deleted: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml 2008-04-17 14:23:32 UTC (rev 72361)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test/mdbsessionpoolclear/mdbtest-service.xml 2008-04-17 14:40:31 UTC (rev 72362)
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=mdbsessionpoolclearQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=ejb3mdbsessionpoolclearQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java 2008-04-17 14:23:32 UTC (rev 72361)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/ear/unit/EarUnitTestCase.java 2008-04-17 14:40:31 UTC (rev 72362)
@@ -95,7 +95,8 @@
public static Test suite() throws Exception
{
- return getDeploySetup(EarUnitTestCase.class, "eartest-${jboss.jms.provider}-service.xml, ear-test.ear");
+ return getDeploySetup(EarUnitTestCase.class,
+ "eartest-${jboss.jms.provider}-service.xml, ear-test.ear");
}
}
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java 2008-04-17 14:23:32 UTC (rev 72361)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java 2008-04-17 14:40:31 UTC (rev 72362)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.test.mdbsessionpoolclear.unit;
import java.util.Date;
+import java.util.Iterator;
import java.util.Set;
import javax.jms.Queue;
@@ -82,14 +83,34 @@
session.close();
cnn.close();
- Thread.sleep(2000);
+ Thread.sleep(5 * 1000);
+ assertEquals(1, status.queueFired());
+
MBeanServerConnection server = getServer();
- ObjectName destinationManager = new ObjectName("jboss.mq:service=DestinationManager");
+
+ ObjectName provider = null;
+ String jmsProvider = System.getProperty("jboss.jms.provider");
+ System.out.println("JMS Provider is " + jmsProvider);
+ if (jmsProvider.equals("mq"))
+ provider = new ObjectName("jboss.mq:service=DestinationManager");
+ else
+ {
+ ObjectName providerQuery = new ObjectName("jboss.j2ee:service=EJB,*");
+ Iterator mbeans = server.queryMBeans(providerQuery, null).iterator();
+ while (provider == null)
+ {
+ ObjectInstance providerInstance = (ObjectInstance)mbeans.next();
+ String name = providerInstance.getObjectName().toString();
+ if (name.contains("Ejb21Mdb") && !name.contains("plugin"))
+ provider = providerInstance.getObjectName();
+ }
+ }
+
Object[] params = {};
String[] sig = {};
- System.out.println(new Date() + "*** Stopping DestinationManager");
- Object success = server.invoke(destinationManager, "stop", params, sig);
+ System.out.println(new Date() + "*** Stopping JMS Provider");
+ Object success = server.invoke(provider, "stop", params, sig);
ObjectName jmsContainerInvokerQuery = new ObjectName("jboss.j2ee:binding=my-message-driven-bean,*");
Set mbeans = server.queryMBeans(jmsContainerInvokerQuery, null);
@@ -108,16 +129,14 @@
Thread.sleep(2000);
- System.out.println(new Date() + "*** Starting DestinationManager");
- success = server.invoke(destinationManager, "start", params, sig);
+ System.out.println(new Date() + "*** Starting JMS Provider");
+ success = server.invoke(provider, "start", params, sig);
Thread.sleep(60 * 1000);
// numActiveSessions = (Integer)server.getAttribute(jmsContainerInvoker, "NumActiveSessions");
// assertEquals(1, numActiveSessions);
- assertEquals(1, status.queueFired());
-
cnn = factory.createQueueConnection();
session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
@@ -161,16 +180,24 @@
Thread.sleep(2000);
MBeanServerConnection server = getServer();
- ObjectName destinationManager = new ObjectName("jboss.mq:service=DestinationManager");
+ ObjectName provider = null;
+ String jmsProvider = System.getProperty("jboss.jms.provider");
+ System.out.println("JMS Provider is " + jmsProvider);
+ if (jmsProvider.equals("mq"))
+ provider = new ObjectName("jboss.mq:service=DestinationManager");
+ else
+ {
+ provider = new ObjectName("jboss.j2ee:jar=mdbsessionpoolclear-test.ejb3,name=Ejb3Mdb,service=EJB3");
+ }
Object[] params = {};
String[] sig = {};
- System.out.println(new Date() + "*** Stopping DestinationManager");
- Object success = server.invoke(destinationManager, "stop", params, sig);
+ System.out.println(new Date() + "*** Stopping JMS Provider");
+ Object success = server.invoke(provider, "stop", params, sig);
Thread.sleep(2000);
-
- System.out.println(new Date() + "*** Starting DestinationManager");
- success = server.invoke(destinationManager, "start", params, sig);
+
+ System.out.println(new Date() + "*** Starting JMS Provider");
+ success = server.invoke(provider, "start", params, sig);
Thread.sleep(5 * 1000);
@@ -216,7 +243,7 @@
public static Test suite() throws Exception
{
return getDeploySetup(MDBUnitTestCase.class,
- "mdbsessionpoolclear-test.ejb3, mdbsessionpoolclear-test.jar");
+ "mdbsessionpoolclear-${jboss.jms.provider}-service.xml, mdbsessionpoolclear-test.ejb3, mdbsessionpoolclear-test.jar");
}
}
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list