[Jboss-cvs] JBossAS SVN: r56944 - in trunk/ejb3/src: resources/standalone resources/test/standalone/security resources/test/standalone/standard test/org/jboss/ejb3/test/jca/inflowmdb test/org/jboss/ejb3/test/mdb/unit test/org/jboss/ejb3/test/standalone/unit
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 18 14:27:28 EDT 2006
Author: bdecoste
Date: 2006-09-18 14:27:24 -0400 (Mon, 18 Sep 2006)
New Revision: 56944
Modified:
trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml
trunk/ejb3/src/resources/test/standalone/security/roles.properties
trunk/ejb3/src/resources/test/standalone/security/users.properties
trunk/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml
trunk/ejb3/src/resources/test/standalone/standard/testjms.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
Log:
fixed StandardTesCase in e-ejb3 to run all mdb tests
Modified: trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml
===================================================================
--- trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/resources/standalone/jboss-jms-beans.xml 2006-09-18 18:27:24 UTC (rev 56944)
@@ -183,7 +183,7 @@
<stop method="stopServer"/>
</bean>
- <bean name="jboss.mq.destination:service=Queue,name=DLQ" class="org.jboss.mq.kernel.Queue">
+ <bean name="jboss.mq.destination:name=DLQ,service=Queue" class="org.jboss.mq.kernel.Queue">
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
<property name="destinationName">DLQ</property>
Modified: trunk/ejb3/src/resources/test/standalone/security/roles.properties
===================================================================
--- trunk/ejb3/src/resources/test/standalone/security/roles.properties 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/resources/test/standalone/security/roles.properties 2006-09-18 18:27:24 UTC (rev 56944)
@@ -1,2 +1,3 @@
kabir=somebody
-bill=nobody
\ No newline at end of file
+bill=nobody
+anyone=anyone
\ No newline at end of file
Modified: trunk/ejb3/src/resources/test/standalone/security/users.properties
===================================================================
--- trunk/ejb3/src/resources/test/standalone/security/users.properties 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/resources/test/standalone/security/users.properties 2006-09-18 18:27:24 UTC (rev 56944)
@@ -1,2 +1,3 @@
kabir=password
bill=password
+anyone=password
Modified: trunk/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml
===================================================================
--- trunk/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/resources/test/standalone/standard/jca-inflowmdb-beans.xml 2006-09-18 18:27:24 UTC (rev 56944)
@@ -24,5 +24,11 @@
</constructor>
<property name="workManager"><inject bean="jcainflow-rar-WorkManager"/></property>
</bean>
+
+ <bean name="jboss.mq.destination:service=Queue,name=queuetest" class="org.jboss.mq.kernel.Queue">
+ <property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
+ <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+ <property name="destinationName"><value>inflowmdbtest</value></property>
+ </bean>
</deployment>
\ No newline at end of file
Modified: trunk/ejb3/src/resources/test/standalone/standard/testjms.xml
===================================================================
--- trunk/ejb3/src/resources/test/standalone/standard/testjms.xml 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/resources/test/standalone/standard/testjms.xml 2006-09-18 18:27:24 UTC (rev 56944)
@@ -50,14 +50,13 @@
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
<property name="destinationName"><value>expirytest</value></property>
- <property name="expiryDestination"><value>jboss.mq.destination:service=Queue,name=DLQ</value></property>
+ <property name="expiryDestinationJndi"><value>queue/DLQ</value></property>
</bean>
<bean name="jboss.mq.destination:service=Queue,name=dlqtest" class="org.jboss.mq.kernel.Queue">
<property name="destinationManagerPojo"><inject bean="jboss.mq:service=DestinationManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
<property name="destinationName"><value>dlqtest</value></property>
- <property name="expiryDestination"><value>jboss.mq.destination:service=Queue,name=DLQ</value></property>
</bean>
</deployment>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/JMSMDBBean.java 2006-09-18 18:27:24 UTC (rev 56944)
@@ -37,7 +37,7 @@
@MessageDriven(activationConfig =
{
@ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
- at ActivationConfigProperty(propertyName="destination", propertyValue="queue/mdbtest"),
+ at ActivationConfigProperty(propertyName="destination", propertyValue="queue/inflowmdbtest"),
@ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
})
@ResourceAdapter("jms-ra.rar")
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/jca/inflowmdb/StatelessBean.java 2006-09-18 18:27:24 UTC (rev 56944)
@@ -53,7 +53,7 @@
InitialContext jndiContext = InitialContextFactory.getInitialContext();
- Queue queue = (Queue) jndiContext.lookup("queue/mdbtest");
+ Queue queue = (Queue) jndiContext.lookup("queue/inflowmdbtest");
QueueConnectionFactory factory = (QueueConnectionFactory) jndiContext.lookup("java:/ConnectionFactory");
cnn = factory.createQueueConnection();
session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2006-09-18 18:27:24 UTC (rev 56944)
@@ -46,7 +46,9 @@
import javax.naming.NamingEnumeration;
import javax.naming.NamingException;
+import org.jboss.ejb3.ClientKernelAbstraction;
import org.jboss.ejb3.InitialContextFactory;
+import org.jboss.ejb3.KernelAbstractionFactory;
import org.jboss.ejb3.test.mdb.Stateless;
import org.jboss.ejb3.test.mdb.TestStatus;
import org.jboss.logging.Logger;
@@ -313,8 +315,10 @@
Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
ObjectName dlqName = new ObjectName(
- "jboss.mq.destination:service=Queue,name=DLQ");
- getServer().invoke(dlqName, "removeAllMessages", null, null);
+ "jboss.mq.destination:name=DLQ,service=Queue");
+
+ ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+ kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
long now = System.currentTimeMillis();
@@ -324,9 +328,11 @@
String text = "expire on server";
message.setText(text);
- sender.send(message, DeliveryMode.PERSISTENT, 4, 1);
+ System.out.println("!!!! sending ...");
+ sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
- Thread.sleep(1000);
+ System.out.println("!!!! sleeping ...");
+ Thread.sleep(2000);
assertSize(session, queue, 0);
assertSize(session, dlq, 1);
@@ -367,8 +373,9 @@
Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
ObjectName dlqName = new ObjectName(
- "jboss.mq.destination:service=Queue,name=DLQ");
- getServer().invoke(dlqName, "removeAllMessages", null, null);
+ "jboss.mq.destination:name=DLQ,service=Queue");
+ ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+ kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
TextMessage message = session.createTextMessage();
message.setStringProperty("foo", "bar");
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java 2006-09-18 18:22:08 UTC (rev 56943)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/standalone/unit/StandardTestCase.java 2006-09-18 18:27:24 UTC (rev 56944)
@@ -30,9 +30,12 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
import javax.naming.InitialContext;
+import javax.naming.NamingEnumeration;
import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
@@ -55,12 +58,12 @@
private static boolean booted = false;
- private static HashMap tests = new HashMap();
+ private static List tests = new LinkedList();
static
{
- tests.put("org.jboss.ejb3.test.jca.inflowmdb.unit.InflowUnitTestCase", new StandardTestCaseTest("jmsinflowmdb.jar", "testJMS", "standard/jca-inflowmdb-beans.xml"));
- tests.put("org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase", new StandardTestCaseTest("mdb-test.jar", null, "security-beans.xml,standard/testjms.xml"));
+ tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.jca.inflowmdb.unit.InflowUnitTestCase", "jmsinflowmdb.jar", "testJMS", "standard/jca-inflowmdb-beans.xml"));
+ tests.add(new StandardTestCaseTest("org.jboss.ejb3.test.mdb.unit.MDBUnitTestCase", "mdb-test.jar", null, "security-beans.xml,standard/testjms.xml"));
}
public StandardTestCase(String name)
@@ -72,23 +75,6 @@
{
TestSuite suite = new TestSuite();
suite.addTestSuite(StandardTestCase.class);
-
-
- // setup test so that embedded JBoss is started/stopped once for all tests here.
- /* TestSetup wrapper = new TestSetup(suite)
- {
- protected void setUp()
- {
- startupEmbeddedJboss();
- }
-
- protected void tearDown()
- {
- shutdownEmbeddedJboss();
- }
- };
-
- return wrapper;*/
return suite;
}
@@ -97,9 +83,6 @@
{
EJB3StandaloneBootstrap.boot(null);
EJB3StandaloneBootstrap.deployXmlResource("jboss-jms-beans.xml");
-// EJB3StandaloneBootstrap.deployXmlResource("embeddedjms/testjms.xml");
-// EJB3StandaloneBootstrap.deployXmlResource("standard/testjms.xml");
-// EJB3StandaloneBootstrap.deployXmlResource("jca-inflowmdb-beans.xml");
if (test.xmlResources != null)
{
@@ -140,13 +123,12 @@
public void testStandardTests() throws Throwable
{
- Iterator standardTests = tests.keySet().iterator();
+ Iterator standardTests = tests.iterator();
while (standardTests.hasNext())
{
- String testClass = (String)standardTests.next();
- StandardTestCaseTest test = (StandardTestCaseTest)tests.get(testClass);
+ StandardTestCaseTest test = (StandardTestCaseTest)standardTests.next();
- System.out.println("Testing standard test " + testClass);
+ System.out.println("Testing standard test " + test.testClass);
startupEmbeddedJboss(test);
EJB3StandaloneDeployer deployer = new EJB3StandaloneDeployer();
@@ -165,9 +147,9 @@
}
if (test.testMethods != null)
- runTest(deployer, testClass, test.testMethods);
+ runTest(deployer, test.testClass, test.testMethods);
else
- runTest(deployer, testClass);
+ runTest(deployer, test.testClass);
shutdownEmbeddedJboss();
}
@@ -177,7 +159,7 @@
throws Exception
{
startTest(deployer);
-
+
Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
String[] constructorParams = {testClass.getName()};
Class[] constructorSignature = {String.class};
@@ -191,6 +173,7 @@
{
String methodName = methodTokenizer.nextToken();
Method method = testClass.getMethod(methodName, signature);
+ System.out.println("-- executing method " + method.getName());
method.invoke(testCase, params);
}
@@ -201,7 +184,7 @@
throws Exception
{
startTest(deployer);
-
+
Class testClass = Thread.currentThread().getContextClassLoader().loadClass(testClassName);
String[] constructorParams = {testClass.getName()};
Class[] signature = {String.class};
@@ -213,6 +196,7 @@
{
if (method.getName().startsWith("test") && method.getParameterTypes().length == 0)
{
+ System.out.println("-- executing method " + method.getName());
method.invoke(testCase, params);
}
}
@@ -234,14 +218,31 @@
deployer.destroy();
}
+ private void lookup(String name)
+ {
+ System.out.println("lookup " + name);
+ try {
+ InitialContext jndiContext = new InitialContext();
+ NamingEnumeration names = jndiContext.list(name);
+ if (names != null){
+ while (names.hasMore()){
+ System.out.println(" " + names.next());
+ }
+ }
+ } catch (Exception e){
+ }
+ }
+
static class StandardTestCaseTest
{
+ public String testClass;
public String deployments;
public String testMethods;
public String xmlResources;
- public StandardTestCaseTest(String deployments, String testMethods, String xmlResources)
+ public StandardTestCaseTest(String testClass, String deployments, String testMethods, String xmlResources)
{
+ this.testClass = testClass;
this.deployments = deployments;
this.testMethods = testMethods;
this.xmlResources = xmlResources;
More information about the jboss-cvs-commits
mailing list