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 2018/04/18 17:43:45 UTC
[cxf] 01/04: Don't run this test with Java 10 either
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 37a902307265dbe83dc6013a75bc6d9ed159ff85
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Wed Apr 18 16:41:42 2018 +0100
Don't run this test with Java 10 either
---
.../ws/security/wss4j/PolicyBasedWss4JInOutTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
index 6279178..6e8a015 100644
--- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
+++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
@@ -414,11 +414,6 @@ public class PolicyBasedWss4JInOutTest extends AbstractPolicySecurityTest {
@Test
public void testEncryptedSignedPartsWithCompleteCoverage() throws Exception {
- if (System.getProperty("java.version").startsWith("9")) {
- //CXF-7270
- return;
- }
-
this.runInInterceptorAndValidate(
"encrypted_body_content_signed.xml",
"encrypted_parts_policy_header_and_body_signed.xml",
@@ -435,7 +430,9 @@ public class PolicyBasedWss4JInOutTest extends AbstractPolicySecurityTest {
null,
Arrays.asList(CoverageType.ENCRYPTED, CoverageType.SIGNED));
- this.runAndValidate(
+ if (!isJava9Compatible()) {
+ // CXF-7270
+ this.runAndValidate(
"wsse-request-clean.xml",
"encrypted_parts_policy_header_and_body_signed.xml",
null,
@@ -445,6 +442,7 @@ public class PolicyBasedWss4JInOutTest extends AbstractPolicySecurityTest {
null,
Arrays.asList(CoverageType.ENCRYPTED,
CoverageType.SIGNED));
+ }
}
@Test
@@ -558,4 +556,12 @@ public class PolicyBasedWss4JInOutTest extends AbstractPolicySecurityTest {
// TODO: Tests for derived keys.
}
+ private boolean isJava9Compatible() {
+ String version = System.getProperty("java.version");
+ if (version.indexOf(".") > 0) {
+ version = version.substring(0, version.indexOf("."));
+ }
+
+ return Integer.valueOf(version) >= 9;
+ }
}
--
To stop receiving notification emails like this one, please contact
coheigea@apache.org.