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/20 15:29:14 UTC
[1/2] qpid-jms git commit: QPIDJMS-207 Add more test coverage
Repository: qpid-jms
Updated Branches:
refs/heads/master da0f0e6e6 -> 1c3ff1cbb
QPIDJMS-207 Add more test coverage
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6dd3d2b1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6dd3d2b1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6dd3d2b1
Branch: refs/heads/master
Commit: 6dd3d2b1d088b52685ca75a6edd7da279a2e4c78
Parents: da0f0e6
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 20 10:59:50 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 20 10:59:50 2016 -0400
----------------------------------------------------------------------
.../qpid/jms/meta/JmsConnectionInfoTest.java | 32 +++++++++++++++
.../qpid/jms/meta/JmsConsumerInfoTest.java | 10 +++++
.../qpid/jms/meta/JmsProducerInfoTest.java | 14 +++++++
.../qpid/jms/meta/JmsSessionInfoTest.java | 42 +++++++++++++++++++-
4 files changed, 97 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6dd3d2b1/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
index 8e4fb23..0511840 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConnectionInfoTest.java
@@ -20,9 +20,11 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.qpid.jms.policy.JmsDefaultMessageIDPolicy;
@@ -157,4 +159,34 @@ public class JmsConnectionInfoTest {
assertTrue(visited.get());
}
+
+ @Test
+ public void testGetEncodedUsername() {
+ final JmsConnectionInfo info = new JmsConnectionInfo(firstId);
+ info.setUsername("user");
+ byte[] result = info.getEncodedUsername();
+ assertEquals("user", new String(result, StandardCharsets.UTF_8));
+ }
+
+ @Test
+ public void testGetEncodedUsernameValueIsCached() {
+ final JmsConnectionInfo info = new JmsConnectionInfo(firstId);
+ info.setUsername("user");
+ byte[] result1 = info.getEncodedUsername();
+ byte[] result2 = info.getEncodedUsername();
+ assertSame(result1, result2);
+ }
+
+ @Test
+ public void testGetEncodedUsernameWithNoUsername() {
+ final JmsConnectionInfo info = new JmsConnectionInfo(firstId);
+ assertNull(info.getEncodedUsername());
+ }
+
+ @Test
+ public void testGetEncodedUsernameWithEmptyUsername() {
+ final JmsConnectionInfo info = new JmsConnectionInfo(firstId);
+ info.setUsername("");
+ assertNotNull(info.getEncodedUsername());
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6dd3d2b1/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerInfoTest.java
index 20ff635..87f0908 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsConsumerInfoTest.java
@@ -172,4 +172,14 @@ public class JmsConsumerInfoTest {
assertTrue(visited.get());
}
+
+ @Test
+ public void testGetRedeliveryPolicyDefaults() {
+ final JmsConsumerInfo info = new JmsConsumerInfo(firstId);
+
+ assertNotNull(info.getRedeliveryPolicy());
+ info.setRedeliveryPolicy(null);
+ assertNotNull(info.getRedeliveryPolicy());
+ assertTrue(info.getRedeliveryPolicy() instanceof JmsDefaultRedeliveryPolicy);
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6dd3d2b1/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerInfoTest.java
index f2371d0..79ef89f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsProducerInfoTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -64,6 +65,19 @@ public class JmsProducerInfoTest {
}
@Test
+ public void testCreateThrowsOnNullParameters() {
+ try {
+ new JmsProducerInfo(null, JmsMessageIDBuilder.BUILTIN.DEFAULT.createBuilder());
+ fail("Should not allow create will null params");
+ } catch (IllegalArgumentException ex) {}
+
+ try {
+ new JmsProducerInfo(firstId, null);
+ fail("Should not allow create will null params");
+ } catch (IllegalArgumentException ex) {}
+ }
+
+ @Test
public void testCopy() {
JmsProducerInfo info = createPorducerInfo(firstId);
info.setDestination(new JmsTopic("Test"));
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6dd3d2b1/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionInfoTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionInfoTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionInfoTest.java
index 2ba79ab..947b00c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionInfoTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/meta/JmsSessionInfoTest.java
@@ -36,7 +36,7 @@ import org.junit.Before;
import org.junit.Test;
/**
- *
+ * Tests for the JmsSessionInfo object
*/
public class JmsSessionInfoTest {
@@ -167,4 +167,44 @@ public class JmsSessionInfoTest {
assertTrue(visited.get());
}
+
+ @Test
+ public void testGetMessageIDPolicyDefaults() {
+ final JmsSessionInfo info = new JmsSessionInfo(firstId);
+
+ assertNotNull(info.getMessageIDPolicy());
+ info.setMessageIDPolicy(null);
+ assertNotNull(info.getMessageIDPolicy());
+ assertTrue(info.getMessageIDPolicy() instanceof JmsDefaultMessageIDPolicy);
+ }
+
+ @Test
+ public void testGetPrefetchPolicyDefaults() {
+ final JmsSessionInfo info = new JmsSessionInfo(firstId);
+
+ assertNotNull(info.getPrefetchPolicy());
+ info.setPrefetchPolicy(null);
+ assertNotNull(info.getPrefetchPolicy());
+ assertTrue(info.getPrefetchPolicy() instanceof JmsDefaultPrefetchPolicy);
+ }
+
+ @Test
+ public void testGetPresettlePolicyDefaults() {
+ final JmsSessionInfo info = new JmsSessionInfo(firstId);
+
+ assertNotNull(info.getPresettlePolicy());
+ info.setPresettlePolicy(null);
+ assertNotNull(info.getPresettlePolicy());
+ assertTrue(info.getPresettlePolicy() instanceof JmsDefaultPresettlePolicy);
+ }
+
+ @Test
+ public void testGetRedeliveryPolicyDefaults() {
+ final JmsSessionInfo info = new JmsSessionInfo(firstId);
+
+ assertNotNull(info.getRedeliveryPolicy());
+ info.setRedeliveryPolicy(null);
+ assertNotNull(info.getRedeliveryPolicy());
+ assertTrue(info.getRedeliveryPolicy() instanceof JmsDefaultRedeliveryPolicy);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-jms git commit: QPIDJMS-208 Assign the set deserialization
policy to new connections.
Posted by ta...@apache.org.
QPIDJMS-208 Assign the set deserialization policy to new connections.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1c3ff1cb
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1c3ff1cb
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1c3ff1cb
Branch: refs/heads/master
Commit: 1c3ff1cbba17bb1f2fe09735abd16d96c1c40339
Parents: 6dd3d2b
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Sep 20 11:23:40 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Sep 20 11:23:40 2016 -0400
----------------------------------------------------------------------
.../apache/qpid/jms/JmsConnectionFactory.java | 1 +
.../qpid/jms/JmsConnectionFactoryTest.java | 24 ++++++++++++++++++++
.../qpid/jms/SerializationTestSupport.java | 15 ++++++++++++
3 files changed, 40 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c3ff1cb/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index 4105842..c40b9f1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -219,6 +219,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
connection.setPrefetchPolicy(prefetchPolicy.copy());
connection.setPresettlePolicy(presettlePolicy.copy());
connection.setRedeliveryPolicy(redeliveryPolicy.copy());
+ connection.setDeserializationPolicy(deserializationPolicy.copy());
PropertyUtil.setProperties(connection, properties);
connection.setExceptionListener(exceptionListener);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c3ff1cb/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
index 48c668b..ea8c867 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java
@@ -732,4 +732,28 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase {
fail("should throw IllegalArgumentException");
} catch (IllegalArgumentException ex) {}
}
+
+ @Test
+ public void testDeserializationPolicyRestsToDefault() {
+ JmsConnectionFactory factory = new JmsConnectionFactory("amqp://127.0.0.1:5672");
+
+ assertNotNull(factory.getDeserializationPolicy());
+ factory.setDeserializationPolicy(null);
+ assertNotNull(factory.getDeserializationPolicy());
+ assertTrue(factory.getDeserializationPolicy() instanceof JmsDefaultDeserializationPolicy);
+ }
+
+ @Test
+ public void testCustomDeserializationPolicyIsAppliedToConnections() throws JMSException {
+ JmsConnectionFactory factory = new JmsConnectionFactory("mock://127.0.0.1:5672");
+
+ assertNotNull(factory.getDeserializationPolicy());
+ factory.setDeserializationPolicy(new SerializationTestSupport.TestJmsDeserializationPolicy());
+ assertNotNull(factory.getDeserializationPolicy());
+ assertTrue(factory.getDeserializationPolicy() instanceof SerializationTestSupport.TestJmsDeserializationPolicy);
+
+ JmsConnection connection = (JmsConnection) factory.createConnection();
+
+ assertTrue(connection.getDeserializationPolicy() instanceof SerializationTestSupport.TestJmsDeserializationPolicy);
+ }
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c3ff1cb/qpid-jms-client/src/test/java/org/apache/qpid/jms/SerializationTestSupport.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/SerializationTestSupport.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/SerializationTestSupport.java
index 0078aaa..bcb2eca 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/SerializationTestSupport.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/SerializationTestSupport.java
@@ -22,6 +22,8 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import org.apache.qpid.jms.policy.JmsDeserializationPolicy;
+
public class SerializationTestSupport {
public static Object roundTripSerialize(final Object o) throws IOException, ClassNotFoundException {
@@ -47,4 +49,17 @@ public class SerializationTestSupport {
ois.close();
return deserializedObject;
}
+
+ public static class TestJmsDeserializationPolicy implements JmsDeserializationPolicy {
+
+ @Override
+ public JmsDeserializationPolicy copy() {
+ return new TestJmsDeserializationPolicy();
+ }
+
+ @Override
+ public boolean isTrustedType(JmsDestination destination, Class<?> clazz) {
+ return true;
+ }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org