Fixing failing JDK8 test
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/15b16712 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/15b16712 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/15b16712 Branch: refs/heads/3.0.x-fixes Commit: 15b1671292b6e2858e7513de01d36e47aa5db102 Parents: 7be1f88 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Oct 20 13:02:35 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Oct 20 14:00:45 2015 +0100 ---------------------------------------------------------------------- .../cxf/systest/https/ciphersuites/CipherSuitesTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/15b16712/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java ---------------------------------------------------------------------- diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java index d62ec5e..13257f9 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/ciphersuites/CipherSuitesTest.java @@ -231,6 +231,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase { // Both client + server include RC4 @org.junit.Test public void testRC4Included() throws Exception { + String version = System.getProperty("java.version"); + if (1.8D == Double.parseDouble(version.substring(0, 3))) { + // RC4 not supported in JDK8 + return; + } SpringBusFactory bf = new SpringBusFactory(); URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml"); @@ -255,6 +260,11 @@ public class CipherSuitesTest extends AbstractBusClientServerTestBase { // Both client + server include RC4 @org.junit.Test public void testRC4IncludedAsync() throws Exception { + String version = System.getProperty("java.version"); + if (1.8D == Double.parseDouble(version.substring(0, 3))) { + // RC4 not supported in JDK8 + return; + } SpringBusFactory bf = new SpringBusFactory(); URL busFile = CipherSuitesTest.class.getResource("ciphersuites-rc4-client.xml");
