You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2022/10/25 07:36:32 UTC
[camel-quarkus] 02/04: Rename ws-security test to-ws-security-client test, better separate package names, test names and property names among the individual cxf test modules so that they do not clash when run together
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f63845777dbd9c4f811fccd174f4d1ce3a2dded4
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Oct 21 21:20:01 2022 +0200
Rename ws-security test to-ws-security-client test, better separate
package names, test names and property names among the individual cxf
test modules so that they do not clash when run together
---
.../it/{CxfSoapResource.java => CxfSoapClientResource.java} | 4 ++--
.../it/{CxfSoapRoutes.java => CxfSoapClientRoutes.java} | 2 +-
.../component/cxf/soap/client/it/CxfSoapClientTest.java | 4 ++--
.../README.adoc | 0
.../pom.xml | 6 +++---
.../cxf/soap/wss/client/it/CxfSoapWssClientResource.java} | 6 +++---
.../cxf/soap/wss/client/it/CxfSoapWssClientRoutes.java} | 8 ++++----
.../component/cxf/soap/wss/client}/it/PasswordCallback.java | 6 +++---
.../src/main/resources/application.properties | 0
.../src/main/resources/wsdl/WssCalculatorService.wsdl | 0
.../cxf/soap/wss/client/it/CxfSoapWssClientIT.java} | 4 ++--
.../cxf/soap/wss/client/it/CxfSoapWssClientTest.java} | 10 +++++-----
.../cxf/soap/wss/client/it/CxfWssClientTestResource.java} | 12 ++++++------
integration-test-groups/cxf-soap/pom.xml | 2 +-
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapResource.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
similarity index 97%
rename from integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapResource.java
rename to integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
index 889e9ef3c9..f56f3ee3e1 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapResource.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientResource.java
@@ -32,9 +32,9 @@ import org.apache.camel.ProducerTemplate;
import org.jboss.eap.quickstarts.wscalculator.calculator.Operands;
import org.jboss.eap.quickstarts.wscalculator.calculator.Result;
-@Path("/cxf-soap")
+@Path("/cxf-soap/client")
@ApplicationScoped
-public class CxfSoapResource {
+public class CxfSoapClientResource {
@Inject
ProducerTemplate producerTemplate;
diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
similarity index 97%
rename from integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapRoutes.java
rename to integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
index 80c82293dd..b79f75575e 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapRoutes.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientRoutes.java
@@ -29,7 +29,7 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.eap.quickstarts.wscalculator.calculator.CalculatorService;
@ApplicationScoped
-public class CxfSoapRoutes extends RouteBuilder {
+public class CxfSoapClientRoutes extends RouteBuilder {
@Inject
@Named("loggingFeatureClient")
diff --git a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
index a1dc64d84a..5f96277b2f 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/client/it/CxfSoapClientTest.java
@@ -41,7 +41,7 @@ class CxfSoapClientTest {
RestAssured.given()
.queryParam("a", "9")
.queryParam("b", "3")
- .post("/cxf-soap/simple")
+ .post("/cxf-soap/client/simple")
.then()
.statusCode(201)
.body(equalTo("3"));
@@ -52,7 +52,7 @@ class CxfSoapClientTest {
RestAssured.given()
.queryParam("a", "3")
.queryParam("b", "4")
- .post("/cxf-soap/operandsAdd")
+ .post("/cxf-soap/client/operandsAdd")
.then()
.statusCode(201)
.body(equalTo("7"));
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/README.adoc b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/README.adoc
similarity index 100%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/README.adoc
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/README.adoc
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/pom.xml b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
similarity index 97%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/pom.xml
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
index f34bc6f93d..f2b3ed9239 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/pom.xml
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/pom.xml
@@ -26,9 +26,9 @@
<relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
</parent>
- <artifactId>camel-quarkus-integration-test-cxf-soap-ws-security</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Cxf Soap Ws Security</name>
- <description>Integration tests for Camel Quarkus CXF extension ws security part</description>
+ <artifactId>camel-quarkus-integration-test-cxf-soap-ws-security-client</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: CXF SOAP WS-Security client</name>
+ <description>Integration tests for Camel Quarkus CXF extension acting as SOAP client accessing an external server having WS-Security enabled</description>
<build>
<plugins>
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapResource.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientResource.java
similarity index 92%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapResource.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientResource.java
index 486bbf2597..4ed45625c0 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapResource.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientResource.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import java.net.URI;
@@ -30,9 +30,9 @@ import javax.ws.rs.core.Response;
import org.apache.camel.ProducerTemplate;
-@Path("/cxf-soap")
+@Path("/cxf-soap/wss/client")
@ApplicationScoped
-public class CxfSoapResource {
+public class CxfSoapWssClientResource {
@Inject
ProducerTemplate producerTemplate;
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapRoutes.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientRoutes.java
similarity index 92%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapRoutes.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientRoutes.java
index 31212837f9..e0041708f2 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapRoutes.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientRoutes.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import java.util.HashMap;
import java.util.Map;
@@ -33,9 +33,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.jboss.eap.quickstarts.wscalculator.wsscalculator.WssCalculatorService;
@ApplicationScoped
-public class CxfSoapRoutes extends RouteBuilder {
+public class CxfSoapWssClientRoutes extends RouteBuilder {
- @ConfigProperty(name = "password-callback.username")
+ @ConfigProperty(name = "camel-quarkus.it.wss.client.username")
String username;
@Inject
@@ -50,7 +50,7 @@ public class CxfSoapRoutes extends RouteBuilder {
@Named("wssInterceptor")
WSS4JOutInterceptor wssInterceptor;
- @ConfigProperty(name = "camel-quarkus.it.calculator.baseUri")
+ @ConfigProperty(name = "camel-quarkus.it.wss.client.baseUri")
String serviceBaseUri;
@Override
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/PasswordCallback.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/PasswordCallback.java
similarity index 92%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/PasswordCallback.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/PasswordCallback.java
index b80c027b0c..abb1c1e190 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/java/org/apache/camel/quarkus/component/cxf/soap/security/it/PasswordCallback.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/PasswordCallback.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import java.io.IOException;
@@ -32,9 +32,9 @@ import org.eclipse.microprofile.config.inject.ConfigProperty;
@ApplicationScoped
@Named("passwordCallback")
public class PasswordCallback implements CallbackHandler {
- @ConfigProperty(name = "password-callback.username")
+ @ConfigProperty(name = "camel-quarkus.it.wss.client.username")
String username;
- @ConfigProperty(name = "password-callback.password")
+ @ConfigProperty(name = "camel-quarkus.it.wss.client.password")
String password;
/**
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/resources/application.properties b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
similarity index 100%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/resources/application.properties
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/application.properties
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/resources/wsdl/WssCalculatorService.wsdl b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/wsdl/WssCalculatorService.wsdl
similarity index 100%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/main/resources/wsdl/WssCalculatorService.wsdl
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/main/resources/wsdl/WssCalculatorService.wsdl
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientIT.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientIT.java
similarity index 87%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientIT.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientIT.java
index 0c2951dcd2..ca0b2fdf2d 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientIT.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientIT.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
-class CxfSoapClientIT extends CxfSoapClientTest {
+class CxfSoapWssClientIT extends CxfSoapWssClientTest {
}
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientTest.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
similarity index 92%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientTest.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
index 1edbc4abe2..45f1b47938 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfSoapClientTest.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfSoapWssClientTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -32,15 +32,15 @@ import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
@QuarkusTest
-@QuarkusTestResource(CxfClientTestResource.class)
-class CxfSoapClientTest {
+@QuarkusTestResource(CxfWssClientTestResource.class)
+class CxfSoapWssClientTest {
@Test
public void wsSecurityClient() {
RestAssured.given()
.queryParam("a", "12")
.queryParam("b", "8")
- .post("/cxf-soap/modulo")
+ .post("/cxf-soap/wss/client/modulo")
.then()
.statusCode(201)
.body(equalTo("4"));
@@ -54,7 +54,7 @@ class CxfSoapClientTest {
@Test
void wsdlUpToDate() throws IOException {
final String wsdlUrl = ConfigProvider.getConfig()
- .getValue("camel-quarkus.it.calculator.baseUri", String.class);
+ .getValue("camel-quarkus.it.wss.client.baseUri", String.class);
final String staticCopyPath = "target/classes/wsdl/WssCalculatorService.wsdl";
/* The changing Docker IP address in the WSDL should not matter */
diff --git a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfClientTestResource.java b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfWssClientTestResource.java
similarity index 86%
rename from integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfClientTestResource.java
rename to integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfWssClientTestResource.java
index 8c5e6158b7..94412b124d 100644
--- a/integration-test-groups/cxf-soap/cxf-soap-ws-security/src/test/java/org/apache/camel/quarkus/component/cxf/soap/security/it/CxfClientTestResource.java
+++ b/integration-test-groups/cxf-soap/cxf-soap-ws-security-client/src/test/java/org/apache/camel/quarkus/component/cxf/soap/wss/client/it/CxfWssClientTestResource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.camel.quarkus.component.cxf.soap.security.it;
+package org.apache.camel.quarkus.component.cxf.soap.wss.client.it;
import java.util.Map;
@@ -26,8 +26,8 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.containers.wait.strategy.Wait;
-public class CxfClientTestResource implements QuarkusTestResourceLifecycleManager {
- private static final Logger log = LoggerFactory.getLogger(CxfClientTestResource.class);
+public class CxfWssClientTestResource implements QuarkusTestResourceLifecycleManager {
+ private static final Logger log = LoggerFactory.getLogger(CxfWssClientTestResource.class);
private static final int WILDFLY_PORT = 8080;
private GenericContainer<?> calculatorContainer;
@@ -50,11 +50,11 @@ public class CxfClientTestResource implements QuarkusTestResourceLifecycleManage
calculatorContainer.start();
return Map.of(
- "camel-quarkus.it.calculator.baseUri",
+ "camel-quarkus.it.wss.client.baseUri",
"http://" + calculatorContainer.getHost() + ":" +
calculatorContainer.getMappedPort(WILDFLY_PORT),
- "password-callback.username", user,
- "password-callback.password", password);
+ "camel-quarkus.it.wss.client.username", user,
+ "camel-quarkus.it.wss.client.password", password);
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git a/integration-test-groups/cxf-soap/pom.xml b/integration-test-groups/cxf-soap/pom.xml
index 6c35c2f822..dcdd0f90c9 100644
--- a/integration-test-groups/cxf-soap/pom.xml
+++ b/integration-test-groups/cxf-soap/pom.xml
@@ -39,7 +39,7 @@
<!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>cxf-soap-client</module>
<module>cxf-soap-server</module>
- <module>cxf-soap-ws-security</module>
+ <module>cxf-soap-ws-security-client</module>
</modules>
</project>