Thread: [Ubermq-commits] jms/src/com/ubermq/jms/client/test DurableTestCase.java,1.8,1.9 DurableTest.java,1.
Brought to you by:
jimmyp
Update of /cvsroot/ubermq/jms/src/com/ubermq/jms/client/test In directory sc8-pr-cvs1:/tmp/cvs-serv28341/src/com/ubermq/jms/client/test Modified Files: DurableTestCase.java DurableTest.java RegressionTestCase.java StatisticsTest.java Removed Files: Oldclient.java jmstest.java Log Message: bug fixes related to read/write initialization race conditions Index: DurableTestCase.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/test/DurableTestCase.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DurableTestCase.java 31 Jan 2003 23:21:14 -0000 1.8 --- DurableTestCase.java 21 Jan 2004 02:05:26 -0000 1.9 *************** *** 3,10 **** import EDU.oswego.cs.dl.util.concurrent.*; import com.ubermq.jms.client.*; ! import com.ubermq.jms.server.*; ! import com.ubermq.jms.server.datagram.impl.*; ! import com.ubermq.jms.server.journal.*; ! import com.ubermq.jms.server.journal.impl.*; import com.ubermq.kernel.*; import com.ubermq.kernel.overflow.*; --- 3,7 ---- import EDU.oswego.cs.dl.util.concurrent.*; import com.ubermq.jms.client.*; ! import com.ubermq.jms.common.datagram.impl.*; import com.ubermq.kernel.*; import com.ubermq.kernel.overflow.*; *************** *** 155,267 **** } ! public void testArbiters() ! throws Exception ! { ! IDatagram ad = new AckDatagram(); ! IOverflowHandler h = new DropIncoming(); ! ! SynchronizedInt one = new SynchronizedInt(0), ! two = new SynchronizedInt(0), ! three = new SynchronizedInt(0); ! ! DatagramSink nodeOne = new IncrementOutputNode(one), ! nodeTwo = new IncrementOutputNode(two), ! nodeThree = new IncrementOutputNode(three); ! ! // test singelton ! DurableConnectionArbiter a = new SingletonArbiter(); ! a.connect(nodeOne); ! a.output(ad, h); ! Assert.assertEquals(one.get(), 1); ! ! a.disconnect(nodeOne); ! Assert.assertTrue(!a.isOpen()); ! try { ! a.output(ad, h); ! Assert.assertTrue(false); ! } catch(IOException iox) { ! Assert.assertTrue(true); ! } ! Assert.assertEquals(one.get(), 1); ! ! a.connect(nodeOne); ! a.output(ad, h); ! Assert.assertEquals(one.get(), 2); ! ! a.connect(nodeTwo); ! a.output(ad, h); ! Assert.assertEquals(one.get() + two.get(), 3); ! ! int oldOne = one.get(); ! a.disconnect(nodeOne); ! a.output(ad, h); ! Assert.assertEquals(oldOne, one.get()); ! Assert.assertEquals(one.get() + two.get(), 4); ! ! // ok test round robin ! one.set(0); ! two.set(0); ! three.set(0); ! ! a = new RoundRobinArbiter(); ! a.connect(nodeOne); ! a.connect(nodeTwo); ! a.connect(nodeThree); ! ! final int N = 21; ! for (int i = 0; i < N; i++) ! { ! a.output(ad, h); ! } ! ! Assert.assertTrue(one.get() == two.get() && ! two.get() == three.get() && ! three.get() == N/3); ! ! one.set(0); ! two.set(0); ! three.set(0); ! a.disconnect(nodeThree); ! a.output(ad,h); ! a.output(ad,h); ! Assert.assertEquals(one.get(), 1); ! Assert.assertEquals(two.get(), 1); ! ! // test failover ! one.set(0); ! two.set(0); ! three.set(0); ! ! a = new FailoverArbiter(); ! Assert.assertTrue(!a.isOpen()); ! a.connect(nodeOne); ! a.connect(nodeTwo); ! Assert.assertTrue(a.isOpen()); ! ! a.output(ad, h); ! a.output(ad, h); ! a.output(ad, h); ! Assert.assertEquals(one.get(), 3); ! Assert.assertEquals(two.get(), 0); ! ! ((IncrementOutputNode)nodeOne).setOpen(false); ! Assert.assertTrue(a.isOpen()); ! for (int i = 0; i < 3; i++) ! { ! try { ! a.output(ad, h); ! } catch(IOException iox) { ! Assert.assertTrue(a.isOpen()); ! a.output(ad, h); ! } ! } ! Assert.assertTrue(a.isOpen()); ! Assert.assertEquals(one.get(), 3); ! Assert.assertEquals(two.get(), 3); ! ! ((IncrementOutputNode)nodeOne).setOpen(true); ! } ! ! private static final class IncrementOutputNode implements DatagramSink { --- 152,156 ---- } ! public static final class IncrementOutputNode implements DatagramSink { *************** *** 269,273 **** private boolean open; ! private IncrementOutputNode(SynchronizedInt i) { this.i = i; --- 158,162 ---- private boolean open; ! public IncrementOutputNode(SynchronizedInt i) { this.i = i; *************** *** 294,298 **** } ! void setOpen(boolean f) {this.open = f;} } --- 183,190 ---- } ! public void setOpen(boolean f) ! { ! this.open = f; ! } } Index: DurableTest.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/test/DurableTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DurableTest.java 12 Jan 2004 19:24:24 -0000 1.6 --- DurableTest.java 21 Jan 2004 02:05:26 -0000 1.7 *************** *** 80,84 **** } } ! catch (Exception e) {com.ubermq.Utility.getLogger().error("", e);;} } --- 80,84 ---- } } ! catch (Exception e) {com.ubermq.util.Utility.getLogger().error("", e);;} } Index: RegressionTestCase.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/test/RegressionTestCase.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RegressionTestCase.java 12 Jan 2004 19:24:24 -0000 1.30 --- RegressionTestCase.java 21 Jan 2004 02:05:26 -0000 1.31 *************** *** 1,21 **** package com.ubermq.jms.client.test; - import EDU.oswego.cs.dl.util.concurrent.*; - import com.ubermq.jms.client.*; - import com.ubermq.jms.client.impl.*; - import com.ubermq.jms.server.*; - import com.ubermq.jms.server.routing.impl.*; - import com.ubermq.kernel.*; - import com.ubermq.kernel.event.*; import java.util.*; import java.util.regex.*; - import javax.jms.*; - import junit.framework.*; - import sun.security.krb5.*; import javax.jms.Connection; import javax.jms.Session; import javax.jms.TopicSession; /** * A JUnit test case that exercises significant portions of the --- 1,21 ---- package com.ubermq.jms.client.test; import java.util.*; import java.util.regex.*; + import javax.jms.*; import javax.jms.Connection; import javax.jms.Session; import javax.jms.TopicSession; + import junit.framework.*; + import EDU.oswego.cs.dl.util.concurrent.*; + + import com.ubermq.jms.client.*; + import com.ubermq.jms.client.impl.*; + import com.ubermq.jms.common.routing.impl.*; + import com.ubermq.kernel.*; + import com.ubermq.kernel.event.*; + /** * A JUnit test case that exercises significant portions of the *************** *** 25,28 **** --- 25,31 ---- extends TestCase { + private static final org.apache.log4j.Logger log = + org.apache.log4j.Logger.getLogger(RegressionTestCase.class); + public static TestSuite suite() { return new TestSuite(RegressionTestCase.class); *************** *** 323,327 **** } catch (JMSException e) { ! com.ubermq.Utility.getLogger().error("", e);; } } --- 326,330 ---- } catch (JMSException e) { ! com.ubermq.util.Utility.getLogger().error("", e);; } } *************** *** 503,530 **** /** - * Tests pipe connections and makes sure they work w/ themselves, and others. - */ - public void testPipes() - throws JMSException - { - Properties p = new Properties(); - p.put("server.port", "5003"); - - MessageServer ms = new MessageServer(p); - ms.addStandardProtocols(); - ms.run(); - - TopicConnectionFactory localFactory = new PipeConnectionFactory(ms), - remoteFactory = new URLTopicConnectionFactory(ms.getServiceUrl()); - - System.out.println("testPipes"); - sendAndReceive(localFactory, remoteFactory, "A", "A", null, 20, 20); - sendAndReceive(localFactory, "hello", "hello", null, 20, 20); - sendAndReceive(localFactory, "B", "B", "where ordinal != 2", 10, 9); - sendAndReceive(remoteFactory, localFactory, "B", "B", null, 20, 20); - - } - - /** * Tests SSL connections and makes sure they work w/ themselves, and others. */ --- 506,509 ---- *************** *** 542,576 **** sendAndReceive(remoteFactory, localFactory, "B", "B", null, 20, 20); } - - /** - * Tests Clustering. - */ - public void testClustering() - throws JMSException - { - Properties p = new Properties(); - p.put("server.port", "5001"); - - MessageServer ms = new MessageServer(p); - ms.addStandardProtocols(); - ms.run(); - - p.put("server.port", "5002"); - p.put("clustering.enable", "true"); - p.put("clustering.forward", "ubermq://localhost:5001"); - - MessageServer ms2 = new MessageServer(p); - ms2.addStandardProtocols(); - ms2.run(); - - TopicConnectionFactory localFactory = new URLTopicConnectionFactory("ubermq://localhost:5001"), - remoteFactory = new URLTopicConnectionFactory("ubermq://localhost:5002"); - - sendAndReceive(localFactory, remoteFactory, "A", "A", null, 20, 20); - sendAndReceive(localFactory, "hello", "hello", null, 20, 20); - sendAndReceive(localFactory, "B", "B", "where ordinal != 2", 10, 9); - sendAndReceive(remoteFactory, localFactory, "B", "B", null, 20, 20); - - } /** * Tests queue APIs. --- 521,524 ---- *************** *** 599,605 **** /** ! * Tests overflow handling for catatonic message listeners. */ ! public void testOverflows() throws Exception { --- 547,554 ---- /** ! * Tests overflow handling for catatonic message listeners. This is named ! * particuarly so that it does not get called in standard regression tests. */ ! public void xtestOverflows() throws Exception { *************** *** 637,641 **** } catch (Exception e) { ! com.ubermq.Utility.getLogger().error("", e);; } } --- 586,590 ---- } catch (Exception e) { ! com.ubermq.util.Utility.getLogger().error("", e);; } } *************** *** 664,668 **** catch (InterruptedException e) { ! com.ubermq.Utility.getLogger().error("", e);; } --- 613,617 ---- catch (InterruptedException e) { ! com.ubermq.util.Utility.getLogger().error("", e);; } *************** *** 836,840 **** Assert.assertNotNull(m); m.acknowledge(); ! System.out.println("got message " + i + " ordinal was " + m.getIntProperty("ordinal")); } } --- 785,789 ---- Assert.assertNotNull(m); m.acknowledge(); ! log.debug("got message " + i + " ordinal was " + m.getIntProperty("ordinal")); } } Index: StatisticsTest.java =================================================================== RCS file: /cvsroot/ubermq/jms/src/com/ubermq/jms/client/test/StatisticsTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** StatisticsTest.java 12 Jan 2004 19:24:24 -0000 1.5 --- StatisticsTest.java 21 Jan 2004 02:05:26 -0000 1.6 *************** *** 4,11 **** import javax.jms.*; import junit.framework.*; - import com.ubermq.Utility; import EDU.oswego.cs.dl.util.concurrent.ClockDaemon; import com.ubermq.jms.client.UnicastConnectionFactory; /** --- 4,11 ---- import javax.jms.*; import junit.framework.*; import EDU.oswego.cs.dl.util.concurrent.ClockDaemon; import com.ubermq.jms.client.UnicastConnectionFactory; + import com.ubermq.util.*; /** *************** *** 43,47 **** } catch (Exception e) { ! com.ubermq.Utility.getLogger().error("", e);; } } --- 43,47 ---- } catch (Exception e) { ! com.ubermq.util.Utility.getLogger().error("", e);; } } *************** *** 143,147 **** } catch (Exception e) { ! com.ubermq.Utility.getLogger().error("", e);; } } --- 143,147 ---- } catch (Exception e) { ! com.ubermq.util.Utility.getLogger().error("", e);; } } --- Oldclient.java DELETED --- --- jmstest.java DELETED --- |