Move async VertxHttpClientConduit tests to quarkus-cxf-integration-te…

…st-client-server
quarkiverse · Dec 22, 2024 · 6b557e8 · 6b557e8
1 parent fb8125a
commit 6b557e8
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 135 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        testModule: ['async-vertx-client', 'client', 'client-server', 'fastinfoset', 'hc5', 'metrics', 'mtls', 'mtls -Djks', 'mtom-awt', 'opentelemetry', 'saaj', 'santuario-xmlsec', 'server', 'ws-rm-client', 'ws-security', 'ws-security -Djks', 'ws-security-policy', 'ws-security-policy -Djks', 'ws-trust', 'wsdl2java', 'wsdl2java-no-config']
+        testModule: ['client', 'client-server', 'fastinfoset', 'hc5', 'metrics', 'mtls', 'mtls -Djks', 'mtom-awt', 'opentelemetry', 'saaj', 'santuario-xmlsec', 'server', 'ws-rm-client', 'ws-security', 'ws-security -Djks', 'ws-security-policy', 'ws-security-policy -Djks', 'ws-trust', 'wsdl2java', 'wsdl2java-no-config']
     name: ${{matrix.testModule}} native tests
     needs: build-and-run-jvm-tests
     runs-on: ubuntu-latest

diff --git a/docs/modules/ROOT/examples/client-server/application.properties b/docs/modules/ROOT/examples/client-server/application.properties
@@ -171,5 +171,25 @@ quarkus.cxf.endpoint."/soap12".implementor = io.quarkiverse.cxf.it.soap12.Soap12
 quarkus.cxf.endpoint."/soap12".soap-binding = http://www.w3.org/2003/05/soap/bindings/HTTP/
 quarkus.cxf.endpoint."/soap12".logging.enabled = true
 
+# Async tests
+quarkus.cxf.client.helloWithWsdl.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdl?wsdl
+quarkus.cxf.client.helloWithWsdl.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdl
+quarkus.cxf.client.helloWithWsdl.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithWsdlWithBlocking.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithBlocking?wsdl
+quarkus.cxf.client.helloWithWsdlWithBlocking.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithBlocking
+quarkus.cxf.client.helloWithWsdlWithBlocking.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithWsdlWithEagerInit.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithEagerInit?wsdl
+quarkus.cxf.client.helloWithWsdlWithEagerInit.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithEagerInit
+quarkus.cxf.client.helloWithWsdlWithEagerInit.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithoutWsdl.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithoutWsdl
+quarkus.cxf.client.helloWithoutWsdl.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithoutWsdlWithBlocking.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithoutWsdlWithBlocking
+quarkus.cxf.client.helloWithoutWsdlWithBlocking.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+
 quarkus.default-locale = en_US
 quarkus.log.category."io.quarkiverse.cxf.vertx.http.client.VertxHttpClientHTTPConduit".level=DEBUG
