You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2017/11/08 14:50:32 UTC
[1/3] qpid-jms-amqp-0-x git commit: NO-JIRA: [Java Client,
AMQP 0-x] Remove SerialTest#testCorollary1 test.
Repository: qpid-jms-amqp-0-x
Updated Branches:
refs/heads/master 1043d0f4d -> ffa282d5e
NO-JIRA: [Java Client, AMQP 0-x] Remove SerialTest#testCorollary1 test.
The test seems ill-conceived.
* The number of iterations for s seems arbitrary (67108664 = 2^26 - 100)
* The values of n seem arbitrary (0+1, 512+1, 1024+1, 1536+1, ..., 3585)
* Though arbitrary the values of n have a very specific bit pattern of 10..01
* s is always incremented by 1024 leading to a very predictable bit pattern in s.
Namely the 10 least significant bits are always zero.
* Given the iteration count and the increment the same values of s are tested 16 times!!!
* Given the above it seems to not focus on interesting corner cases nor is it an exhaustive test.
In addition to all the above it runs for almost 5 minutes on my box accounting for 80% of all tests.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/472aea78
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/472aea78
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/472aea78
Branch: refs/heads/master
Commit: 472aea78d0ca77144000aacdd932ebb4a8fed192
Parents: 1043d0f
Author: Lorenz Quack <lq...@apache.org>
Authored: Wed Nov 8 14:27:32 2017 +0000
Committer: Lorenz Quack <lq...@apache.org>
Committed: Wed Nov 8 14:27:32 2017 +0000
----------------------------------------------------------------------
.../java/org/apache/qpid/util/SerialTest.java | 35 ++------------------
1 file changed, 3 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/472aea78/client/src/test/java/org/apache/qpid/util/SerialTest.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/qpid/util/SerialTest.java b/client/src/test/java/org/apache/qpid/util/SerialTest.java
index 08342da..24311c4 100644
--- a/client/src/test/java/org/apache/qpid/util/SerialTest.java
+++ b/client/src/test/java/org/apache/qpid/util/SerialTest.java
@@ -21,6 +21,9 @@
package org.apache.qpid.util;
+import java.util.HashMap;
+import java.util.Map;
+
import org.apache.qpid.test.utils.QpidTestCase;
/**
@@ -43,36 +46,4 @@ public class SerialTest extends QpidTestCase
assertTrue(Serial.gt(0xFFFFFFFF + 1, 0xFFFFFFFF));
assertTrue(Serial.lt(0xFFFFFFFF, 0xFFFFFFFF + 1));
}
-
- /**
- * Test the first Corollary of RFC 1982
- * For any sequence number s and any integer n such that addition of n
- * to s is well defined, (s + n) >= s. Further (s + n) == s only when
- * n == 0, in all other defined cases, (s + n) > s.
- */
- public void testCorollary1()
- {
- int wrapcount = 0;
-
- int s = 0;
-
- for (int i = 0; i < 67108664; i++)
- {
- for (int n = 1; n < 4096; n += 512)
- {
- assertTrue("Serial.gt returned false for: (" + (s + n) + " > " + s + "), n=" + n, Serial.gt(s + n, s));
- assertTrue("Serial.lt returned false for: (" + s + " < " + (s + n) + "), n=" + n, Serial.lt(s, s + n));
- }
-
- s += 1024;
-
- if (s == 0)
- {
- wrapcount += 1;
- }
- }
-
- assertTrue(wrapcount > 0);
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] qpid-jms-amqp-0-x git commit: NO-JIRA: [Java Client,
AMQP 0-x] Remove MessageConverterTest#testMessageConversion which
does not test anything of value.
Posted by lq...@apache.org.
NO-JIRA: [Java Client, AMQP 0-x] Remove MessageConverterTest#testMessageConversion which does not test anything of value.
The test setup sets properties on a message.
The test then calls the same method to set the same properties on a Dummy implementation of Message.
The test then asserts that the two messages have the same properties.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/ffa282d5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/ffa282d5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/ffa282d5
Branch: refs/heads/master
Commit: ffa282d5e582363a103f5337c490d9f2ec602f91
Parents: 8774a1c
Author: Lorenz Quack <lq...@apache.org>
Authored: Wed Nov 8 14:38:23 2017 +0000
Committer: Lorenz Quack <lq...@apache.org>
Committed: Wed Nov 8 14:49:18 2017 +0000
----------------------------------------------------------------------
.../apache/qpid/test/unit/message/MessageConverterTest.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/ffa282d5/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
index 6fc975c..298dcae 100644
--- a/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
+++ b/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
@@ -97,13 +97,6 @@ public class MessageConverterTest extends QpidTestCase
}
- public void testMessageConversion() throws Exception
- {
- Message newMessage = new NonQpidMessage();
- setMessageProperties(newMessage);
- mesagePropertiesTest(testTextMessage, newMessage);
- }
-
private void setMessageProperties(Message message) throws JMSException
{
message.setJMSCorrelationID(JMS_CORR_ID);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] qpid-jms-amqp-0-x git commit: QPID-7897, QPID-7899: [Java Client,
AMQP 0-x] Do not convert to/from String in
Message#set-/getJMSCorrelationIDAsBytes()
Posted by lq...@apache.org.
QPID-7897, QPID-7899: [Java Client, AMQP 0-x] Do not convert to/from String in Message#set-/getJMSCorrelationIDAsBytes()
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/commit/8774a1c3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/tree/8774a1c3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/diff/8774a1c3
Branch: refs/heads/master
Commit: 8774a1c38d596e17683aac1a285ec437d82c7767
Parents: 472aea7
Author: Lorenz Quack <lq...@apache.org>
Authored: Wed Nov 8 14:29:14 2017 +0000
Committer: Lorenz Quack <lq...@apache.org>
Committed: Wed Nov 8 14:49:18 2017 +0000
----------------------------------------------------------------------
.../client/message/AMQMessageDelegate_0_10.java | 7 +++--
.../client/message/AMQMessageDelegate_0_8.java | 5 ++--
.../qpid/test/unit/message/MessageTest.java | 28 ++++++++++++++++++++
3 files changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/8774a1c3/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index 398a6e8..dde0a1b 100644
--- a/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
@@ -21,6 +21,7 @@
package org.apache.qpid.client.message;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -252,15 +253,13 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate
public void setJMSCorrelationID(String correlationId) throws JMSException
{
-
- setJMSCorrelationIDAsBytes(correlationId == null ? null : correlationId.getBytes());
+ setJMSCorrelationIDAsBytes(correlationId == null ? null : correlationId.getBytes(StandardCharsets.UTF_8));
}
public String getJMSCorrelationID() throws JMSException
{
-
byte[] correlationIDAsBytes = getJMSCorrelationIDAsBytes();
- return correlationIDAsBytes == null ? null : new String(correlationIDAsBytes);
+ return correlationIDAsBytes == null ? null : new String(correlationIDAsBytes, StandardCharsets.UTF_8);
}
public Destination getJMSReplyTo()
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/8774a1c3/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
----------------------------------------------------------------------
diff --git a/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java b/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
index 8e8e00d..cb61770 100644
--- a/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
+++ b/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_8.java
@@ -252,12 +252,13 @@ public class AMQMessageDelegate_0_8 extends AbstractAMQMessageDelegate
public byte[] getJMSCorrelationIDAsBytes() throws JMSException
{
- return getContentHeaderProperties().getCorrelationIdAsString().getBytes();
+ final AMQShortString correlationId = getContentHeaderProperties().getCorrelationId();
+ return correlationId == null ? null : correlationId.getBytes();
}
public void setJMSCorrelationIDAsBytes(byte[] bytes) throws JMSException
{
- getContentHeaderProperties().setCorrelationId(new String(bytes));
+ getContentHeaderProperties().setCorrelationId(new AMQShortString(bytes));
}
public void setJMSCorrelationID(String correlationId) throws JMSException
http://git-wip-us.apache.org/repos/asf/qpid-jms-amqp-0-x/blob/8774a1c3/client/src/test/java/org/apache/qpid/test/unit/message/MessageTest.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/qpid/test/unit/message/MessageTest.java b/client/src/test/java/org/apache/qpid/test/unit/message/MessageTest.java
new file mode 100644
index 0000000..fc263d2
--- /dev/null
+++ b/client/src/test/java/org/apache/qpid/test/unit/message/MessageTest.java
@@ -0,0 +1,28 @@
+package org.apache.qpid.test.unit.message;
+
+import static org.junit.Assert.assertArrayEquals;
+
+import org.apache.qpid.client.message.AMQMessageDelegateFactory;
+import org.apache.qpid.client.message.JMSTextMessage;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+public class MessageTest extends QpidTestCase
+{
+ private JMSTextMessage _testTextMessage;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ _testTextMessage = new JMSTextMessage(AMQMessageDelegateFactory.FACTORY_0_8);
+ _testTextMessage.setText("testTextMessage text");
+ }
+
+ public void testJMSCorrelationIdAdBytesWithNonUtf8Bytes() throws Exception
+ {
+ // QPID-7897 and QPID-7899
+ byte[] correlationId = new byte[]{(byte) 0xc3, 0x28};
+ _testTextMessage.setJMSCorrelationIDAsBytes(correlationId);
+ assertArrayEquals("", correlationId, _testTextMessage.getJMSCorrelationIDAsBytes());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org