You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2016/10/26 10:31:17 UTC
qpid-jms git commit: QPIDJMS-216: remove stale implements clause,
fixup some test names, add a little more direct testing of the wrapper
Repository: qpid-jms
Updated Branches:
refs/heads/master 305041fab -> 76e84ead9
QPIDJMS-216: remove stale implements clause, fixup some test names, add a little more direct testing of the wrapper
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/76e84ead
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/76e84ead
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/76e84ead
Branch: refs/heads/master
Commit: 76e84ead9d37c660384718f3d1841b0f44ddf635
Parents: 305041f
Author: Robert Gemmell <ro...@apache.org>
Authored: Wed Oct 26 11:29:39 2016 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Wed Oct 26 11:29:39 2016 +0100
----------------------------------------------------------------------
.../jms/provider/amqp/message/AmqpHeader.java | 3 +-
.../integration/ProducerIntegrationTest.java | 3 +-
.../provider/amqp/message/AmqpHeaderTest.java | 69 +++++++++++++++++++-
.../amqp/message/AmqpJmsMessageFacadeTest.java | 2 +-
4 files changed, 70 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/76e84ead/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeader.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeader.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeader.java
index 5219c28..844f96c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeader.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeader.java
@@ -19,13 +19,12 @@ package org.apache.qpid.jms.provider.amqp.message;
import org.apache.qpid.proton.amqp.UnsignedByte;
import org.apache.qpid.proton.amqp.UnsignedInteger;
import org.apache.qpid.proton.amqp.messaging.Header;
-import org.apache.qpid.proton.amqp.messaging.Section;
/**
* Wraps around the proton Header object and provides an ability to
* determine if the Header can be optimized out of message encodes
*/
-public final class AmqpHeader implements Section {
+public final class AmqpHeader {
private static final int DEFAULT_PRIORITY = 4;
private static final long UINT_MAX = 0xFFFFFFFFL;
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/76e84ead/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 56ec81e..84b497b 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
@@ -256,7 +256,8 @@ public class ProducerIntegrationTest extends QpidJmsTestCase {
/**
* Test that when a message is sent and the producer is set to send as NON_PERSISTENT
- * the resulting sent message has durable set to false.
+ * the resulting sent message has durable false, in this case due to omitting the
+ * header section due to it having all default values.
*
* @throws Exception if an error occurs during the test.
*/
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/76e84ead/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeaderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeaderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeaderTest.java
index a2752a0..b786fd0 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeaderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpHeaderTest.java
@@ -19,6 +19,7 @@ package org.apache.qpid.jms.provider.amqp.message;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.apache.qpid.proton.amqp.UnsignedByte;
@@ -95,6 +96,68 @@ public class AmqpHeaderTest {
assertEquals(11, header.getDeliveryCount());
}
+ //----- Test getHeader default processing-----------------------------//
+
+ @Test
+ public void testGetHeaderReturnsNullWhenAllDefault() {
+ AmqpHeader header = new AmqpHeader();
+
+ assertNull("Header should not have been created as values are defaulted", header.getHeader());
+ }
+
+ @Test
+ public void testGetHeaderWhenDurableIsNotDefault() {
+ AmqpHeader amqpHeader = new AmqpHeader();
+ amqpHeader.setDurable(true);
+
+ Header header = amqpHeader.getHeader();
+ assertNotNull("Header should have been created as values are not all defaulted", header);
+ assertTrue(header.getDurable());
+ }
+
+ @Test
+ public void testGetHeaderWhenDeliveryCountIsNotDefault() {
+ AmqpHeader amqpHeader = new AmqpHeader();
+ int count = 234;
+ amqpHeader.setDeliveryCount(count);
+
+ Header header = amqpHeader.getHeader();
+ assertNotNull("Header should have been created as values are not all defaulted", header);
+ assertEquals(UnsignedInteger.valueOf(count), header.getDeliveryCount());
+ }
+
+ @Test
+ public void testGetHeaderWhenPriorityIsNotDefault() {
+ AmqpHeader amqpHeader = new AmqpHeader();
+ byte priority = 6;
+ amqpHeader.setPriority(priority);
+
+ Header header = amqpHeader.getHeader();
+ assertNotNull("Header should have been created as values are not all defaulted", header);
+ assertEquals(UnsignedByte.valueOf(priority), header.getPriority());
+ }
+
+ @Test
+ public void testGetHeaderWhenTTLIsNotDefault() {
+ AmqpHeader amqpHeader = new AmqpHeader();
+ int ttl = 345;
+ amqpHeader.setTimeToLive(ttl);
+
+ Header header = amqpHeader.getHeader();
+ assertNotNull("Header should have been created as values are not all defaulted", header);
+ assertEquals(UnsignedInteger.valueOf(ttl), header.getTtl());
+ }
+
+ @Test
+ public void testGetHeaderWhenFirstAcquirerIsNotDefault() {
+ AmqpHeader amqpHeader = new AmqpHeader();
+ amqpHeader.setFirstAcquirer(true);
+
+ Header header = amqpHeader.getHeader();
+ assertNotNull("Header should have been created as values are not all defaulted", header);
+ assertTrue(header.getFirstAcquirer());
+ }
+
//----- Test Set from Header ---------------------------------------------//
@Test
@@ -466,7 +529,7 @@ public class AmqpHeaderTest {
//----- Test Durable Property --------------------------------------------//
@Test
- public void testSetDuranleFromNull() {
+ public void testSetDurableFromNull() {
AmqpHeader header = new AmqpHeader();
header.setDurable((Boolean) null);
@@ -478,7 +541,7 @@ public class AmqpHeaderTest {
}
@Test
- public void testSetDuranleFromBoolean() {
+ public void testSetDurableFromBoolean() {
AmqpHeader header = new AmqpHeader();
header.setDurable(Boolean.FALSE);
@@ -497,7 +560,7 @@ public class AmqpHeaderTest {
}
@Test
- public void testSetDuranleFromPrimitive() {
+ public void testSetDurableFromPrimitive() {
AmqpHeader header = new AmqpHeader();
header.setDurable(false);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/76e84ead/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
index c26bbe1..5e2ae38 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java
@@ -1859,7 +1859,7 @@ public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase {
}
@Test
- public void testMessageWithNonDefaultHeaderValuesCreateNoHeaderForEncode() throws Exception {
+ public void testMessageWithNonDefaultHeaderValuesCreatesHeaderForEncode() throws Exception {
AmqpJmsMessageFacade amqpMessageFacade = createNewMessageFacade();
amqpMessageFacade.setPersistent(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org