User: starksm
Date: 01/07/08 18:06:04
Modified: src/main/org/jboss/test/jmsra/test Tag: Branch_2_4
AllJUnitTests.java RaTest.java
Added: src/main/org/jboss/test/jmsra/test Tag: Branch_2_4
RaQueueTest.java RaTopicTest.java
Log:
Merge latest changes from main to the 2.4 branch
Revision Changes Path
No revision
No revision
1.1.2.1 +29 -40 jbosstest/src/main/org/jboss/test/jmsra/test/AllJUnitTests.java
Index: AllJUnitTests.java
===================================================================
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jmsra/test/AllJUnitTests.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AllJUnitTests.java 2001/05/06 01:13:18 1.1
+++ AllJUnitTests.java 2001/07/09 01:06:04 1.1.2.1
@@ -24,51 +24,40 @@
import org.jboss.test.util.Deploy;
/**
- * TestSuite.java
+ * TestSuite for JMS Resource Adapter.
*
+ * <p>Created: Mon Apr 23 22:08:13 2001
*
- * Created: Mon Apr 23 22:08:13 2001
- *
- * @author
- * @version
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
+ * @version $Revision: 1.1.2.1 $
*/
-
-public class AllJUnitTests extends TestCase{
-
- public AllJUnitTests(String name) {
- super(name);
+public class AllJUnitTests
+ extends TestCase
+{
+ public AllJUnitTests(final String name) {
+ super(name);
}
-
- public static Test suite ()
- {
- TestSuite suite = new TestSuite();
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
- try{
- System.out.println("Deploying");
- Deploy.deploy("../deploy/jmsra.jar");
-
- System.out.println("Testing Queue publishing");
- suite.addTest(new RaTest("testSimple", "TxPublisher"));
- suite.addTest(new RaTest("testSimpleFail", "TxPublisher"));
- suite.addTest(new RaTest("testBeanOk", "TxPublisher"));
- suite.addTest(new RaTest("testBeanError", "TxPublisher"));
+ try {
+ String filename = "../deploy/jmsra.jar";
+ System.out.println("Deploying...");
+ Deploy.deploy(filename);
- System.out.println("Testing topic publishing");
- suite.addTest(new RaTest("testSimple", "TxTopicPublisher"));
- suite.addTest(new RaTest("testSimpleFail", "TxTopicPublisher"));
- suite.addTest(new RaTest("testBeanOk", "TxTopicPublisher"));
- suite.addTest(new RaTest("testBeanError", "TxTopicPublisher"));
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(0);
-
- }
- return suite;
- }
-
- public static void main(String[] args) {
-
+ suite.addTest(new TestSuite(RaQueueTest.class));
+ suite.addTest(new TestSuite(RaTopicTest.class));
+
+ // add a test case to undeploy our support applications
+ suite.addTest(new Deploy.Undeployer(filename));
+ }
+ catch (Throwable t) {
+ t.printStackTrace();
+ System.exit(0);
+ }
+
+ return suite;
}
-
-} // TestSuite
+}
1.2.2.1 +114 -67 jbosstest/src/main/org/jboss/test/jmsra/test/RaTest.java
Index: RaTest.java
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jmsra/test/RaTest.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- RaTest.java 2001/05/20 12:29:11 1.2
+++ RaTest.java 2001/07/09 01:06:04 1.2.2.1
@@ -17,88 +17,144 @@
*/
package org.jboss.test.jmsra.test;
-import org.jboss.test.jmsra.bean.*;
-
-import javax.jms.*;
-
import javax.naming.InitialContext;
import javax.naming.Context;
+import javax.jms.MessageConsumer;
+import javax.jms.Message;
+import javax.jms.Connection;
+import javax.jms.Session;
+
+import junit.framework.TestCase;
+import junit.framework.Assert;
+
+import org.jboss.test.jmsra.bean.*;
+
/**
- * RaTest.java
- *
+ * Abstract test cases for JMS Resource Adapter.
*
- * Created: Mon Apr 23 21:35:25 2001
+ * <p>Created: Mon Apr 23 21:35:25 2001
*
- * @author
- * @version
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
+ * @version $Revision: 1.2.2.1 $
*/
-
-public class RaTest extends junit.framework.TestCase implements MessageListener
+public abstract class RaTest
+ extends TestCase
{
- private String QUEUE_FACTORY = "QueueConnectionFactory";
- private String QUEUE = "queue/testQueue";
-
- private String beanJNDI;
- private QueueConnection queueConnection;
- private QueueSession queueSession;
- private QueueReceiver queueReceiver;
- private Queue queue;
- private Publisher publisher;
- private String n;
-
- public RaTest(String name, String beanJNDI) throws Exception {
+ public static final long DEFAULT_TIMEOUT = 500L;
+ public static final long FLUSH_TIMEOUT = 500L;
+
+ protected String beanJNDI;
+ protected MessageConsumer consumer;
+ protected Publisher publisher;
+ protected Connection connection;
+ protected Session session;
+
+ protected RaTest(final String name, final String beanJNDI)
+ throws Exception
+ {
super(name);
- n = name;
this.beanJNDI = beanJNDI;
}
+ protected abstract void init(final Context context) throws Exception;
+
+ protected void setUp() throws Exception {
+ // Create a publisher
+ Context context = new InitialContext();
+ try {
+ PublisherHome home = (PublisherHome)context.lookup(beanJNDI);
+ publisher = home.create();
+
+ init(context);
+ }
+ finally {
+ context.close();
+ }
+
+ // start up the session
+ connection.start();
+
+ // flush the destination
+ flush();
+ }
+
+ protected void tearDown() throws Exception {
+ if (consumer != null) {
+ consumer.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
+ }
+
protected void printHeader() {
- System.out.println("\n---- Testing method " + n +
+ System.out.println("\n---- Testing method " + name() +
" for bean " + beanJNDI);
}
protected void printOK() {
- System.out.println("Test OK\n----");
+ System.out.println("---- Test OK\n");
}
-
- protected void setUp() throws Exception {
- // Get publisher
- Context context = new InitialContext();
- PublisherHome publisherH = (PublisherHome)context.lookup(beanJNDI);
- publisher = publisherH.create();
-
- QueueConnectionFactory factory = (QueueConnectionFactory)
- context.lookup(QUEUE_FACTORY);
- queueConnection = factory.createQueueConnection();
- queueSession = queueConnection.createQueueSession(false,
Session.AUTO_ACKNOWLEDGE);
- queue = (Queue)context.lookup(QUEUE);
- queueReceiver = queueSession.createReceiver(queue);
- //queueSession.setMessageListener(this);
- queueConnection.start();
+
+ /**
+ * Check if we got a message.
+ *
+ * @return Publisher.JMS_MESSAGE_NR int property or -1 if no message
+ * was received.
+ */
+ protected int getJmsMessage() throws Exception {
+ return getJmsMessage(DEFAULT_TIMEOUT);
}
+
/**
- * Check if we got a message
+ * Check if we got a message.
+ *
+ * @param timeout The time to wait for a message.
+ *
+ * @return Publisher.JMS_MESSAGE_NR int property or -1 if no message
+ * was received.
*/
- private int getJmsMessage() throws Exception {
- Message m = queueReceiver.receive(5000L);
- if (m != null)
- {
- System.out.println("Recived message");
- return m.getIntProperty(Publisher.JMS_MESSAGE_NR);
- } else
- {
+ protected int getJmsMessage(long timeout) throws Exception {
+ Message msg = consumer.receive(timeout);
+ if (msg != null) {
+ System.out.println("Recived message: " + msg);
+ int nr = msg.getIntProperty(Publisher.JMS_MESSAGE_NR);
+ System.out.println("nr: " + nr);
+ return nr;
+ }
+ else {
System.out.println("NO message recived");
return -1;
}
}
+
+ /**
+ * Flush the destiniation so we know that it contains no
+ * messages which might mess up the test.
+ */
+ protected void flush() throws Exception {
+ // System.out.println(" > Flushing Destination");
+ int nr = 0;
+ do {
+ try {
+ nr = getJmsMessage(FLUSH_TIMEOUT);
+ }
+ catch (Exception ignore) {}
+ }
+ while (nr != -1);
+
+ // System.out.println(" > Flushed");
+ }
+
public void testSimple() throws Exception {
printHeader();
System.out.println("Verify simple send of message");
publisher.simple(1);
- assert(1 == getJmsMessage() );
+ Assert.assertEquals(1, getJmsMessage());
printOK();
}
@@ -107,7 +163,7 @@
System.out.println("Verify simple failed transaction");
publisher.simpleFail(2);
- assert(-1 == getJmsMessage() );
+ Assert.assertEquals(-1, getJmsMessage());
printOK();
}
@@ -116,29 +172,20 @@
System.out.println("Verify bean ok");
publisher.beanOk(3);
- assert(3 == getJmsMessage() );
+ Assert.assertEquals(3, getJmsMessage());
printOK();
}
public void testBeanError() throws Exception {
printHeader();
System.out.println("Verify bean eroor failed transaction");
- try
- {
+
+ try {
publisher.beanError(4);
- } catch (Exception ex)
- {
}
+ catch (Exception ignore) {}
- assert(-1 == getJmsMessage() );
+ Assert.assertEquals(-1, getJmsMessage());
printOK();
}
- public void onMessage(Message message) {
- System.out.println("Got message");
- }
-
- public static void main(String[] args) {
-
- }
-
-} // RaTest
+}
No revision
No revision
1.1.2.1 +1 -1 jbosstest/src/main/org/jboss/test/jmsra/test/RaQueueTest.java
Index: RaQueueTest.java
===================================================================
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jmsra/test/RaQueueTest.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- RaQueueTest.java 2001/07/04 01:27:34 1.1
+++ RaQueueTest.java 2001/07/09 01:06:04 1.1.2.1
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class RaQueueTest
extends RaTest
1.1.2.1 +1 -1 jbosstest/src/main/org/jboss/test/jmsra/test/RaTopicTest.java
Index: RaTopicTest.java
===================================================================
RCS file:
/cvsroot/jboss/jbosstest/src/main/org/jboss/test/jmsra/test/RaTopicTest.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- RaTopicTest.java 2001/07/04 01:27:34 1.1
+++ RaTopicTest.java 2001/07/09 01:06:04 1.1.2.1
@@ -33,7 +33,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Antman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason Dillon</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.1.2.1 $
*/
public class RaTopicTest
extends RaTest
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
