You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/24 17:33:39 UTC
svn commit: r1771195 - in /qpid/java/trunk:
systests/src/test/java/org/apache/qpid/test/client/message/
systests/src/test/java/org/apache/qpid/test/unit/basic/
systests/src/test/java/org/apache/qpid/test/unit/client/message/
test-profiles/
Author: rgodfrey
Date: Thu Nov 24 17:33:39 2016
New Revision: 1771195
URL: http://svn.apache.org/viewvc?rev=1771195&view=rev
Log:
QPID-7546 : Make some more tests run under AMQP 1.0
Modified:
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java?rev=1771195&r1=1771194&r2=1771195&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/ObjectMessageTest.java Thu Nov 24 17:33:39 2016
@@ -20,8 +20,7 @@
*/
package org.apache.qpid.test.client.message;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.util.UUID;
import javax.jms.Connection;
import javax.jms.JMSException;
@@ -30,7 +29,8 @@ import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.Session;
-import java.util.UUID;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class ObjectMessageTest extends QpidBrokerTestCase
{
@@ -51,9 +51,7 @@ public class ObjectMessageTest extends Q
_session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
//Create Queue
- String queueName = getTestQueueName();
- ((AMQSession) _session).createQueue(queueName, true, false, false);
- Queue queue = _session.createQueue("direct://amq.direct/"+queueName+"/"+queueName+"?durable='false'&autodelete='true'");
+ Queue queue = createTestQueue(_session);
//Create Consumer
_consumer = _session.createConsumer(queue);
@@ -141,7 +139,7 @@ public class ObjectMessageTest extends Q
public void testSendEmptyObjectMessage() throws JMSException
{
ObjectMessage testMessage = _session.createObjectMessage();
- testMessage.setStringProperty("test-property", "test-value");
+ testMessage.setStringProperty("testProperty", "test-value");
assertNotNull("Object was null", testMessage.toString());
_producer.send(testMessage);
@@ -150,7 +148,7 @@ public class ObjectMessageTest extends Q
assertNotNull("Message was not received.", receivedMessage);
assertNull("No object was sent", receivedMessage.getObject());
- assertEquals("Unexpected property received", "test-value", receivedMessage.getStringProperty("test-property"));
+ assertEquals("Unexpected property received", "test-value", receivedMessage.getStringProperty("testProperty"));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java?rev=1771195&r1=1771194&r2=1771195&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java Thu Nov 24 17:33:39 2016
@@ -242,9 +242,10 @@ public class BytesMessageTest extends Qp
public void testModificationAfterSend() throws Exception
{
Connection connection = getConnection();
+ Session producerSession = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ BytesMessage jmsMsg = producerSession.createBytesMessage();
+ Destination destination = createTestQueue(producerSession, "testQ");
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- BytesMessage jmsMsg = session.createBytesMessage();
- Destination destination = getTestQueue();
/* Set the constant message contents. */
@@ -256,7 +257,7 @@ public class BytesMessageTest extends Qp
connection.start();
/* Send messages. */
- MessageProducer producer = session.createProducer(destination);
+ MessageProducer producer = producerSession.createProducer(destination);
MessageConsumer consumer = session.createConsumer(destination);
@@ -269,6 +270,7 @@ public class BytesMessageTest extends Qp
producer.send(jmsMsg);
}
+ producerSession.close();
for(int writtenMsgCount = 0; writtenMsgCount < 10; writtenMsgCount++)
{
@@ -278,6 +280,8 @@ public class BytesMessageTest extends Qp
recvdMsg.getBodyLength());
}
+
+ connection.close();
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java?rev=1771195&r1=1771194&r2=1771195&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/basic/ObjectMessageTest.java Thu Nov 24 17:33:39 2016
@@ -19,71 +19,49 @@
*/
package org.apache.qpid.test.unit.basic;
-import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.message.JMSObjectMessage;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import javax.jms.Connection;
+import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.MessageNotWriteableException;
import javax.jms.MessageProducer;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import javax.jms.ObjectMessage;
+import javax.jms.Session;
+
+import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener
{
private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
- private AMQConnection _connection;
- private AMQDestination _destination;
- private AMQSession _session;
- private final List<JMSObjectMessage> received = new ArrayList<JMSObjectMessage>();
- private final List<Payload> messages = new ArrayList<Payload>();
+ private Connection _connection;
+ private Destination _destination;
+ private Session _session;
+ private final List<Message> received = new ArrayList<>();
+ private final List<Payload> messages = new ArrayList<>();
private int _count = 100;
public String _connectionString = "vm://:1";
protected void setUp() throws Exception
{
super.setUp();
- try
- {
- init( (AMQConnection) getConnection("guest", "guest"));
- }
- catch (Exception e)
- {
- fail("Uable to initialise: " + e);
- }
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- private void init(AMQConnection connection) throws Exception
- {
- init(connection, new AMQQueue(connection, randomize("ObjectMessageTest"), true));
- }
-
- private void init(AMQConnection connection, AMQDestination destination) throws Exception
- {
- _connection = connection;
- _destination = destination;
- _session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ _connection = getConnection("guest", "guest");
+ _session = _connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ _destination = createTestQueue(_session);
// set up a slow consumer
- _session.createConsumer(destination).setMessageListener(this);
- connection.start();
+ _session.createConsumer(_destination).setMessageListener(this);
+ _connection.start();
}
public void test() throws Exception
@@ -127,13 +105,16 @@ public class ObjectMessageTest extends Q
void check() throws JMSException
{
List<Object> actual = new ArrayList<Object>();
- for (JMSObjectMessage m : received)
+ for (Message message : received)
{
- actual.add(m.getObject());
+ assertTrue(message instanceof ObjectMessage);
+
+ ObjectMessage objectMessage = (ObjectMessage)message;
+ actual.add(objectMessage.getObject());
try
{
- m.setObject("Test text");
+ objectMessage.setObject("Test text");
Assert.fail("Message should not be writeable");
}
catch (MessageNotWriteableException mnwe)
@@ -141,11 +122,11 @@ public class ObjectMessageTest extends Q
// normal execution
}
- m.clearBody();
+ objectMessage.clearBody();
try
{
- m.setObject("Test text");
+ objectMessage.setObject("Test text");
}
catch (MessageNotWriteableException mnwe)
{
@@ -155,7 +136,7 @@ public class ObjectMessageTest extends Q
// Check property write status
try
{
- m.setStringProperty("test", "test");
+ objectMessage.setStringProperty("test", "test");
Assert.fail("Message should not be writeable");
}
catch (MessageNotWriteableException mnwe)
@@ -163,11 +144,11 @@ public class ObjectMessageTest extends Q
// normal execution
}
- m.clearProperties();
+ objectMessage.clearProperties();
try
{
- m.setStringProperty("test", "test");
+ objectMessage.setStringProperty("test", "test");
}
catch (MessageNotWriteableException mnwe)
{
@@ -221,16 +202,11 @@ public class ObjectMessageTest extends Q
{
synchronized (received)
{
- received.add((JMSObjectMessage) message);
+ received.add(message);
received.notify();
}
}
- private static String randomize(String in)
- {
- return in + System.currentTimeMillis();
- }
-
private static class Payload implements Serializable
{
private final String data;
@@ -255,22 +231,4 @@ public class ObjectMessageTest extends Q
return "Payload[" + data + "]";
}
}
-
- public static void main(String[] argv) throws Exception
- {
- ObjectMessageTest test = new ObjectMessageTest();
- test._connectionString = (argv.length == 0) ? "vm://:1" : argv[0];
- test.setUp();
- if (argv.length > 1)
- {
- test._count = Integer.parseInt(argv[1]);
- }
-
- test.test();
- }
-
- public static junit.framework.Test suite()
- {
- return new junit.framework.TestSuite(ObjectMessageTest.class);
- }
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java?rev=1771195&r1=1771194&r2=1771195&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java Thu Nov 24 17:33:39 2016
@@ -20,53 +20,50 @@
*/
package org.apache.qpid.test.unit.client.message;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.client.AMQQueue;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.test.utils.QpidBrokerTestCase;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import javax.jms.Connection;
+import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.ObjectMessage;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
+import javax.jms.Session;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class ObjectMessageTest extends QpidBrokerTestCase implements MessageListener
{
private static final Logger _logger = LoggerFactory.getLogger(ObjectMessageTest.class);
- private AMQConnection connection;
- private AMQDestination destination;
- private AMQSession session;
+ private Connection connection;
+ private Destination destination;
+ private Session session;
private MessageProducer producer;
private Serializable[] data;
private volatile boolean waiting;
private int received;
private final ArrayList items = new ArrayList();
- private String _broker = "vm://:1";
-
protected void setUp() throws Exception
{
super.setUp();
- connection = (AMQConnection) getConnection("guest", "guest");
- destination = new AMQQueue(connection, randomize("LatencyTest"), true);
- session = (AMQSession) connection.createSession(false, AMQSession.NO_ACKNOWLEDGE);
+ connection = getConnection("guest", "guest");
+ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ destination = createTestQueue(session);
// set up a consumer
session.createConsumer(destination).setMessageListener(this);
connection.start();
// create a publisher
- producer = session.createProducer(destination, false, false);
+ producer = session.createProducer(destination);
A a1 = new A(1, "A");
A a2 = new A(2, "a");
B b = new B(1, "B");
@@ -85,13 +82,6 @@ public class ObjectMessageTest extends Q
super.tearDown();
}
- public ObjectMessageTest()
- { }
-
- ObjectMessageTest(String broker) throws Exception
- {
- _broker = broker;
- }
public void testSendAndReceive() throws Exception
{
@@ -159,14 +149,6 @@ public class ObjectMessageTest extends Q
assertEquals(Float.MAX_VALUE, msg.getObjectProperty("TestFloatProperty"));
}
- public void testSetObjectPropertyForByteArray() throws Exception
- {
- byte[] array = { 1, 2, 3, 4, 5 };
- ObjectMessage msg = session.createObjectMessage(data[0]);
- msg.setObjectProperty("TestByteArrayProperty", array);
- assertTrue(Arrays.equals(array, (byte[]) msg.getObjectProperty("TestByteArrayProperty")));
- }
-
public void testSetObjectForNull() throws Exception
{
ObjectMessage msg = session.createObjectMessage();
@@ -195,7 +177,7 @@ public class ObjectMessageTest extends Q
public void check() throws Exception
{
- Object[] actual = (Object[]) items.toArray();
+ Object[] actual = items.toArray();
if (actual.length != data.length)
{
throw new Exception("Expected " + data.length + " objects, got " + actual.length);
@@ -265,17 +247,6 @@ public class ObjectMessageTest extends Q
}
}
- public static void main(String[] argv) throws Exception
- {
- String broker = (argv.length > 0) ? argv[0] : "vm://:1";
- if ("-help".equals(broker))
- {
- System.out.println("Usage: <broker>");
- }
-
- new ObjectMessageTest(broker).testSendAndReceive();
- }
-
private static class A implements Serializable
{
private String sValue;
Modified: qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes?rev=1771195&r1=1771194&r2=1771195&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes (original)
+++ qpid/java/trunk/test-profiles/Java10UninvestigatedTestsExcludes Thu Nov 24 17:33:39 2016
@@ -15,7 +15,7 @@ org.apache.qpid.server.logging.Transient
org.apache.qpid.server.queue.NodeAutoCreationPolicyTest#*
org.apache.qpid.server.security.auth.manager.ExternalAuthenticationTest#*
org.apache.qpid.server.security.auth.manager.MD5AuthenticationManagerTest#*
-org.apache.qpid.server.security.auth.mana.ger.ScramSha1AuthenticationManagerTest#*
+org.apache.qpid.server.security.auth.manager.ScramSha1AuthenticationManagerTest#*
org.apache.qpid.server.security.auth.manager.ScramSha256AuthenticationManagerTest#*
org.apache.qpid.test.unit.basic.LargeMessageTest#*
org.apache.qpid.test.unit.client.connection.ConnectionStartTest#*
@@ -68,7 +68,6 @@ org.apache.qpid.test.unit.topic.DurableS
org.apache.qpid.test.unit.message.UTF8Test#*
org.apache.qpid.test.unit.close.MessageConsumerCloseTest#*
org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#*
-org.apache.qpid.test.unit.client.message.ObjectMessageTest#*
org.apache.qpid.test.unit.client.MaxDeliveryCountTest#*
org.apache.qpid.test.unit.client.connection.ConnectionTest#*
org.apache.qpid.test.unit.client.connection.ConnectionFactoryTest#*
@@ -78,7 +77,6 @@ org.apache.qpid.test.unit.client.AMQSess
org.apache.qpid.test.unit.basic.SessionStartTest#*
org.apache.qpid.test.unit.basic.PubSubTwoConnectionTest#*
org.apache.qpid.test.unit.basic.PropertyValueTest#*
-org.apache.qpid.test.unit.basic.ObjectMessageTest#*
org.apache.qpid.test.unit.basic.MultipleConnectionTest#*
org.apache.qpid.test.unit.basic.InvalidDestinationTest#*
org.apache.qpid.test.unit.basic.FieldTableMessageTest#*
@@ -90,7 +88,6 @@ org.apache.qpid.test.unit.ack.Acknowledg
org.apache.qpid.test.client.RollbackOrderTest#*
org.apache.qpid.test.client.queue.LVQTest#*
org.apache.qpid.test.client.message.SelectorTest#*
-org.apache.qpid.test.client.message.ObjectMessageTest#*
org.apache.qpid.test.client.message.MessageToStringTest#*
org.apache.qpid.test.client.message.JMSReplyToTest#*
org.apache.qpid.test.client.message.JMSDestinationTest#*
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org