Author: ritchiem
Date: Tue Nov 7 06:14:13 2006
New Revision: 472124
URL: http://svn.apache.org/viewvc?view=rev&rev=472124
Log:
Removed explicit VM references to allow auto creation to occur. Added some
sleeps to allow broker instantiation during tests.
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQConnection.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQSession.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/Publisher.java
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQConnection.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQConnection.java?view=diff&rev=472124&r1=472123&r2=472124
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQConnection.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQConnection.java
Tue Nov 7 06:14:13 2006
@@ -37,7 +37,6 @@
@BeforeClass
public static void setUp() throws AMQException, URLSyntaxException,
JMSException {
//initialise the variables we need for testing
- startVmBrokers();
_connection = new AMQConnection("vm://:1", "guest", "guest", "fred",
"/test");
_topic = new AMQTopic("mytopic");
_queue = new AMQQueue("myqueue");
@@ -95,27 +94,8 @@
_queueSession.unsubscribe("abc");
}
- @AfterClass
- public static void stopVmBrokers()
- {
- TransportConnection.killVMBroker(1);
- }
-
public static junit.framework.Test suite()
{
return new JUnit4TestAdapter(TestAMQConnection.class);
}
-
- private static void startVmBrokers()
- {
- try
- {
- TransportConnection.createVMBroker(1);
- }
- catch (AMQVMBrokerCreationException e)
- {
- Assert.fail("Unable to create VM Broker: " + e.getMessage());
- }
- }
-
}
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQSession.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQSession.java?view=diff&rev=472124&r1=472123&r2=472124
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQSession.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/client/TestAMQSession.java
Tue Nov 7 06:14:13 2006
@@ -32,16 +32,17 @@
/**
* Tests for QueueReceiver and TopicSubscriber creation methods on AMQSession
*/
-public class TestAMQSession {
+public class TestAMQSession
+{
private static AMQSession _session;
private static AMQTopic _topic;
private static AMQQueue _queue;
@BeforeClass
- public static void setUp() throws AMQException, URLSyntaxException,
JMSException {
+ public static void setUp() throws AMQException, URLSyntaxException,
JMSException
+ {
//initialise the variables we need for testing
- startVmBrokers();
AMQConnection connection = new AMQConnection("vm://:1", "guest",
"guest", "fred", "/test");
_topic = new AMQTopic("mytopic");
_queue = new AMQQueue("myqueue");
@@ -49,45 +50,48 @@
}
@Test
- public void testCreateSubscriber() throws JMSException {
+ public void testCreateSubscriber() throws JMSException
+ {
TopicSubscriber subscriber = _session.createSubscriber(_topic);
- Assert.assertEquals("Topic names should match from
TopicSubscriber",_topic.getTopicName(),subscriber.getTopic().getTopicName());
+ Assert.assertEquals("Topic names should match from TopicSubscriber",
_topic.getTopicName(), subscriber.getTopic().getTopicName());
- subscriber = _session.createSubscriber(_topic,"abc",false);
- Assert.assertEquals("Topic names should match from TopicSubscriber
with selector",_topic.getTopicName(),subscriber.getTopic().getTopicName());
+ subscriber = _session.createSubscriber(_topic, "abc", false);
+ Assert.assertEquals("Topic names should match from TopicSubscriber
with selector", _topic.getTopicName(), subscriber.getTopic().getTopicName());
}
@Test
- public void testCreateDurableSubscriber() throws JMSException {
+ public void testCreateDurableSubscriber() throws JMSException
+ {
TopicSubscriber subscriber = _session.createDurableSubscriber(_topic,
"mysubname");
- Assert.assertEquals("Topic names should match from durable
TopicSubscriber",_topic.getTopicName(),subscriber.getTopic().getTopicName());
+ Assert.assertEquals("Topic names should match from durable
TopicSubscriber", _topic.getTopicName(), subscriber.getTopic().getTopicName());
- subscriber =
_session.createDurableSubscriber(_topic,"mysubname","abc",false);
- Assert.assertEquals("Topic names should match from durable
TopicSubscriber with
selector",_topic.getTopicName(),subscriber.getTopic().getTopicName());
+ subscriber = _session.createDurableSubscriber(_topic, "mysubname",
"abc", false);
+ Assert.assertEquals("Topic names should match from durable
TopicSubscriber with selector", _topic.getTopicName(),
subscriber.getTopic().getTopicName());
}
@Test
- public void testCreateQueueReceiver() throws JMSException {
+ public void testCreateQueueReceiver() throws JMSException
+ {
QueueReceiver receiver = _session.createQueueReceiver(_queue);
- Assert.assertEquals("Queue names should match from
QueueReceiver",_queue.getQueueName(),receiver.getQueue().getQueueName());
+ Assert.assertEquals("Queue names should match from QueueReceiver",
_queue.getQueueName(), receiver.getQueue().getQueueName());
receiver = _session.createQueueReceiver(_queue, "abc");
- Assert.assertEquals("Queue names should match from QueueReceiver with
selector",_queue.getQueueName(),receiver.getQueue().getQueueName());
+ Assert.assertEquals("Queue names should match from QueueReceiver with
selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
}
@Test
- public void testCreateReceiver() throws JMSException {
+ public void testCreateReceiver() throws JMSException
+ {
QueueReceiver receiver = _session.createReceiver(_queue);
- Assert.assertEquals("Queue names should match from
QueueReceiver",_queue.getQueueName(),receiver.getQueue().getQueueName());
+ Assert.assertEquals("Queue names should match from QueueReceiver",
_queue.getQueueName(), receiver.getQueue().getQueueName());
receiver = _session.createReceiver(_queue, "abc");
- Assert.assertEquals("Queue names should match from QueueReceiver with
selector",_queue.getQueueName(),receiver.getQueue().getQueueName());
+ Assert.assertEquals("Queue names should match from QueueReceiver with
selector", _queue.getQueueName(), receiver.getQueue().getQueueName());
}
@AfterClass
public static void stopVmBrokers()
{
- TransportConnection.killVMBroker(1);
_queue = null;
_topic = null;
_session = null;
@@ -98,15 +102,5 @@
return new JUnit4TestAdapter(TestAMQSession.class);
}
- private static void startVmBrokers()
- {
- try
- {
- TransportConnection.createVMBroker(1);
- }
- catch (AMQVMBrokerCreationException e)
- {
- Assert.fail("Unable to create VM Broker: " + e.getMessage());
- }
- }
+
}
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java?view=diff&rev=472124&r1=472123&r2=472124
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
Tue Nov 7 06:14:13 2006
@@ -40,26 +40,6 @@
public class DurableSubscriptionTest
{
-
- @Before
- public void startVmBrokers()
- {
- try
- {
- TransportConnection.createVMBroker(1);
- }
- catch (AMQVMBrokerCreationException e)
- {
- Assert.fail("Unable to create VM Broker: " + e.getMessage());
- }
- }
-
- @After
- public void stopVmBrokers()
- {
- TransportConnection.killVMBroker(1);
- }
-
@Test
public void unsubscribe() throws AMQException, JMSException,
URLSyntaxException
{
@@ -73,6 +53,21 @@
TopicSubscriber consumer2 = session2.createDurableSubscriber(topic,
"MySubscription");
con.start();
+
+ // Sleep to ensure all queues have been created in the Broker.
+ try
+ {
+ System.out.println("Allowing Server to create queues");
+ Thread.sleep(2000);
+ }
+ catch (InterruptedException e)
+ {
+ //do nothing
+ }
+ finally
+ {
+ System.out.println("Setup Complete");
+ }
producer.send(session1.createTextMessage("A"));
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/Publisher.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/Publisher.java?view=diff&rev=472124&r1=472123&r2=472124
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/Publisher.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/topic/Publisher.java
Tue Nov 7 06:14:13 2006
@@ -154,7 +154,8 @@
}
sum -= min;
sum -= max;
- return (sum / times.length - 2);
+
+ return (sum / (times.length - 2));
}
public static void main(String[] argv) throws Exception
Modified:
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java?view=diff&rev=472124&r1=472123&r2=472124
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
Tue Nov 7 06:14:13 2006
@@ -53,34 +53,13 @@
private MessageConsumer testConsumer1;
private MessageConsumer testConsumer2;
- @BeforeClass
- public static void setupBeforeClass()
- {
- try
- {
- TransportConnection.createVMBroker(1);
- }
- catch (AMQVMBrokerCreationException e)
- {
- Assert.fail("Unable to create VM Broker: " + e.getMessage());
- }
- }
-
- @AfterClass
- public static void setupAfterClass()
- {
- TransportConnection.killVMBroker(1);
- }
@Before
public void setup() throws Exception
{
-
-
queue1 = new AMQQueue("Q1", false);
queue2 = new AMQQueue("Q2", false);
-
con = new AMQConnection("vm://:1", "guest", "guest", "TransactedTest",
"/test");
session = con.createSession(true, 0);
consumer1 = session.createConsumer(queue1);
@@ -92,6 +71,21 @@
prepProducer1 = prepSession.createProducer(queue1);
prepCon.start();
+ // Sleep to ensure all queues have been created in the Broker.
+ try
+ {
+ System.out.println("Allowing Server to create queues");
+ Thread.sleep(2000);
+ }
+ catch (InterruptedException e)
+ {
+ //do nothing
+ }
+ finally
+ {
+ System.out.println("Setup Complete");
+ }
+
//add some messages
prepProducer1.send(prepSession.createTextMessage("A"));
prepProducer1.send(prepSession.createTextMessage("B"));
@@ -103,17 +97,20 @@
testConsumer2 = testSession.createConsumer(queue2);
testCon.start();
- // Sleep to ensure all queues have been created in the Broker.
+ // Sleep to ensure all queues have been created in the Broker.
try
{
- System.out.println("Finishing Setup");
- Thread.sleep(3000);
+ System.out.println("Allowing Server to create queues");
+ Thread.sleep(2000);
}
catch (InterruptedException e)
{
//do nothing
}
- System.out.println("Setup Complete");
+ finally
+ {
+ System.out.println("Setup Complete");
+ }
}
@After
