User: pra
Date: 01/05/07 12:27:23
Modified: src/main/org/jboss/test/mdb/test Main.java
Log:
Changed to return a test Suite to run with the new ant based testrunner
Revision Changes Path
1.5 +48 -45 jbosstest/src/main/org/jboss/test/mdb/test/Main.java
Index: Main.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/mdb/test/Main.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Main.java 2001/05/03 20:06:38 1.4
+++ Main.java 2001/05/07 19:27:23 1.5
@@ -22,6 +22,11 @@
import javax.jms.*;
import org.jboss.test.mdb.bean.CustomMessage;
+import org.jboss.test.util.Deploy;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
//import org.jboss.jms.jndi.*;
/**
@@ -45,7 +50,7 @@
* @version
*/
-public class Main extends junit.framework.TestCase {
+public class Main extends TestCase {
// Static --------------------------------------------------------
static boolean deployed = false;
@@ -58,10 +63,12 @@
//JMSProviderAdapter providerAdapter;
Context context;
+
+ String dest;
- public Main(String name) throws Exception{
+ public Main(String name, String dest) throws Exception{
super(name);
-
+ this.dest = dest;
//Get JMS JNDI Adapter
//Class cls = Class.forName(providerAdapterClass);
//providerAdapter = (JMSProviderAdapter)cls.newInstance();
@@ -70,19 +77,27 @@
// provider specific queue and topic names!!
}
+
+ protected void printHeader() {
+ System.out.println("\n---- Testing method " + name() +
+ " for destination " +dest);
+ }
+
+
/**
* Test sending messages to Topic testTopic
*/
- public void testQueue(String name)
+ public void testQueue()
throws Exception {
+ printHeader();
QueueSession session = getQueueSession();
- Queue queue = (Queue)context.lookup(name);
+ Queue queue = (Queue)context.lookup(dest);
QueueSender sender = session.createSender(queue);
- System.out.println("TestQueue: " + name + " Sending 10 messages 1-10");
+ System.out.println("TestQueue: " + dest + " Sending 10 messages 1-10");
for (int i = 1; i < 11; i++) {
TextMessage message = session.createTextMessage();
- message.setText("Queue Message " + name + " nr " + i);
+ message.setText("Queue Message " + dest + " nr " + i);
sender.send(queue, message);
}
}
@@ -90,15 +105,16 @@
/**
* Test sending messages to Queue testQueue
*/
- public void testTopic(String name) throws Exception {
+ public void testTopic() throws Exception {
+ printHeader();
TopicSession session = getTopicSession();
- Topic topic = (Topic)context.lookup(name);
+ Topic topic = (Topic)context.lookup(dest);
TopicPublisher pub = session.createPublisher(topic);
- System.out.println("TestTopic: " + name + ": Sending 10st messages 1-10");
+ System.out.println("TestTopic: " + dest + ": Sending 10st messages 1-10");
for (int i = 1; i < 11; i++) {
TextMessage message = session.createTextMessage();
- message.setText("Topic Message " + name + " nr " + i);
+ message.setText("Topic Message " + dest + " nr " + i);
pub.publish(topic, message);
}
}
@@ -107,7 +123,7 @@
* Test sending messages to queue testObjectMessage
*/
public void testObjectMessage() throws Exception {
-
+ printHeader();
QueueSession session = getQueueSession();
// Non portable!!
Queue queue = (Queue)context.lookup("queue/testObjectMessage");
@@ -151,10 +167,7 @@
protected void setUp()
throws Exception {
- if (deployed) return;
- System.out.println("Deploying");
- new org.jboss.jmx.client.Deployer().deploy("../deploy/mdb.jar");
- deployed = true;
+
}
protected void tearDown()
@@ -165,37 +178,27 @@
queueConnection.close();
}
- public static void main(String arg[]) {
- Main main = null;
- try {
- main = new Main("MDBTest");
-
- main.setUp();
-
- main.testObjectMessage();
- main.testQueue("queue/testQueue");
-
- main.testTopic("topic/testTopic");
- main.testTopic("topic/testDurableTopic");
-
- System.out.println("Testing exception, every other message should be
rolled back, excpect a lot of stacktraces");
- main.testQueue("queue/ex");
-
-
- } catch (Exception e) {
- e.printStackTrace();
-
- System.out.println();
- System.out.println("_____________________________________________");
- System.out.println("Sorry, test failed.");
+ public static Test suite ()
+ {
+ TestSuite suite = new TestSuite();
+
+ try{
+ System.out.println("Deploying");
+ Deploy.deploy("../deploy/mdb.jar");
+
+ System.out.println("Testing Queue publishing");
+ suite.addTest(new Main("testObjectMessage",""));
+ suite.addTest(new Main("testQueue","queue/testQueue"));
+ suite.addTest(new Main("testTopic","topic/testTopic"));
+ suite.addTest(new Main("testTopic","topic/testDurableTopic"));
+ suite.addTest(new Main("testQueue","queue/ex"));
+
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(0);
- } finally {
- try {
- main.tearDown();
- }catch(Exception e) {
- e.printStackTrace();
- }
}
+ return suite;
}
} // Main
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
