cxf-soap SSL tests fail with Quarkus CXF 3.13.0 fix #6294

apache · Jul 30, 2024 · 9305683 · 9305683
1 parent f1e885a
commit 9305683
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 23 deletions.
diff --git a/...st/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java b/...st/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.cxf.soap.ssl.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusIntegrationTest
 class CxfSoapGlobalTrustedSslIT extends CxfSoapGlobalTrustedSslTest {
 }
diff --git a/.../java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java b/.../java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalTrustedSslTest.java
@@ -20,12 +20,10 @@
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.equalTo;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusTest
 @TestProfile(CxfSoapGlobalTrustedSslTest.class)
 public class CxfSoapGlobalTrustedSslTest implements QuarkusTestProfile {

diff --git a/.../java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java b/.../java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.cxf.soap.ssl.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusIntegrationTest
 class CxfSoapGlobalUntrustedSslIT extends CxfSoapGlobalUntrustedSslTest {
 }
diff --git a/...ava/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java b/...ava/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapGlobalUntrustedSslTest.java
@@ -20,12 +20,10 @@
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusTest
 @TestProfile(CxfSoapGlobalUntrustedSslTest.class)
 public class CxfSoapGlobalUntrustedSslTest implements QuarkusTestProfile {

diff --git a/...ap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java b/...ap-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslIT.java
@@ -17,9 +17,7 @@
 package org.apache.camel.quarkus.component.cxf.soap.ssl.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusIntegrationTest
 class CxfSoapSslIT extends CxfSoapSslTest {
 }
diff --git a/...-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java b/...-ssl/src/test/java/org/apache/camel/quarkus/component/cxf/soap/ssl/it/CxfSoapSslTest.java
@@ -20,14 +20,12 @@
 import io.quarkus.test.junit.QuarkusTestProfile;
 import io.quarkus.test.junit.TestProfile;
 import io.restassured.RestAssured;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
 // Tests require restart of Quarkus to avoid persisting of global ssl context.
-@Disabled("https://github.com/apache/camel-quarkus/issues/6294")
 @QuarkusTest
 @TestProfile(CxfSoapSslTest.class)
 public class CxfSoapSslTest implements QuarkusTestProfile {

diff --git a/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java b/.../java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
@@ -32,7 +32,7 @@
 import io.restassured.RestAssured;
 import jakarta.xml.ws.BindingProvider;
 import jakarta.xml.ws.Service;
-import jakarta.xml.ws.WebServiceException;
+import jakarta.xml.ws.soap.SOAPFaultException;
 import org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloService;
 import org.apache.camel.quarkus.components.cxf.soap.wss.client.helloworld.SayHelloWrongWS;
 import org.apache.cxf.ws.security.SecurityConstants;
@@ -114,15 +114,8 @@ public void testWrongClientNotHanging() {
             try {
                 //always fails because there is no server implementation
                 createSayHelloWrongClient().sayHelloWrong("Sheldon");
-            } catch (WebServiceException e) {
-                Throwable cause = e.getCause();
-                if (cause != null) {
-                    Throwable parentCause = cause.getCause();
-                    if (parentCause != null) {
-                        return parentCause.getMessage() != null
-                                && parentCause.getMessage().toLowerCase().contains("connection refused");
-                    }
-                }
+            } catch (SOAPFaultException e) {
+                return e.getMessage() != null && e.getMessage().toLowerCase().contains("connection refused");
             }
             //can not happen (client does not work)
             return false;

diff --git a/pom.xml b/pom.xml
@@ -50,7 +50,7 @@
         <optaplanner.version>9.37.0.Final</optaplanner.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/optaplanner/optaplanner-quarkus/ -->
         <quarkiverse-amazonservices.version>2.16.0</quarkiverse-amazonservices.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/amazonservices/quarkus-amazon-services-parent/ -->
         <quarkiverse-artemis.version>3.3.0</quarkiverse-artemis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/artemis/quarkus-artemis-parent/ -->
-        <quarkiverse-cxf.version>3.13.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
+        <quarkiverse-cxf.version>3.13.1</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ -->
         <quarkiverse-freemarker.version>1.0.0</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ -->
         <quarkiverse-groovy.version>3.12.1</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ -->
         <quarkiverse-jackson-jq.version>2.0.2</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ -->