From 636129928afda987524bdf6bf66b1a5059efec13 Mon Sep 17 00:00:00 2001 From: Arnaud Simon Date: Tue, 2 Oct 2007 13:26:31 +0000 Subject: Changed to use QpidTestCase git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@581230 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/test/unit/basic/LargeMessageTest.java | 17 +++--------- .../qpid/test/unit/basic/MapMessageTest.java | 32 +++++++++------------- .../test/unit/basic/MultipleConnectionTest.java | 2 -- 3 files changed, 17 insertions(+), 34 deletions(-) (limited to 'java/client/src/test') diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java index ffc7be82f0..f0dd02c3e2 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java @@ -20,13 +20,11 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; -import org.apache.qpid.client.message.JMSTextMessage; -import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,26 +36,20 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import java.util.ArrayList; -import java.util.List; - -public class LargeMessageTest extends TestCase +public class LargeMessageTest extends QpidTestCase { private static final Logger _logger = LoggerFactory.getLogger(LargeMessageTest.class); - private AMQConnection _connection; private Destination _destination; private AMQSession _session; - private final List received = new ArrayList(); public String _broker = "vm://:1"; protected void setUp() throws Exception { super.setUp(); - TransportConnection.createVMBroker(1); try { - init(new AMQConnection(_broker, "guest", "guest", "LargeMessageTest", "test")); + init((AMQConnection) getConnection("guest", "guest")); } catch (Exception e) { @@ -78,8 +70,7 @@ public class LargeMessageTest extends TestCase private void init(AMQConnection connection, Destination destination) throws Exception { - _connection = connection; - _destination = destination; + _destination = destination; _session = (AMQSession) connection.createSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java index 6708fefa86..2c4df682f6 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MapMessageTest.java @@ -21,13 +21,12 @@ package org.apache.qpid.test.unit.basic; import junit.framework.Assert; -import junit.framework.TestCase; import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQQueue; import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.message.JMSMapMessage; -import org.apache.qpid.client.transport.TransportConnection; +import org.apache.qpid.testutil.QpidTestCase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +45,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -public class MapMessageTest extends TestCase implements MessageListener +public class MapMessageTest extends QpidTestCase implements MessageListener { private static final Logger _logger = LoggerFactory.getLogger(MapMessageTest.class); @@ -66,8 +65,7 @@ public class MapMessageTest extends TestCase implements MessageListener super.setUp(); try { - TransportConnection.createVMBroker(1); - init(new AMQConnection(_connectionString, "guest", "guest", randomize("Client"), "test")); + init((AMQConnection) getConnection("guest", "guest")); } catch (Exception e) { @@ -79,7 +77,6 @@ public class MapMessageTest extends TestCase implements MessageListener { _logger.info("Tearing Down unit.basic.MapMessageTest"); super.tearDown(); - TransportConnection.killAllVMBrokers(); } private void init(AMQConnection connection) throws Exception @@ -125,16 +122,16 @@ public class MapMessageTest extends TestCase implements MessageListener private void setMapValues(MapMessage message, int i) throws JMSException { message.setBoolean("odd", (i / 2) == 0); - message.setByte("byte", (byte) Byte.MAX_VALUE); + message.setByte("byte",Byte.MAX_VALUE); message.setBytes("bytes", _bytes); - message.setChar("char", (char) 'c'); - message.setDouble("double", (double) Double.MAX_VALUE); - message.setFloat("float", (float) Float.MAX_VALUE); + message.setChar("char",'c'); + message.setDouble("double", Double.MAX_VALUE); + message.setFloat("float", Float.MAX_VALUE); message.setFloat("smallfloat", 100); message.setInt("messageNumber", i); - message.setInt("int", (int) Integer.MAX_VALUE); - message.setLong("long", (long) Long.MAX_VALUE); - message.setShort("short", (short) Short.MAX_VALUE); + message.setInt("int", Integer.MAX_VALUE); + message.setLong("long", Long.MAX_VALUE); + message.setShort("short", Short.MAX_VALUE); message.setString("message", MESSAGE + i); // Test Setting Object Values @@ -184,13 +181,10 @@ public class MapMessageTest extends TestCase implements MessageListener void check() throws JMSException { - List actual = new ArrayList(); - int count = 0; + int count = 0; for (JMSMapMessage m : received) { - actual.add(m.getString("message")); - - testMapValues(m, count); + testMapValues(m, count); testCorrectExceptions(m); @@ -1246,7 +1240,7 @@ public class MapMessageTest extends TestCase implements MessageListener { synchronized (received) { - _logger.info("****************** Recevied Messgage:" + (JMSMapMessage) message); + _logger.info("****************** Recevied Messgage:" + message); received.add((JMSMapMessage) message); received.notify(); } diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java index 4bee2ab691..4f3fc5501d 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/MultipleConnectionTest.java @@ -19,8 +19,6 @@ */ package org.apache.qpid.test.unit.basic; -import junit.framework.TestCase; - import org.apache.qpid.client.AMQConnection; import org.apache.qpid.client.AMQDestination; import org.apache.qpid.client.AMQSession; -- cgit v1.2.1