diff --git a/integration-tests/async-vertx-client/pom.xml b/integration-tests/async-vertx-client/pom.xml
diff --git a/integration-tests/async-vertx-client/src/main/resources/application.properties b/integration-tests/async-vertx-client/src/main/resources/application.properties
diff --git a/...uarkiverse/cxf/deployment/test/Hello.java → ...uarkiverse/cxf/deployment/test/Hello.java b/...uarkiverse/cxf/deployment/test/Hello.java → ...uarkiverse/cxf/deployment/test/Hello.java
diff --git a/...se/cxf/deployment/test/HelloResponse.java → ...se/cxf/deployment/test/HelloResponse.java b/...se/cxf/deployment/test/HelloResponse.java → ...se/cxf/deployment/test/HelloResponse.java
diff --git a/...rse/cxf/deployment/test/HelloService.java → ...rse/cxf/deployment/test/HelloService.java b/...rse/cxf/deployment/test/HelloService.java → ...rse/cxf/deployment/test/HelloService.java
diff --git a/...deployment/test/HelloService_Service.java → ...deployment/test/HelloService_Service.java b/...deployment/test/HelloService_Service.java → ...deployment/test/HelloService_Service.java
diff --git a/...se/cxf/deployment/test/ObjectFactory.java → ...se/cxf/deployment/test/ObjectFactory.java b/...se/cxf/deployment/test/ObjectFactory.java → ...se/cxf/deployment/test/ObjectFactory.java
diff --git a/...rse/cxf/deployment/test/package-info.java → ...rse/cxf/deployment/test/package-info.java b/...rse/cxf/deployment/test/package-info.java → ...rse/cxf/deployment/test/package-info.java
diff --git a/...cxf/it/vertx/async/RestAsyncWithWsdl.java → ...cxf/it/vertx/async/RestAsyncWithWsdl.java b/...cxf/it/vertx/async/RestAsyncWithWsdl.java → ...cxf/it/vertx/async/RestAsyncWithWsdl.java
diff --git a/.../async/RestAsyncWithWsdlWithBlocking.java → .../async/RestAsyncWithWsdlWithBlocking.java b/.../async/RestAsyncWithWsdlWithBlocking.java → .../async/RestAsyncWithWsdlWithBlocking.java
diff --git a/...async/RestAsyncWithWsdlWithEagerInit.java → ...async/RestAsyncWithWsdlWithEagerInit.java b/...async/RestAsyncWithWsdlWithEagerInit.java → ...async/RestAsyncWithWsdlWithEagerInit.java
diff --git a/.../it/vertx/async/RestAsyncWithoutWsdl.java → .../it/vertx/async/RestAsyncWithoutWsdl.java b/.../it/vertx/async/RestAsyncWithoutWsdl.java → .../it/vertx/async/RestAsyncWithoutWsdl.java
diff --git a/...ync/RestAsyncWithoutWsdlWithBlocking.java → ...ync/RestAsyncWithoutWsdlWithBlocking.java b/...ync/RestAsyncWithoutWsdlWithBlocking.java → ...ync/RestAsyncWithoutWsdlWithBlocking.java
diff --git a/...t/vertx/async/VerboseExceptionMapper.java → ...t/vertx/async/VerboseExceptionMapper.java b/...t/vertx/async/VerboseExceptionMapper.java → ...t/vertx/async/VerboseExceptionMapper.java
diff --git a/...it/vertx/async/service/HelloWithWsdl.java → ...it/vertx/async/service/HelloWithWsdl.java b/...it/vertx/async/service/HelloWithWsdl.java → ...it/vertx/async/service/HelloWithWsdl.java
diff --git a/...nc/service/HelloWithWsdlWithBlocking.java → ...nc/service/HelloWithWsdlWithBlocking.java b/...nc/service/HelloWithWsdlWithBlocking.java → ...nc/service/HelloWithWsdlWithBlocking.java
diff --git a/...c/service/HelloWithWsdlWithEagerInit.java → ...c/service/HelloWithWsdlWithEagerInit.java b/...c/service/HelloWithWsdlWithEagerInit.java → ...c/service/HelloWithWsdlWithEagerInit.java
diff --git a/...vertx/async/service/HelloWithoutWsdl.java → ...vertx/async/service/HelloWithoutWsdl.java b/...vertx/async/service/HelloWithoutWsdl.java → ...vertx/async/service/HelloWithoutWsdl.java
diff --git a/...service/HelloWithoutWsdlWithBlocking.java → ...service/HelloWithoutWsdlWithBlocking.java b/...service/HelloWithoutWsdlWithBlocking.java → ...service/HelloWithoutWsdlWithBlocking.java
diff --git a/integration-tests/client-server/src/main/resources/application.properties b/integration-tests/client-server/src/main/resources/application.properties
@@ -171,5 +171,25 @@ quarkus.cxf.endpoint."/soap12".implementor = io.quarkiverse.cxf.it.soap12.Soap12
 quarkus.cxf.endpoint."/soap12".soap-binding = http://www.w3.org/2003/05/soap/bindings/HTTP/
 quarkus.cxf.endpoint."/soap12".logging.enabled = true
 
+# Async tests
+quarkus.cxf.client.helloWithWsdl.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdl?wsdl
+quarkus.cxf.client.helloWithWsdl.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdl
+quarkus.cxf.client.helloWithWsdl.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithWsdlWithBlocking.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithBlocking?wsdl
+quarkus.cxf.client.helloWithWsdlWithBlocking.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithBlocking
+quarkus.cxf.client.helloWithWsdlWithBlocking.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithWsdlWithEagerInit.wsdl = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithEagerInit?wsdl
+quarkus.cxf.client.helloWithWsdlWithEagerInit.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithWsdlWithEagerInit
+quarkus.cxf.client.helloWithWsdlWithEagerInit.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithoutWsdl.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithoutWsdl
+quarkus.cxf.client.helloWithoutWsdl.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+quarkus.cxf.client.helloWithoutWsdlWithBlocking.client-endpoint-url = http://localhost:${quarkus.http.test-port}/soap/helloWithoutWsdlWithBlocking
+quarkus.cxf.client.helloWithoutWsdlWithBlocking.service-interface = io.quarkiverse.cxf.deployment.test.HelloService
+
+
 quarkus.default-locale = en_US
 quarkus.log.category."io.quarkiverse.cxf.vertx.http.client.VertxHttpClientHTTPConduit".level=DEBUG
diff --git a/...xf/it/vertx/async/AsyncVertxClientIT.java → ...xf/it/vertx/async/AsyncVertxClientIT.java b/...xf/it/vertx/async/AsyncVertxClientIT.java → ...xf/it/vertx/async/AsyncVertxClientIT.java
diff --git a/.../it/vertx/async/AsyncVertxClientTest.java → .../it/vertx/async/AsyncVertxClientTest.java b/.../it/vertx/async/AsyncVertxClientTest.java → .../it/vertx/async/AsyncVertxClientTest.java
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -14,7 +14,6 @@
     <name>Quarkus CXF - Integration Tests</name>
 
     <modules>
-        <module>async-vertx-client</module>
         <module>client</module>
         <module>client-server</module>
         <module>fastinfoset</module>