Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move test support modules to integration-tests-support folder #6833

Merged
merged 3 commits into from
Nov 29, 2024
Merged

Move test support modules to integration-tests-support folder #6833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3388a8f
Use standard AsciiDoc formatting in integration-tests/messaging/READM…
ppalaga Nov 29, 2024
232705b
Move integration-tests/messaging to integration-tests-support/messaging
ppalaga Nov 29, 2024
0a99db0
Move integration-test-groups/http/common to integration-tests-support…
ppalaga Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration-test-groups/http/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down Expand Up @@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions integration-test-groups/http/netty-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -77,7 +77,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Expand Down
1 change: 0 additions & 1 deletion integration-test-groups/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

<modules>
<!-- extensions a..z; do not remove this comment, it is important when sorting via mvn process-resources -Pformat -->
<module>common</module>
<module>http</module>
<module>netty-http</module>
<module>vertx-http</module>
Expand Down
4 changes: 2 additions & 2 deletions integration-test-groups/http/vertx-http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
Expand Down Expand Up @@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
Expand Down
40 changes: 32 additions & 8 deletions integration-test-groups/http/common/pom.xml → integration-tests-support/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@

<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent-it</artifactId>
<artifactId>camel-quarkus-integration-tests-support</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../../../poms/build-parent-it/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-integration-tests-http-common</artifactId>
<name>Camel Quarkus :: Integration Tests :: HTTP :: Common</name>
<artifactId>camel-quarkus-integration-tests-support-http</artifactId>
<name>Camel Quarkus :: Integration Tests :: Support :: HTTP</name>

<dependencies>
<dependency>
Expand Down Expand Up @@ -76,16 +76,40 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<executions>
<execution>
<id>build</id>
<phase />
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
</configuration>
<executions>
<execution>
<id>default-test</id>
<phase />
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>virtualDependencies</id>
Expand Down
0 ...ent/http/common/AbstractHttpResource.java → ...ent/http/common/AbstractHttpResource.java
View file
Open in desktop
File renamed without changes.
0 ...omponent/http/common/CommonProducers.java → ...omponent/http/common/CommonProducers.java
View file
Open in desktop
File renamed without changes.
0 ...us/component/http/common/HttpService.java → ...us/component/http/common/HttpService.java
View file
Open in desktop
File renamed without changes.
0 ...src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 ...mponent/http/common/AbstractHttpTest.java → ...mponent/http/common/AbstractHttpTest.java
View file
Open in desktop
File renamed without changes.
0 ...mponent/http/common/HttpTestResource.java → ...mponent/http/common/HttpTestResource.java
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions integration-tests/messaging/README.adoc → ...ation-tests-support/messaging/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Common Messaging Extension Tests
= Common Messaging Extension Tests

This module contains a set of common integration tests that can be reused to test different messaging component extensions and JMS clients.

## Module structure
== Module structure
The module contains sub-modules which are described as follows.

### common
=== `common`
The place to add routes, JAX-RS resources & test cases common to *all* messaging component extensions.

For the routes to be configured in a generic way, the component scheme to use is dynamically determined and exposed as an injectable CDI bean like:
Expand All @@ -18,15 +18,15 @@ ComponentScheme scheme;

Which can then be used in a route to prefix the component scheme (either with String concatenation or `fromF` / `toF`).

### jms
=== `jms`

The place to add routes, JAX-RS resources & test cases common to messaging component extensions that extend the `camel-jms` component.

### sjms
=== `sjms`

The place to add routes, JAX-RS resources & test cases common to messaging component extensions that extend the `camel-sjms` component (currently only `camel-sjms2`).

## Usage
== Usage

To use the common tests in a integration test module, first add the required dependencies.

Expand Down
23 changes: 4 additions & 19 deletions integration-tests/messaging/common/pom.xml → ...on-tests-support/messaging/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<name>Camel Quarkus :: Integration Tests :: Messaging Common</name>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
<name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: Common</name>
<description>Integration tests for Camel Quarkus Messaging Common</description>

<dependencies>
Expand Down Expand Up @@ -76,22 +77,6 @@
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>virtualDependencies</id>
Expand Down
0 ...messaging/it/MessagingCommonResource.java → ...messaging/it/MessagingCommonResource.java
View file
Open in desktop
File renamed without changes.
0 ...t/messaging/it/MessagingCommonRoutes.java → ...t/messaging/it/MessagingCommonRoutes.java
View file
Open in desktop
File renamed without changes.
0 ...t/messaging/it/MessagingPojoConsumer.java → ...t/messaging/it/MessagingPojoConsumer.java
View file
Open in desktop
File renamed without changes.
0 ...uarkus/component/messaging/it/Person.java → ...uarkus/component/messaging/it/Person.java
View file
Open in desktop
File renamed without changes.
0 .../it/util/resolver/JmsMessageResolver.java → .../it/util/resolver/JmsMessageResolver.java
View file
Open in desktop
File renamed without changes.
0 .../resolver/JmsMessageResolverProducer.java → .../resolver/JmsMessageResolverProducer.java
View file
Open in desktop
File renamed without changes.
0 ...aging/it/util/scheme/ComponentScheme.java → ...aging/it/util/scheme/ComponentScheme.java
View file
Open in desktop
File renamed without changes.
0 ...eme/MessagingComponentSchemeProducer.java → ...eme/MessagingComponentSchemeProducer.java
View file
Open in desktop
File renamed without changes.
0 ...src/main/resources/application.properties → ...src/main/resources/application.properties
View file
Open in desktop
File renamed without changes.
0 ...t/messaging/it/AbstractMessagingTest.java → ...t/messaging/it/AbstractMessagingTest.java
View file
Open in desktop
File renamed without changes.
28 changes: 6 additions & 22 deletions integration-tests/messaging/jms/pom.xml → ...ation-tests-support/messaging/jms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-integration-test-messaging-jms</artifactId>
<name>Camel Quarkus :: Integration Tests :: Messaging JMS</name>
<artifactId>camel-quarkus-integration-tests-support-messaging-jms</artifactId>
<name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: JMS</name>
<description>Integration tests for Camel Quarkus Messaging JMS</description>

