Repository: qpid-jms Updated Branches: refs/heads/master 5b28856af -> 6b054d760
Fix these tests Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/6b054d76 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/6b054d76 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/6b054d76 Branch: refs/heads/master Commit: 6b054d76092fb01d3b8d96127e7f9ea87d2b4760 Parents: 5b28856 Author: Timothy Bish <[email protected]> Authored: Fri Jan 23 13:26:07 2015 -0500 Committer: Timothy Bish <[email protected]> Committed: Fri Jan 23 13:58:58 2015 -0500 ---------------------------------------------------------------------- .../netty/NettySslTransportFactoryTest.java | 66 ++++++++++++++++---- .../netty/NettyTcpTransportFactoryTest.java | 62 +++--------------- 2 files changed, 65 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b054d76/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java index 8b98c4c..3492ba1 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportFactoryTest.java @@ -16,19 +16,25 @@ */ package org.apache.qpid.jms.transports.netty; +import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; 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.assertThat; import static org.junit.Assert.assertTrue; import java.net.URI; +import java.util.Arrays; +import java.util.List; import org.apache.qpid.jms.transports.Transport; import org.apache.qpid.jms.transports.TransportOptions; +import org.apache.qpid.jms.transports.TransportSslOptions; import org.junit.Test; /** - * Test the NettyTcpTransportFactory class + * Test the NettySslTransportFactoryTest class */ public class NettySslTransportFactoryTest { @@ -40,17 +46,24 @@ public class NettySslTransportFactoryTest { public static final int CUSTOM_SO_LINGER = Short.MIN_VALUE; public static final int CUSTOM_SO_TIMEOUT = 10; public static final int CUSTOM_CONNECT_TIMEOUT = 90000; + public static final String[] CUSTOM_ENABLED_PROTOCOLS = { "TLSv1.1", "TLSv1.2" }; + public static final String CUSTOM_ENABLED_PROTOCOLS_STRING = "TLSv1.1,TLSv1.2"; + public static final String[] CUSTOM_ENABLED_CIPHER_SUITES = {"Suite-1", "Suite-2"}; + public static final String CUSTOM_ENABLED_CIPHER_SUITES_STRING = "Suite-1,Suite-2"; + public static final String CUSTOM_STORE_TYPE = "jceks"; + public static final boolean CUSTOM_TRUST_ALL = true; + public static final boolean CUSTOM_VERIFY_HOST = true; @Test public void testCreateWithDefaultOptions() throws Exception { - URI BASE_URI = new URI("tcp://localhost:5672"); + URI BASE_URI = new URI("ssl://localhost:5672"); - NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); + NettySslTransportFactory factory = new NettySslTransportFactory(); Transport transport = factory.createTransport(BASE_URI); assertNotNull(transport); - assertTrue(transport instanceof NettyTcpTransport); + assertTrue(transport instanceof NettySslTransport); assertFalse(transport.isConnected()); TransportOptions options = transport.getTransportOptions(); @@ -64,19 +77,31 @@ public class NettySslTransportFactoryTest { assertEquals(TransportOptions.DEFAULT_TCP_KEEP_ALIVE, options.isTcpKeepAlive()); assertEquals(TransportOptions.DEFAULT_SO_LINGER, options.getSoLinger()); assertEquals(TransportOptions.DEFAULT_SO_TIMEOUT, options.getSoTimeout()); + + assertTrue(options instanceof TransportSslOptions); + TransportSslOptions sslOptions = (TransportSslOptions) options; + + List<String> enabledProtocols = Arrays.asList(sslOptions.getEnabledProtocols()); + List<String> defaultProtocols = Arrays.asList(TransportSslOptions.DEFAULT_ENABLED_PROTOCOLS); + assertThat(enabledProtocols, containsInAnyOrder(defaultProtocols.toArray())); + + assertNull(sslOptions.getEnabledCipherSuites()); + + assertEquals(TransportSslOptions.DEFAULT_STORE_TYPE, sslOptions.getStoreType()); + assertEquals(TransportSslOptions.DEFAULT_VERIFY_HOST, sslOptions.isVerifyHost()); } @Test(expected = IllegalArgumentException.class) public void testCreateWithUnknownOption() throws Exception { - URI BASE_URI = new URI("tcp://localhost:5672?transport.someOption=true"); - NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); + URI BASE_URI = new URI("ssl://localhost:5672?transport.someOption=true"); + NettySslTransportFactory factory = new NettySslTransportFactory(); factory.createTransport(BASE_URI); } @Test(expected = IllegalArgumentException.class) public void testCreateWithBadOption() throws Exception { - URI BASE_URI = new URI("tcp://localhost:5672?transport.trafficClass=4096"); - NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); + URI BASE_URI = new URI("ssl://localhost:5672?transport.trafficClass=4096"); + NettySslTransportFactory factory = new NettySslTransportFactory(); factory.createTransport(BASE_URI); } @@ -92,14 +117,19 @@ public class NettySslTransportFactoryTest { "transport.tcpNoDelay=" + CUSTOM_TCP_NO_DELAY + "&" + "transport.tcpKeepAlive=" + CUSTOM_TCP_KEEP_ALIVE + "&" + "transport.soLinger=" + CUSTOM_SO_LINGER + "&" + - "transport.soTimeout=" + CUSTOM_SO_TIMEOUT); + "transport.soTimeout=" + CUSTOM_SO_TIMEOUT + "&" + + "transport.verifyHost=" + CUSTOM_VERIFY_HOST + "&" + + "transport.storeType=" + CUSTOM_STORE_TYPE + "&" + + "transport.trustAll=" + CUSTOM_TRUST_ALL + "&" + + "transport.enabledProtocols=" + CUSTOM_ENABLED_PROTOCOLS_STRING + "&" + + "transport.enabledCipherSuites=" + CUSTOM_ENABLED_CIPHER_SUITES_STRING); - NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); + NettySslTransportFactory factory = new NettySslTransportFactory(); Transport transport = factory.createTransport(configuredURI); assertNotNull(transport); - assertTrue(transport instanceof NettyTcpTransport); + assertTrue(transport instanceof NettySslTransport); assertFalse(transport.isConnected()); TransportOptions options = transport.getTransportOptions(); @@ -113,5 +143,19 @@ public class NettySslTransportFactoryTest { assertEquals(CUSTOM_TCP_KEEP_ALIVE, options.isTcpKeepAlive()); assertEquals(CUSTOM_SO_LINGER, options.getSoLinger()); assertEquals(CUSTOM_SO_TIMEOUT, options.getSoTimeout()); + + assertTrue(options instanceof TransportSslOptions); + TransportSslOptions sslOptions = (TransportSslOptions) options; + + List<String> enabledProtocols = Arrays.asList(sslOptions.getEnabledProtocols()); + List<String> customProtocols = Arrays.asList(CUSTOM_ENABLED_PROTOCOLS); + assertThat(enabledProtocols, containsInAnyOrder(customProtocols.toArray())); + + List<String> enabledCipherSuites = Arrays.asList(sslOptions.getEnabledCipherSuites()); + List<String> customChiperSuites = Arrays.asList(CUSTOM_ENABLED_CIPHER_SUITES); + assertThat(enabledCipherSuites, containsInAnyOrder(customChiperSuites.toArray())); + + assertEquals(CUSTOM_STORE_TYPE, sslOptions.getStoreType()); + assertEquals(CUSTOM_VERIFY_HOST, sslOptions.isVerifyHost()); } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/6b054d76/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportFactoryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportFactoryTest.java index ebe71ad..99bafc6 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportFactoryTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportFactoryTest.java @@ -16,21 +16,15 @@ */ package org.apache.qpid.jms.transports.netty; -import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder; 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.assertThat; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.util.Arrays; -import java.util.List; import org.apache.qpid.jms.transports.Transport; import org.apache.qpid.jms.transports.TransportOptions; -import org.apache.qpid.jms.transports.TransportSslOptions; import org.junit.Test; /** @@ -46,22 +40,17 @@ public class NettyTcpTransportFactoryTest { public static final int CUSTOM_SO_LINGER = Short.MIN_VALUE; public static final int CUSTOM_SO_TIMEOUT = 10; public static final int CUSTOM_CONNECT_TIMEOUT = 90000; - public static final String[] CUSTOM_ENABLED_PROTOCOLS = {"TLSv1.1", "TLSv1.2"}; - public static final String[] CUSTOM_ENABLED_CIPHER_SUITES = {"Suite-1", "Suite-2"}; - public static final String CUSTOM_STORE_TYPE = "jceks"; - public static final boolean CUSTOM_TRUST_ALL = true; - public static final boolean CUSTOM_VERIFY_HOST = true; @Test public void testCreateWithDefaultOptions() throws Exception { - URI BASE_URI = new URI("ssl://localhost:5672"); + URI BASE_URI = new URI("tcp://localhost:5672"); - NettySslTransportFactory factory = new NettySslTransportFactory(); + NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); Transport transport = factory.createTransport(BASE_URI); assertNotNull(transport); - assertTrue(transport instanceof NettySslTransport); + assertTrue(transport instanceof NettyTcpTransport); assertFalse(transport.isConnected()); TransportOptions options = transport.getTransportOptions(); @@ -75,31 +64,19 @@ public class NettyTcpTransportFactoryTest { assertEquals(TransportOptions.DEFAULT_TCP_KEEP_ALIVE, options.isTcpKeepAlive()); assertEquals(TransportOptions.DEFAULT_SO_LINGER, options.getSoLinger()); assertEquals(TransportOptions.DEFAULT_SO_TIMEOUT, options.getSoTimeout()); - - assertTrue(options instanceof TransportSslOptions); - TransportSslOptions sslOptions = (TransportSslOptions) options; - - List<String> enabledProtocols = Arrays.asList(sslOptions.getEnabledProtocols()); - List<String> defaultProtocols = Arrays.asList(TransportSslOptions.DEFAULT_ENABLED_PROTOCOLS); - assertThat(enabledProtocols, containsInAnyOrder(defaultProtocols.toArray())); - - assertNull(sslOptions.getEnabledCipherSuites()); - - assertEquals(TransportSslOptions.DEFAULT_STORE_TYPE, sslOptions.getStoreType()); - assertEquals(TransportSslOptions.DEFAULT_VERIFY_HOST, sslOptions.isVerifyHost()); } @Test(expected = IllegalArgumentException.class) public void testCreateWithUnknownOption() throws Exception { - URI BASE_URI = new URI("ssl://localhost:5672?transport.someOption=true"); - NettySslTransportFactory factory = new NettySslTransportFactory(); + URI BASE_URI = new URI("tcp://localhost:5672?transport.someOption=true"); + NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); factory.createTransport(BASE_URI); } @Test(expected = IllegalArgumentException.class) public void testCreateWithBadOption() throws Exception { - URI BASE_URI = new URI("ssl://localhost:5672?transport.trafficClass=4096"); - NettySslTransportFactory factory = new NettySslTransportFactory(); + URI BASE_URI = new URI("tcp://localhost:5672?transport.trafficClass=4096"); + NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); factory.createTransport(BASE_URI); } @@ -115,19 +92,14 @@ public class NettyTcpTransportFactoryTest { "transport.tcpNoDelay=" + CUSTOM_TCP_NO_DELAY + "&" + "transport.tcpKeepAlive=" + CUSTOM_TCP_KEEP_ALIVE + "&" + "transport.soLinger=" + CUSTOM_SO_LINGER + "&" + - "transport.soTimeout=" + CUSTOM_SO_TIMEOUT + "&" + - "transport.verifyHost=" + CUSTOM_VERIFY_HOST + "&" + - "transport.storeType=" + CUSTOM_STORE_TYPE + "&" + - "transport.trustAll=" + CUSTOM_TRUST_ALL + "&" + - "transport.enabledProtocols=" + CUSTOM_ENABLED_PROTOCOLS + "&" + - "transport.enabledCipherSuites=" + CUSTOM_ENABLED_CIPHER_SUITES); + "transport.soTimeout=" + CUSTOM_SO_TIMEOUT); - NettySslTransportFactory factory = new NettySslTransportFactory(); + NettyTcpTransportFactory factory = new NettyTcpTransportFactory(); Transport transport = factory.createTransport(configuredURI); assertNotNull(transport); - assertTrue(transport instanceof NettySslTransport); + assertTrue(transport instanceof NettyTcpTransport); assertFalse(transport.isConnected()); TransportOptions options = transport.getTransportOptions(); @@ -141,19 +113,5 @@ public class NettyTcpTransportFactoryTest { assertEquals(CUSTOM_TCP_KEEP_ALIVE, options.isTcpKeepAlive()); assertEquals(CUSTOM_SO_LINGER, options.getSoLinger()); assertEquals(CUSTOM_SO_TIMEOUT, options.getSoTimeout()); - - assertTrue(options instanceof TransportSslOptions); - TransportSslOptions sslOptions = (TransportSslOptions) options; - - List<String> enabledProtocols = Arrays.asList(sslOptions.getEnabledProtocols()); - List<String> customProtocols = Arrays.asList(CUSTOM_ENABLED_PROTOCOLS); - assertThat(enabledProtocols, containsInAnyOrder(customProtocols.toArray())); - - List<String> enabledCipherSuites = Arrays.asList(sslOptions.getEnabledCipherSuites()); - List<String> customChiperSuites = Arrays.asList(CUSTOM_ENABLED_CIPHER_SUITES); - assertThat(enabledCipherSuites, containsInAnyOrder(customChiperSuites.toArray())); - - assertEquals(CUSTOM_STORE_TYPE, sslOptions.getStoreType()); - assertEquals(CUSTOM_VERIFY_HOST, sslOptions.isVerifyHost()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
