Author: arnaudsimon
Date: Thu May 22 04:42:42 2008
New Revision: 659083
URL: http://svn.apache.org/viewvc?rev=659083&view=rev
Log:
QPID-1079: Updated ...test.client tests for using QpidTestCase
Modified:
incubator/qpid/trunk/qpid/java/010ExcludeList
incubator/qpid/trunk/qpid/java/010ExcludeList-store
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
incubator/qpid/trunk/qpid/java/cpp.async.testprofile
incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
incubator/qpid/trunk/qpid/java/cpp.testprofile
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
incubator/qpid/trunk/qpid/java/test-provider.properties
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList Thu May 22 04:42:42 2008
@@ -18,3 +18,16 @@
org.apache.qpid.server.plugins.PluginTest#*
// This test is not finished
org.apache.qpid.test.testcases.TTLTest#*
+// Those tests require failover support
+org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
\ No newline at end of file
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList-store
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList-store?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList-store (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList-store Thu May 22 04:42:42 2008
@@ -13,3 +13,16 @@
org.apache.qpid.server.plugins.PluginTest#*
// This test is not finished
org.apache.qpid.test.testcases.TTLTest#*
+// Those tests require failover support
+org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated
+org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
\ No newline at end of file
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
(original)
+++
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/QpidTestCase.java
Thu May 22 04:42:42 2008
@@ -110,12 +110,12 @@
private static final String BROKER_READY = "broker.ready";
// values
- private static final String VM = "vm";
+ protected static final String VM = "vm";
private static final String EXTERNAL = "external";
private static final String VERSION_08 = "0-8";
private static final String VERSION_010 = "0-10";
- private String _broker = System.getProperty(BROKER, VM);
+ protected String _broker = System.getProperty(BROKER, VM);
private String _brokerClean = System.getProperty(BROKER_CLEAN, null);
private String _brokerVersion = System.getProperty(BROKER_VERSION,
VERSION_08);
@@ -123,6 +123,10 @@
private InitialContext _initialContext;
private AMQConnectionFactory _connectionFactory;
+ private boolean _brokerStarted;
+
+ // the connections created for a given test
+ protected List<Connection> _connections = new ArrayList<Connection>();
public void runBare() throws Throwable
{
@@ -267,6 +271,7 @@
// this is expect if the broker started succesfully
}
}
+ _brokerStarted = true;
}
public void cleanBroker()
@@ -311,6 +316,7 @@
{
TransportConnection.killAllVMBrokers();
}
+ _brokerStarted = false;
}
/**
@@ -351,7 +357,8 @@
}
/**
- * Get a connection factory for the currently used broker
+ * Get the default connection factory for the currently used broker
+ * Default factory is "local"
*
* @return A conection factory
* @throws Exception if there is an error getting the tactory
@@ -361,11 +368,30 @@
_logger.info("get ConnectionFactory");
if (_connectionFactory == null)
{
- _connectionFactory = (AMQConnectionFactory)
getInitialContext().lookup("local");
+ if (_broker.equals(VM))
+ {
+ _connectionFactory = getConnectionFactory("vm");
+ }
+ else
+ {
+ _connectionFactory = getConnectionFactory("local");
+ }
}
return _connectionFactory;
}
+ /**
+ * Get a connection factory for the currently used broker
+ *
+ * @param factoryName The factory name
+ * @return A conection factory
+ * @throws Exception if there is an error getting the tactory
+ */
+ public AMQConnectionFactory getConnectionFactory(String factoryName)
throws Exception
+ {
+ return (AMQConnectionFactory) getInitialContext().lookup(factoryName);
+ }
+
public Connection getConnection() throws Exception
{
return getConnection("guest", "guest");
@@ -382,15 +408,9 @@
public Connection getConnection(String username, String password) throws
Exception
{
_logger.info("get Connection");
- Connection con;
- if (_broker.equals(VM))
- {
- con = new AMQConnection("vm://:1", username, password, "Test",
"test");
- }
- else
- {
- con = getConnectionFactory().createConnection(username, password);
- }
+ Connection con = getConnectionFactory().createConnection(username,
password);
+ //add the connection in the lis of connections
+ _connections.add(con);
return con;
}
@@ -406,7 +426,21 @@
{
con = getConnectionFactory().createConnection(username, password);
}
+ //add the connection in the lis of connections
+ _connections.add(con);
return con;
}
+ protected void tearDown() throws java.lang.Exception
+ {
+ // close all the connections used by this test.
+ if (_brokerStarted)
+ {
+ for (Connection c : _connections)
+ {
+ c.close();
+ }
+ }
+ }
+
}
Modified: incubator/qpid/trunk/qpid/java/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.async.testprofile?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.async.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.async.testprofile Thu May 22 04:42:42
2008
@@ -15,4 +15,4 @@
test=*Test
haltonfailure=no
haltonerror=no
-exclude.modules=systests
+exclude.modules=none
Modified: incubator/qpid/trunk/qpid/java/cpp.sync.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.sync.testprofile?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.sync.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.sync.testprofile Thu May 22 04:42:42 2008
@@ -15,4 +15,4 @@
test=*Test
haltonfailure=no
haltonerror=no
-exclude.modules=systests
+exclude.modules=none
Modified: incubator/qpid/trunk/qpid/java/cpp.testprofile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/cpp.testprofile?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/cpp.testprofile (original)
+++ incubator/qpid/trunk/qpid/java/cpp.testprofile Thu May 22 04:42:42 2008
@@ -15,4 +15,4 @@
test=*Test
haltonfailure=no
haltonerror=no
-exclude.modules=systests
+exclude.modules=none
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/FailoverBaseCase.java
Thu May 22 04:42:42 2008
@@ -20,57 +20,53 @@
*/
package org.apache.qpid.test;
-import org.apache.qpid.test.VMTestCase;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.testutil.QpidTestCase;
-import javax.naming.spi.InitialContextFactory;
-import javax.naming.NamingException;
-import java.util.Hashtable;
-import java.util.Map;
+import javax.jms.Connection;
-public class FailoverBaseCase extends VMTestCase
+public class FailoverBaseCase extends QpidTestCase
{
- private boolean failedOver = true;
+ protected long RECEIVE_TIMEOUT = 1000l;
- public void setUp() throws Exception
+ protected void setUp() throws java.lang.Exception
{
- // Make Broker 2 the first one so we can kill it and allow VMTestCase
to clean up vm://:1
- _brokerlist = "vm://:2;vm://:1";
- _clientID = this.getClass().getName();
- _virtualhost = "/test";
-
- _connections.put("connection1", "amqp://guest:guest@" + _clientID +
_virtualhost + "?brokerlist='vm://:1'");
- _connections.put("connection2", "amqp://guest:guest@" + _clientID +
_virtualhost + "?brokerlist='vm://:2'");
-
- try
- {
- TransportConnection.createVMBroker(2);
- }
- catch (Exception e)
+ super.setUp();
+ if( _broker.equals(VM) )
{
- fail("Unable to create broker: " + e);
+ System.getProperties().setProperty("amqj.AutoCreateVMBroker",
"true");
}
-
- super.setUp();
}
- public void tearDown() throws Exception
+ /**
+ * We are using failover factories, Note that 0.10 code path does not yet
support failover.
+ *
+ * @return a connection
+ * @throws Exception
+ */
+ public Connection getConnection() throws Exception
{
- if (!failedOver)
+ Connection conn;
+ if( _broker.equals(VM) )
{
- TransportConnection.killVMBroker(2);
- ApplicationRegistry.remove(2);
+ conn =
getConnectionFactory("vmfailover").createConnection("guest", "guest");
}
- super.tearDown();
+ else
+ {
+ conn = getConnectionFactory("failover").createConnection("guest",
"guest");
+ }
+ _connections.add(conn);
+ return conn;
}
-
+ /**
+ * Only used of VM borker.
+ * // TODO: update the failover mechanism once 0.10 provides support for
failover.
+ */
public void failBroker()
{
- failedOver = true;
- TransportConnection.killVMBroker(2);
- ApplicationRegistry.remove(2);
+ TransportConnection.killVMBroker(1);
+ ApplicationRegistry.remove(1);
}
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/CancelTest.java
Thu May 22 04:42:42 2008
@@ -22,19 +22,17 @@
package org.apache.qpid.test.client;
import org.apache.log4j.Logger;
-import org.apache.qpid.test.VMTestCase;
+import org.apache.qpid.testutil.QpidTestCase;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.QueueBrowser;
import javax.jms.Session;
-import javax.jms.JMSException;
-import javax.naming.NamingException;
import java.util.Enumeration;
-public class CancelTest extends VMTestCase
+
+public class CancelTest extends QpidTestCase
{
private static final Logger _logger = Logger.getLogger(CancelTest.class);
@@ -47,10 +45,10 @@
super.setUp();
- _queue = (Queue) _context.lookup("queue");
+ _queue = (Queue) getInitialContext().lookup("queue");
//Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ _clientConnection = getConnection();
_clientConnection.start();
@@ -62,10 +60,13 @@
/**
* Simply
+ * This test originally did not assert anything but was just checking
+ * that a message could be browsed and consumed without throwing an
exception.
+ * It now checks that at least a message is browsed and that a message is
received.
*/
- public void test() throws JMSException, NamingException
+ public void test() throws Exception
{
- Connection producerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection producerConnection = getConnection();
producerConnection.start();
@@ -78,6 +79,7 @@
QueueBrowser browser = _clientSession.createBrowser(_queue);
Enumeration e = browser.getEnumeration();
+ assertTrue(e.hasMoreElements());
while (e.hasMoreElements())
{
@@ -87,25 +89,7 @@
browser.close();
MessageConsumer consumer = _clientSession.createConsumer(_queue);
- consumer.receive();
+ assertNotNull( consumer.receive() );
consumer.close();
}
-
- public void loop()
- {
- try
- {
- int run = 0;
- while (true)
- {
- System.err.println(run++);
- test();
- }
- }
- catch (Exception e)
- {
- _logger.error(e, e);
- }
- }
-
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/DupsOkTest.java
Thu May 22 04:42:42 2008
@@ -1,12 +1,11 @@
package org.apache.qpid.test.client;
import org.apache.qpid.AMQException;
+import org.apache.qpid.testutil.QpidTestCase;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.VMTestCase;
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
@@ -15,32 +14,35 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.jms.TextMessage;
-import javax.naming.NamingException;
-import java.util.concurrent.CountDownLatch;/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
-public class DupsOkTest extends VMTestCase
+/*
+*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied. See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*
+*/
+
+public class DupsOkTest extends QpidTestCase
{
private Queue _queue;
+ // Question why do we need to send so many messages?
private static final int MSG_COUNT = 4999;
private CountDownLatch _awaitCompletion = new CountDownLatch(1);
@@ -48,13 +50,11 @@
{
super.setUp();
- _queue = (Queue) _context.lookup("queue");
+ _queue = (Queue) getInitialContext().lookup("queue");
- //CreateQueue
- ((ConnectionFactory)
_context.lookup("connection")).createConnection().createSession(false,
Session.AUTO_ACKNOWLEDGE).createConsumer(_queue).close();
//Create Producer put some messages on the queue
- Connection producerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection producerConnection = getConnection();
producerConnection.start();
@@ -72,10 +72,17 @@
producerConnection.close();
}
- public void testDupsOK() throws NamingException, JMSException,
InterruptedException, AMQException
+ /**
+ * This test sends x messages and receives them with an async consumer.
+ * Waits for all messages to be received or for 60 s
+ * and checks whether the queue is empty.
+ *
+ * @throws Exception
+ */
+ public void testDupsOK() throws Exception
{
//Create Client
- Connection clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection clientConnection = getConnection();
clientConnection.start();
@@ -98,26 +105,18 @@
if (message instanceof TextMessage)
{
try
- {
- /*if (message.getIntProperty("count") == 5000)
- {
- assertEquals("The queue should have 4999 msgs
left", 4999, getMessageCount(_queue.getQueueName()));
- }*/
-
+ {
if (message.getIntProperty("count") == MSG_COUNT)
{
try
{
long remainingMessages = ((AMQSession)
clientSession).getQueueDepth((AMQDestination) _queue);
- if(remainingMessages != 0)
- {
-
- assertEquals("The queue should have 0 msgs
left, seen " + _msgCount + " messages.", 0,
getMessageCount(_queue.getQueueName()));
- }
+ fail("The queue should have 0 msgs left, seen
" + _msgCount + " messages, left: "
+ + remainingMessages);
}
catch (AMQException e)
{
- assertNull("Got AMQException", e);
+ fail("Got AMQException" + e.getMessage());
}
finally
{
@@ -134,27 +133,21 @@
}
else
{
- fail("");
+ fail("Got wrong message type");
}
}
});
try
{
- _awaitCompletion.await();
+ _awaitCompletion.await(60, TimeUnit.SECONDS);
}
catch (InterruptedException e)
{
fail("Unable to wait for test completion");
throw e;
}
-
-// consumer.close();
-
assertEquals("The queue should have 0 msgs left", 0, ((AMQSession)
clientSession).getQueueDepth((AMQDestination) _queue));
- clientConnection.close();
-
}
-
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
Thu May 22 04:42:42 2008
@@ -53,19 +53,24 @@
{
super.setUp();
- _queue = (Queue) _context.lookup("queue");
+ _queue = (Queue) getInitialContext().lookup("queue");
//Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ _clientConnection = getConnection();
_clientConnection.start();
- _clientSession = _clientConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ setupSession();
//Ensure there are no messages on the queue to start with.
checkQueueDepth(0);
}
+ protected void setupSession() throws Exception
+ {
+ _clientSession = _clientConnection.createSession(false,
Session.AUTO_ACKNOWLEDGE);
+ }
+
public void tearDown() throws Exception
{
if (_clientConnection != null)
@@ -81,9 +86,9 @@
Connection producerConnection = null;
try
{
- producerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ producerConnection = getConnection();
}
- catch (NamingException e)
+ catch (Exception e)
{
fail("Unable to lookup connection in JNDI.");
}
@@ -96,10 +101,11 @@
Connection producerConnection = null;
try
{
- producerConnection = ((ConnectionFactory)
_context.lookup(connection)).createConnection();
+ producerConnection =
getConnectionFactory(connection).createConnection("guest", "guest");
}
- catch (NamingException e)
+ catch (Exception e)
{
+ e.printStackTrace();
fail("Unable to lookup connection in JNDI.");
}
sendMessages(producerConnection, num);
@@ -285,9 +291,9 @@
try
{
- connection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ connection = getConnection();
}
- catch (NamingException e)
+ catch (Exception e)
{
fail("Unable to make validation connection");
}
@@ -415,7 +421,7 @@
public void testFailoverWithQueueBrowser() throws JMSException
{
- int messages = 50;
+ int messages = 5;
sendMessages("connection1", messages);
sendMessages("connection2", messages);
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserClientAckTest.java
Thu May 22 04:42:42 2008
@@ -20,30 +20,18 @@
*/
package org.apache.qpid.test.client;
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
import javax.jms.Session;
public class QueueBrowserClientAckTest extends QueueBrowserAutoAckTest
{
- public void setUp() throws Exception
- {
-
- super.setUp();
-
- _clientConnection.close();
- _clientSession.close();
-
- _queue = (Queue) _context.lookup("queue");
- //Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
- _clientConnection.start();
-
- _clientSession = _clientConnection.createSession(false,
Session.CLIENT_ACKNOWLEDGE);
+ protected void setupSession() throws Exception
+ {
+ _clientSession = _clientConnection.createSession(false,
Session.CLIENT_ACKNOWLEDGE);
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
}
+
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserDupsOkTest.java
Thu May 22 04:42:42 2008
@@ -20,28 +20,13 @@
*/
package org.apache.qpid.test.client;
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
import javax.jms.Session;
public class QueueBrowserDupsOkTest extends QueueBrowserAutoAckTest
{
- public void setUp() throws Exception
+ protected void setupSession() throws Exception
{
-
- super.setUp();
-
- _clientConnection.close();
- _clientSession.close();
-
- _queue = (Queue) _context.lookup("queue");
-
- //Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
-
- _clientConnection.start();
-
- _clientSession = _clientConnection.createSession(false,
Session.DUPS_OK_ACKNOWLEDGE);
+ _clientSession = _clientConnection.createSession(false,
Session.DUPS_OK_ACKNOWLEDGE);
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserNoAckTest.java
Thu May 22 04:42:42 2008
@@ -22,27 +22,13 @@
import org.apache.qpid.client.AMQSession;
-import javax.jms.ConnectionFactory;
-import javax.jms.Queue;
public class QueueBrowserNoAckTest extends QueueBrowserAutoAckTest
{
- public void setUp() throws Exception
- {
-
- super.setUp();
-
- _clientConnection.close();
- _clientSession.close();
-
- _queue = (Queue) _context.lookup("queue");
- //Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
-
- _clientConnection.start();
-
- _clientSession = _clientConnection.createSession(false,
AMQSession.NO_ACKNOWLEDGE);
+ protected void setupSession() throws Exception
+ {
+ _clientSession = _clientConnection.createSession(false,
AMQSession.NO_ACKNOWLEDGE);
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserPreAckTest.java
Thu May 22 04:42:42 2008
@@ -22,29 +22,11 @@
import org.apache.qpid.client.AMQSession;
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
-
public class QueueBrowserPreAckTest extends QueueBrowserAutoAckTest
{
- public void setUp() throws Exception
- {
-
- super.setUp();
-
- _clientConnection.close();
- _clientSession.close();
-
- _clientConnection.close();
- _clientSession.close();
-
- _queue = (Queue) _context.lookup("queue");
-
- //Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
-
- _clientConnection.start();
+ protected void setupSession() throws Exception
+ {
_clientSession = _clientConnection.createSession(false,
AMQSession.PRE_ACKNOWLEDGE);
//Ensure _queue is created
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserTransactedTest.java
Thu May 22 04:42:42 2008
@@ -20,32 +20,15 @@
*/
package org.apache.qpid.test.client;
-import javax.jms.Queue;
-import javax.jms.ConnectionFactory;
import javax.jms.Session;
public class QueueBrowserTransactedTest extends QueueBrowserAutoAckTest
-{
- public void setUp() throws Exception
+{
+ protected void setupSession() throws Exception
{
-
- super.setUp();
-
- _clientConnection.close();
- _clientSession.close();
-
- _queue = (Queue) _context.lookup("queue");
-
- //Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
-
- _clientConnection.start();
-
_clientSession = _clientConnection.createSession(true,
Session.SESSION_TRANSACTED);
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
}
-
-
}
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
Thu May 22 04:42:42 2008
@@ -22,25 +22,20 @@
*/
import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
import javax.jms.Session;
-import javax.jms.TextMessage;
-import org.apache.log4j.Logger;
-import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.test.VMTestCase;
+import org.apache.qpid.testutil.QpidTestCase;
-public class AcknowledgeTest extends VMTestCase
+public class AcknowledgeTest extends QpidTestCase
{
private static final int NUM_MESSAGES = 50;
private Connection _con;
@@ -49,19 +44,15 @@
private Session _producerSession;
private Session _consumerSession;
private MessageConsumer _consumerA;
- private MessageConsumer _consumerB;
@Override
protected void setUp() throws Exception
{
super.setUp();
- _queue = (Queue) _context.lookup("queue");
-
- //CreateQueue
- ((ConnectionFactory)
_context.lookup("connection")).createConnection().createSession(false,
Session.AUTO_ACKNOWLEDGE).createConsumer(_queue).close();
+ _queue = (Queue) getInitialContext().lookup("queue");
//Create Producer put some messages on the queue
- _con = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ _con = getConnection();
_con.start();
}
@@ -88,16 +79,6 @@
}
- private void consumeMessages(int toConsume, MessageConsumer consumer)
throws JMSException
- {
- Message msg;
- for (int i = 0; i < toConsume; i++)
- {
- msg = consumer.receive(1000);
- assertNotNull("Message " + i + " was null!", msg);
- assertEquals("message " + i, ((TextMessage) msg).getText());
- }
- }
private void sendMessages(int totalMessages) throws JMSException
{
@@ -107,15 +88,22 @@
}
}
+ /**
+ * Produces and consumes messages an either ack or commit the receipt of
those messages
+ *
+ * @param transacted
+ * @param mode
+ * @throws Exception
+ */
private void testMessageAck(boolean transacted, int mode) throws Exception
{
init(transacted, mode);
sendMessages(NUM_MESSAGES/2);
Thread.sleep(1500);
- _consumerB = _consumerSession.createConsumer(_queue);
+ MessageConsumer consumerB = _consumerSession.createConsumer(_queue);
sendMessages(NUM_MESSAGES/2);
int count = 0;
- Message msg = _consumerB.receive(1500);
+ Message msg = consumerB.receive(1500);
while (msg != null)
{
if (mode == Session.CLIENT_ACKNOWLEDGE)
@@ -123,14 +111,14 @@
msg.acknowledge();
}
count++;
- msg = _consumerB.receive(1500);
+ msg = consumerB.receive(1500);
}
if (transacted)
{
_consumerSession.commit();
}
_consumerA.close();
- _consumerB.close();
+ consumerB.close();
_consumerSession.close();
assertEquals("Wrong number of messages on queue", NUM_MESSAGES - count,
((AMQSession)
_producerSession).getQueueDepth((AMQDestination) _queue));
@@ -153,7 +141,6 @@
_consumerSession.commit();
}
_consumerSession.close();
- super.tearDown();
}
public void test2ConsumersAutoAck() throws Exception
Modified: incubator/qpid/trunk/qpid/java/test-provider.properties
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/test-provider.properties?rev=659083&r1=659082&r2=659083&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/test-provider.properties (original)
+++ incubator/qpid/trunk/qpid/java/test-provider.properties Thu May 22 04:42:42
2008
@@ -1,6 +1,14 @@
connectionfactory.local = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='tcp://localhost:5672'
+connectionfactory.vm = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='vm://:1'
+
+connectionfactory.failover = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='tcp://localhost:5672'
+connectionfactory.vmfailover = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='vm://:2;vm://:1'
+connectionfactory.connection1 = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='vm://:1'
+connectionfactory.connection2 = amqp://username:[EMAIL
PROTECTED]/test?brokerlist='vm://:2'
+
queue.MyQueue = example.MyQueue
+queue.queue = example.queue
queue.xaQueue = xaQueue
topic.xaTopic = xaTopic