<dependencies>
Expand All @@ -44,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
</dependency>

<!-- test dependencies -->
Expand All @@ -60,29 +61,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>virtualDependencies</id>
Expand Down
0 ...uarkus/messaging/jms/DummyXAResource.java → ...uarkus/messaging/jms/DummyXAResource.java
View file
Open in desktop
File renamed without changes.
0 ...l/quarkus/messaging/jms/JmsProducers.java → ...l/quarkus/messaging/jms/JmsProducers.java
View file
Open in desktop
File renamed without changes.
0 ...el/quarkus/messaging/jms/JmsResource.java → ...el/quarkus/messaging/jms/JmsResource.java
View file
Open in desktop
File renamed without changes.
0 ...amel/quarkus/messaging/jms/JmsRoutes.java → ...amel/quarkus/messaging/jms/JmsRoutes.java
View file
Open in desktop
File renamed without changes.
0 .../jms/util/JmsMessageResolverProducer.java → .../jms/util/JmsMessageResolverProducer.java
View file
Open in desktop
File renamed without changes.
0 ...ssaging/jms/AbstractJmsMessagingTest.java → ...ssaging/jms/AbstractJmsMessagingTest.java
View file
Open in desktop
File renamed without changes.
31 changes: 27 additions & 4 deletions integration-tests/messaging/pom.xml → integration-tests-support/messaging/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-build-parent-it</artifactId>
<artifactId>camel-quarkus-integration-tests-support</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../../poms/build-parent-it/pom.xml</relativePath>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-integration-test-messaging</artifactId>
<name>Camel Quarkus :: Integration Tests :: Messaging</name>
<artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
<name>Camel Quarkus :: Integration Tests :: Support :: Messaging</name>
<description>Integration tests for Camel Quarkus Messaging extensions</description>
<packaging>pom</packaging>

Expand All @@ -39,6 +39,18 @@

<build>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
Expand All @@ -60,6 +72,17 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
28 changes: 6 additions & 22 deletions integration-tests/messaging/sjms/pom.xml → ...tion-tests-support/messaging/sjms/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging</artifactId>
<version>3.17.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>camel-quarkus-integration-test-messaging-sjms</artifactId>
<name>Camel Quarkus :: Integration Tests :: Messaging SJMS</name>
<artifactId>camel-quarkus-integration-tests-support-messaging-sjms</artifactId>
<name>Camel Quarkus :: Integration Tests :: Support :: Messaging :: SJMS</name>
<description>Integration tests for Camel Quarkus Messaging SJMS</description>

<dependencies>
Expand All @@ -44,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
</dependency>

<!-- test dependencies -->
Expand All @@ -60,29 +61,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-integration-test-messaging-common</artifactId>
<artifactId>camel-quarkus-integration-tests-support-messaging-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
<executions>
<execution>
<id>make-index</id>
<goals>
<goal>jandex</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>virtualDependencies</id>
Expand Down
0 ...quarkus/messaging/sjms/SjmsProducers.java → ...quarkus/messaging/sjms/SjmsProducers.java
View file
Open in desktop
File renamed without changes.
0 .../quarkus/messaging/sjms/SjmsResource.java → .../quarkus/messaging/sjms/SjmsResource.java
View file
Open in desktop
File renamed without changes.
0 ...el/quarkus/messaging/sjms/SjmsRoutes.java → ...el/quarkus/messaging/sjms/SjmsRoutes.java
View file
Open in desktop
File renamed without changes.
0 ...sjms/util/JmsMessageResolverProducer.java → ...sjms/util/JmsMessageResolverProducer.java
View file
Open in desktop
File renamed without changes.
0 ...aging/sjms/AbstractSjmsMessagingTest.java → ...aging/sjms/AbstractSjmsMessagingTest.java
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions integration-tests-support/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,10 @@
<module>custom-kamelet-resource</module>
<module>google</module>
<module>grpc</module>
<module>http</module>
<module>jdbc</module>
<module>kafka</module>
<module>messaging</module>
<module>mongodb</module>
<module>process-executor-support</module>
<module>splunk</module>
Expand Down
Loading