Author: arnaudsimon
Date: Fri Jul 4 06:52:51 2008
New Revision: 674055
URL: http://svn.apache.org/viewvc?rev=674055&view=rev
Log:
QPID-1079: Remove all classes that were no longer referenced + updated
FlowControlTest for using QpidTestCase
Removed:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/VMBrokerSetup.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/VMTestCase.java
Modified:
incubator/qpid/trunk/qpid/java/010ExcludeList
incubator/qpid/trunk/qpid/java/010ExcludeList-store
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList?rev=674055&r1=674054&r2=674055&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList Fri Jul 4 06:52:51 2008
@@ -45,6 +45,7 @@
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
+org.apache.qpid.test.client.FlowControlTest#*
// the 0.10 c++ broker does not implement forget
org.apache.qpid.test.unit.xa.FaultTest#testForget
// the 0-10 c++ broker does not implement priority / this test depends on a
Java broker extension for queue creation
Modified: incubator/qpid/trunk/qpid/java/010ExcludeList-store
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/010ExcludeList-store?rev=674055&r1=674054&r2=674055&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/010ExcludeList-store (original)
+++ incubator/qpid/trunk/qpid/java/010ExcludeList-store Fri Jul 4 06:52:51 2008
@@ -40,6 +40,7 @@
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub
org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub
+org.apache.qpid.test.client.FlowControlTest#*
// the 0.10 c++ broker does not implement forget
org.apache.qpid.test.unit.xa.FaultTest#testForget
// the 0-10 c++ broker does not implement priority / this test depends on a
Java broker extension for queue creation
Modified:
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java?rev=674055&r1=674054&r2=674055&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
(original)
+++
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/FlowControlTest.java
Fri Jul 4 06:52:51 2008
@@ -20,18 +20,16 @@
*/
package org.apache.qpid.test.client;
-import org.apache.qpid.test.VMTestCase;
-import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.AMQSession_0_8;
import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.AMQException;
+import org.apache.qpid.test.FailoverBaseCase;
import org.apache.log4j.Logger;
import javax.jms.*;
-import javax.naming.NamingException;
-import java.util.Enumeration;
-public class FlowControlTest extends VMTestCase
+
+
+public class FlowControlTest extends FailoverBaseCase
{
private static final Logger _logger =
Logger.getLogger(FlowControlTest.class);
@@ -50,12 +48,12 @@
/**
* Simply
*/
- public void testBasicBytesFlowControl() throws JMSException,
NamingException, AMQException
+ public void testBasicBytesFlowControl() throws Exception
{
_queue = new AMQQueue("amq.direct","testqueue");//(Queue)
_context.lookup("queue");
//Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ _clientConnection = getConnection();
_clientConnection.start();
@@ -64,7 +62,7 @@
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
- Connection producerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection producerConnection = getConnection();
producerConnection.start();
@@ -89,7 +87,7 @@
producerConnection.close();
- Connection consumerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection consumerConnection = getConnection();
Session consumerSession = consumerConnection.createSession(false,
Session.CLIENT_ACKNOWLEDGE);
((AMQSession_0_8)consumerSession).setPrefecthLimits(0,256);
MessageConsumer recv = consumerSession.createConsumer(_queue);
@@ -125,12 +123,12 @@
}
- public void testTwoConsumersBytesFlowControl() throws JMSException,
NamingException, AMQException
+ public void testTwoConsumersBytesFlowControl() throws Exception
{
_queue = new AMQQueue("amq.direct","testqueue1");//(Queue)
_context.lookup("queue");
//Create Client
- _clientConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ _clientConnection = getConnection();
_clientConnection.start();
@@ -139,7 +137,7 @@
//Ensure _queue is created
_clientSession.createConsumer(_queue).close();
- Connection producerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection producerConnection = getConnection();
producerConnection.start();
@@ -164,7 +162,7 @@
producerConnection.close();
- Connection consumerConnection = ((ConnectionFactory)
_context.lookup("connection")).createConnection();
+ Connection consumerConnection = getConnection();
Session consumerSession1 = consumerConnection.createSession(false,
Session.CLIENT_ACKNOWLEDGE);
((AMQSession_0_8)consumerSession1).setPrefecthLimits(0,256);
MessageConsumer recv1 = consumerSession1.createConsumer(_queue);
