You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/10/20 14:02:59 UTC
[3/3] cxf git commit: Fixing failing JDK8 test
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/3b27225e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3b27225e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3b27225e
Branch: refs/heads/master
Commit: 3b27225eb0edbf5d5df7fe86bb478f365cba1f60
Parents: 498a3c2
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Oct 20 13:02:35 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Oct 20 13:02:35 2015 +0100
----------------------------------------------------------------------
.../cxf/systest/https/ciphersuites/CipherSuitesTest.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3b27225e/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 96eb1bd..dd3ced4 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
@@ -236,6 +236,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");
@@ -260,6 +265,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");