You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by vi...@apache.org on 2006/12/12 05:13:24 UTC
svn commit: r486008 - in /incubator/qpid/trunk/qpid/java/client/src:
old_test/ old_test/java/ old_test/java/org/ old_test/java/org/apache/
old_test/java/org/apache/qpid/ old_test/java/org/apache/qpid/IBMPerfTest/
old_test/java/org/apache/qpid/client/ o...
Author: vinoski
Date: Mon Dec 11 20:13:22 2006
New Revision: 486008
URL: http://svn.apache.org/viewvc?view=rev&rev=486008
Log:
client test reorganization
Added:
incubator/qpid/trunk/qpid/java/client/src/old_test/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/IBMPerfTest/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/IBMPerfTest/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/client/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/cluster/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/cluster/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/codec/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/codec/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/config/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/config/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/cts/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/cts/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/example/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/example/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/flow/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/flow/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/fragmentation/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/fragmentation/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/headers/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/headers/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/jndi/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/latency/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/latency/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/mina/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/mina/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/multiconsumer/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/multiconsumer/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/ping/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/ping/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/pubsub1/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/pubsub1/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/requestreply1/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/requestreply1/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
- copied unchanged from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/test/unit/jndi/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/topic/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/topic/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/transacted/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/transacted/
incubator/qpid/trunk/qpid/java/client/src/old_test/java/org/apache/qpid/weblogic/
- copied from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/weblogic/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java
- copied, changed from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/VMBrokerSetup.java
Removed:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/IBMPerfTest/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/cluster/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/codec/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/config/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/cts/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/example/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/flow/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/fragmentation/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/headers/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/latency/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/mina/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/multiconsumer/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/ping/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/pubsub1/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/requestreply1/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/VMBrokerSetup.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/TestManyConnections.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/topic/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/transacted/
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/weblogic/
Modified:
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/RecoverTest.java Mon Dec 11 20:13:22 2006
@@ -26,7 +26,7 @@
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.*;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java Mon Dec 11 20:13:22 2006
@@ -26,7 +26,7 @@
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.message.JMSBytesMessage;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import org.apache.mina.common.ByteBuffer;
import java.util.ArrayList;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/FieldTableMessageTest.java Mon Dec 11 20:13:22 2006
@@ -26,10 +26,9 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.message.JMSBytesMessage;
import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.FieldTableTest;
import org.apache.qpid.framing.FieldTable;
import org.apache.qpid.framing.FieldTableFactory;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import org.apache.mina.common.ByteBuffer;
import org.apache.log4j.Logger;
@@ -134,7 +133,11 @@
{
ByteBuffer buffer = ((JMSBytesMessage) m).getData();
FieldTable actual = FieldTableFactory.newFieldTable(buffer, buffer.remaining());
- new FieldTableTest().assertEquivalent(_expected, actual);
+ for (Object o : _expected.keySet())
+ {
+ String key = (String) o;
+ assertEquals("Values for " + key + " did not match", _expected.get(key), actual.get(key));
+ }
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java Mon Dec 11 20:13:22 2006
@@ -28,7 +28,7 @@
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.message.JMSTextMessage;
import org.apache.qpid.client.message.JMSMapMessage;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import java.util.ArrayList;
import java.util.Iterator;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java Mon Dec 11 20:13:22 2006
@@ -25,7 +25,7 @@
import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.*;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java Mon Dec 11 20:13:22 2006
@@ -26,7 +26,7 @@
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.message.JMSObjectMessage;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.JMSException;
import javax.jms.Message;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Mon Dec 11 20:13:22 2006
@@ -27,7 +27,7 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.message.JMSTextMessage;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.Destination;
import javax.jms.JMSException;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/SessionStartTest.java Mon Dec 11 20:13:22 2006
@@ -26,7 +26,7 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.JMSException;
import javax.jms.Message;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/TextMessageTest.java Mon Dec 11 20:13:22 2006
@@ -27,7 +27,7 @@
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.message.JMSTextMessage;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import org.apache.log4j.Logger;
import java.util.ArrayList;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java Mon Dec 11 20:13:22 2006
@@ -28,7 +28,7 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.AMQException;
import org.apache.qpid.url.URLSyntaxException;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import java.lang.reflect.Method;
import javax.jms.*;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Mon Dec 11 20:13:22 2006
@@ -27,7 +27,7 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import org.apache.qpid.url.URLSyntaxException;
import javax.jms.JMSException;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java Mon Dec 11 20:13:22 2006
@@ -24,7 +24,7 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import org.apache.log4j.Logger;
import javax.jms.*;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/CombinedTest.java Mon Dec 11 20:13:22 2006
@@ -22,7 +22,7 @@
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import junit.framework.TestCase;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Mon Dec 11 20:13:22 2006
@@ -24,7 +24,7 @@
import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java Mon Dec 11 20:13:22 2006
@@ -27,7 +27,7 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.AMQTopic;
import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.JMSException;
import javax.jms.Message;
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java?view=diff&rev=486008&r1=486007&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/TransactedTest.java Mon Dec 11 20:13:22 2006
@@ -25,7 +25,7 @@
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.client.transport.TransportConnection;
import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
-import org.apache.qpid.test.VMBrokerSetup;
+import org.apache.qpid.testutil.VMBrokerSetup;
import javax.jms.*;
Copied: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java (from r486006, incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/VMBrokerSetup.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java?view=diff&rev=486008&p1=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/VMBrokerSetup.java&r1=486006&p2=incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java&r2=486008
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/VMBrokerSetup.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/VMBrokerSetup.java Mon Dec 11 20:13:22 2006
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.qpid.test;
+package org.apache.qpid.testutil;
import junit.extensions.TestSetup;
import junit.framework.Test;