You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2016/09/28 21:29:16 UTC
qpid-jms git commit: QPIDJMS-207 Clean up some test code
Repository: qpid-jms
Updated Branches:
refs/heads/master 5f46af2c1 -> 745700e35
QPIDJMS-207 Clean up some test code
Move a suggested test to a more proper home and implement it, remove
some unsued imports left over from other test fixes.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/745700e3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/745700e3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/745700e3
Branch: refs/heads/master
Commit: 745700e35f957879d26c2a7b1330595f00d96897
Parents: 5f46af2
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Sep 28 17:28:54 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Sep 28 17:29:11 2016 -0400
----------------------------------------------------------------------
.../integration/ConnectionIntegrationTest.java | 1 -
.../integration/ProducerIntegrationTest.java | 1 -
.../qpid/jms/message/JmsMapMessageTest.java | 39 --------------------
.../message/AmqpJmsMapMessageFacadeTest.java | 31 ++++++++++++++++
4 files changed, 31 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/745700e3/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
index a550fc9..c2aea58 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java
@@ -44,7 +44,6 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
-import javax.jms.ConnectionMetaData;
import javax.jms.ExceptionListener;
import javax.jms.IllegalStateException;
import javax.jms.JMSException;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/745700e3/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
index 75d8ee4..ea7654a 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java
@@ -42,7 +42,6 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.jms.BytesMessage;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/745700e3/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
index df6c628..89bbdd6 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMapMessageTest.java
@@ -785,45 +785,6 @@ public class JmsMapMessageTest {
assertGetMapEntryThrowsMessageFormatException(mapMessage, name, Double.class);
}
-// TODO - This is a test that should be moved to the Facade test for the AMQP message facades.
-//
-// /**
-// * Verify that for a message received with an AmqpValue containing a Map with a Binary entry
-// * value, we are able to read it back as a byte[].
-// */
-// @Test
-// public void testReceivedMapWithBinaryEntryReturnsByteArray() throws Exception {
-// String myKey1 = "key1";
-// String bytesSource = "myBytesAmqpValue";
-//
-// Map<String, Object> origMap = new HashMap<String, Object>();
-// byte[] bytes = bytesSource.getBytes();
-// origMap.put(myKey1, new Binary(bytes));
-//
-// org.apache.qpid.proton.codec.Data payloadData = new DataImpl();
-// payloadData.putDescribedType(new AmqpValueDescribedType(origMap));
-// Binary b = payloadData.encode();
-//
-// System.out.println("Using encoded AMQP message payload: " + b);
-//
-// Message message = Proton.message();
-// int decoded = message.decode(b.getArray(), b.getArrayOffset(), b.getLength());
-// assertEquals(decoded, b.getLength());
-//
-// AmqpMapMessage amqpMapMessage = new AmqpMapMessage(message, _mockDelivery, _mockAmqpConnection);
-//
-// JmsMapMessage mapMessage = new JmsMapMessage(amqpMapMessage, _mockSessionImpl, _mockConnectionImpl, null);
-//
-// // retrieve the bytes using getBytes, check they match expectation
-// byte[] receivedBytes = mapMessage.getBytes(myKey1);
-// assertTrue(Arrays.equals(bytes, receivedBytes));
-//
-// // retrieve the bytes using getObject, check they match expectation
-// Object o = mapMessage.getObject(myKey1);
-// assertTrue(o instanceof byte[]);
-// assertTrue(Arrays.equals(bytes, (byte[]) o));
-// }
-
/**
* Verify that setting bytes takes a copy of the array. Set bytes, then modify them, then
* retrieve the map entry and verify the two differ.
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/745700e3/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java
index 100ce6c..9ae47cd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java
@@ -23,10 +23,12 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
+import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
import org.apache.qpid.proton.amqp.messaging.AmqpValue;
@@ -209,4 +211,33 @@ public class AmqpJmsMapMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
amqpMapMessageFacade.put("entry", "value");
assertTrue(amqpMapMessageFacade.getMapNames().hasMoreElements());
}
+
+ //----- Test Read / Write of special contents in Map ---------------------//
+
+ /**
+ * Verify that for a message received with an AmqpValue containing a Map with a Binary entry
+ * value, we are able to read it back as a byte[].
+ *
+ * @throws Exception if an error occurs while running the test.
+ */
+ @Test
+ public void testReceivedMapWithBinaryEntryReturnsByteArray() throws Exception {
+ String myKey1 = "key1";
+ String bytesSource = "myBytesAmqpValue";
+
+ Map<String, Object> origMap = new HashMap<String, Object>();
+ byte[] bytes = bytesSource.getBytes();
+ origMap.put(myKey1, new Binary(bytes));
+
+ Message message = Message.Factory.create();
+ message.setBody(new AmqpValue(origMap));
+
+ AmqpJmsMapMessageFacade amqpMapMessageFacade = createReceivedMapMessageFacade(createMockAmqpConsumer(), message);
+
+ // retrieve the bytes using getBytes, check they match expectation
+ Object objectValue = amqpMapMessageFacade.get(myKey1);
+ assertTrue(byte[].class.equals(objectValue.getClass()));
+ byte[] bytesValue = (byte[]) objectValue;
+ assertTrue(Arrays.equals(bytes, bytesValue));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org