User: user57 Date: 01/07/05 00:05:59 Modified: src/main/org/jboss/test/jmsra/test AllJUnitTests.java RaTest.java Log: Revision Changes Path 1.3 +5 -4 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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AllJUnitTests.java 2001/07/04 01:27:34 1.2 +++ AllJUnitTests.java 2001/07/05 07:05:59 1.3 @@ -30,7 +30,7 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a> * @author <a href="mailto:[EMAIL PROTECTED]">Jason Dillon</a> - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class AllJUnitTests extends TestCase @@ -45,17 +45,18 @@ try { System.out.println("Deploying..."); Deploy.deploy("../deploy/jmsra.jar"); - System.out.println("Deployed"); 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("../deploy/jmsra.jar")); } catch (Throwable t) { - t.printStackTrace(System.err); + t.printStackTrace(); System.exit(0); } return suite; } - -} // TestSuite +} 1.6 +15 -15 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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- RaTest.java 2001/07/04 03:41:02 1.5 +++ RaTest.java 2001/07/05 07:05:59 1.6 @@ -37,13 +37,13 @@ * * @author <a href="mailto:[EMAIL PROTECTED]">Peter Antman</a> * @author <a href="mailto:[EMAIL PROTECTED]">Jason Dillon</a> - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public abstract class RaTest extends TestCase { - public static final long DEFAULT_TIMEOUT = 5000L; - public static final long FLUSH_TIMEOUT = 1500L; + public static final long DEFAULT_TIMEOUT = 500L; + public static final long FLUSH_TIMEOUT = 500L; protected String beanJNDI; protected MessageConsumer consumer; @@ -120,9 +120,9 @@ 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; + int nr = msg.getIntProperty(Publisher.JMS_MESSAGE_NR); + System.out.println("nr: " + nr); + return nr; } else { System.out.println("NO message recived"); @@ -135,18 +135,18 @@ * messages which might mess up the test. */ protected void flush() throws Exception { - System.out.println(" > Flushing Destination"); + // System.out.println(" > Flushing Destination"); int nr = 0; - do { - try { - nr = getJmsMessage(FLUSH_TIMEOUT); - } - catch (Exception ignore) {} - } + do { + try { + nr = getJmsMessage(FLUSH_TIMEOUT); + } + catch (Exception ignore) {} + } while (nr != -1); - System.out.println(" > Flushed"); + // System.out.println(" > Flushed"); } public void testSimple() throws Exception { @@ -154,7 +154,7 @@ System.out.println("Verify simple send of message"); publisher.simple(1); - Assert.assertEquals(1, getJmsMessage()); + Assert.assertEquals(1, getJmsMessage()); printOK(); } _______________________________________________ Jboss-development mailing list [EMAIL PROTECTED] http://lists.sourceforge.net/lists/listinfo/jboss-development