Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/635356ab Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/635356ab Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/635356ab Branch: refs/heads/camel-gora Commit: 635356abbfc883d250288e526378ffbcddc5bc0e Parents: b048537 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Dec 2 09:16:04 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Dec 2 09:16:04 2013 +0100 ---------------------------------------------------------------------- .../util/jsse/SSLContextParametersTest.java | 51 ++++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/635356ab/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java index 11c82b2..bc163c2 100644 --- a/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/jsse/SSLContextParametersTest.java @@ -553,13 +553,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest { engine = context.createSSLEngine(); socket = (SSLSocket) context.getSocketFactory().createSocket(); serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket(); - - assertTrue(engine.getEnabledCipherSuites().length >= 1); - assertStartsWith(engine.getEnabledCipherSuites(), "TLS"); - assertTrue(socket.getEnabledCipherSuites().length >= 1); - assertStartsWith(socket.getEnabledCipherSuites(), "TLS"); - assertTrue(serverSocket.getEnabledCipherSuites().length >= 1); - assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS"); + + // not all platforms/JDKs have these cipher suites + if (!isPlatform("aix")) { + assertTrue(engine.getEnabledCipherSuites().length >= 1); + assertStartsWith(engine.getEnabledCipherSuites(), "TLS"); + assertTrue(socket.getEnabledCipherSuites().length >= 1); + assertStartsWith(socket.getEnabledCipherSuites(), "TLS"); + assertTrue(serverSocket.getEnabledCipherSuites().length >= 1); + assertStartsWith(serverSocket.getEnabledCipherSuites(), "TLS"); + } } public void testSecureSocketProtocols() throws Exception { @@ -619,13 +622,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest { engine = context.createSSLEngine(); socket = (SSLSocket) context.getSocketFactory().createSocket(); serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket(); - - assertEquals(1, engine.getEnabledProtocols().length); - assertEquals("TLSv1", engine.getEnabledProtocols()[0]); - assertEquals(1, socket.getEnabledProtocols().length); - assertEquals("TLSv1", socket.getEnabledProtocols()[0]); - assertEquals(1, socket.getEnabledProtocols().length); - assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]); + + // not all platforms/JDKs have these cipher suites + if (!isPlatform("aix")) { + assertEquals(1, engine.getEnabledProtocols().length); + assertEquals("TLSv1", engine.getEnabledProtocols()[0]); + assertEquals(1, socket.getEnabledProtocols().length); + assertEquals("TLSv1", socket.getEnabledProtocols()[0]); + assertEquals(1, socket.getEnabledProtocols().length); + assertEquals("TLSv1", serverSocket.getEnabledProtocols()[0]); + } } public void testSecureSocketProtocolsFilter() throws Exception { @@ -692,13 +698,16 @@ public class SSLContextParametersTest extends AbstractJsseParametersTest { engine = context.createSSLEngine(); socket = (SSLSocket) context.getSocketFactory().createSocket(); serverSocket = (SSLServerSocket) context.getServerSocketFactory().createServerSocket(); - - assertTrue(engine.getEnabledProtocols().length >= 1); - assertStartsWith(engine.getEnabledProtocols(), "TLS"); - assertTrue(socket.getEnabledProtocols().length >= 1); - assertStartsWith(socket.getEnabledProtocols(), "TLS"); - assertTrue(socket.getEnabledProtocols().length >= 1); - assertStartsWith(serverSocket.getEnabledProtocols(), "TLS"); + + // not all platforms/JDKs have these cipher suites + if (!isPlatform("aix")) { + assertTrue(engine.getEnabledProtocols().length >= 1); + assertStartsWith(engine.getEnabledProtocols(), "TLS"); + assertTrue(socket.getEnabledProtocols().length >= 1); + assertStartsWith(socket.getEnabledProtocols(), "TLS"); + assertTrue(socket.getEnabledProtocols().length >= 1); + assertStartsWith(serverSocket.getEnabledProtocols(), "TLS"); + } } public void testSessionTimeout() throws Exception {
