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

CAMEL-21452: decouple the infrastructure from the testing API #16322

Merged
merged 26 commits into from
Jan 9, 2025
Merged

CAMEL-21452: decouple the infrastructure from the testing API #16322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b5229e3
CAMEL-21452: decouple the infrastructure from the testing API
Croway Nov 19, 2024
7892f4d
Add non-test-jar dependency for component test-infra
cunningt Nov 20, 2024
94b730c
Revert "Add non-test-jar dependency for component test-infra"
cunningt Nov 23, 2024
2670cde
Add non-test-jar dependency for component test-infra
cunningt Nov 22, 2024
6dac792
CAMEL-21452 Changes to xmpp/zookeeper
cunningt Nov 25, 2024
b6dd167
CAMEL-21452 Decouple the infrastructure from the testing API
cunningt Nov 26, 2024
0272521
CAMEL-21452 Decouple the infrastructure from the testing API
cunningt Nov 26, 2024
622a2a3
aws
Croway Nov 28, 2024
717943e
azure
Croway Nov 28, 2024
2cf896d
cassandra
Croway Nov 29, 2024
bbd5da1
chatscript
Croway Nov 29, 2024
cc9bf7b
consul
Croway Nov 29, 2024
98638f8
couchbase
Croway Nov 29, 2024
c292ca7
couchdb
Croway Dec 2, 2024
e2dcada
elasticsearch
Croway Dec 2, 2024
77f112d
etcd3
Croway Dec 2, 2024
324047c
fhir
Croway Dec 2, 2024
ddb8ab0
ftp
Croway Dec 2, 2024
eeec033
jms/artemis
Croway Dec 3, 2024
8aa8f4b
Create a test-jar that contain main and test classes
Croway Dec 4, 2024
7d90f0d
Align all components
Croway Dec 5, 2024
8b3cbca
let camel compile
Croway Dec 5, 2024
c35f3c2
Fix langchain4j compilation
Croway Dec 5, 2024
de040a5
Revert Jetty test-infra
Croway Dec 9, 2024
e9fd69a
Rebase
Croway Jan 7, 2025
2ff57f5
Use main resources for container properties
Croway Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions components/camel-activemq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,23 @@
<version>${activemq-version}</version>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-messaging-common</artifactId>
<version>${project.version}</version>
Expand Down
5 changes: 2 additions & 3 deletions ...s/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQITSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.api.ConfigurableContext;
import org.apache.camel.test.infra.core.api.ConfigurableRoute;
import org.apache.camel.test.infra.messaging.services.MessagingLocalContainerService;
import org.apache.camel.test.infra.messaging.services.MessagingService;
import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
import org.junit.jupiter.api.Order;
Expand All @@ -40,10 +39,10 @@ public abstract class ActiveMQITSupport implements ConfigurableContext, Configur
@RegisterExtension
protected static CamelContextExtension contextExtension = new DefaultCamelContextExtension();

public static MessagingLocalContainerService<ArtemisContainer> createLocalService() {
public static MessagingServiceFactory.MessagingLocalContainerService<ArtemisContainer> createLocalService() {
ArtemisContainer container = new ArtemisContainer();

return new MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
return new MessagingServiceFactory.MessagingLocalContainerService(container, c -> container.defaultEndpoint());
}

/* We don't want topic advisories here: they may cause publication issues (i.e.:
Expand Down
7 changes: 3 additions & 4 deletions components/camel-activemq6/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,29 @@
<version>${activemq6-version}</version>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-messaging-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

</dependencies>

</project>
5 changes: 2 additions & 3 deletions ...camel-activemq6/src/test/java/org/apache/camel/component/activemq6/ActiveMQITSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
import org.apache.camel.test.infra.core.api.ConfigurableContext;
import org.apache.camel.test.infra.core.api.ConfigurableRoute;
import org.apache.camel.test.infra.messaging.services.MessagingLocalContainerService;
import org.apache.camel.test.infra.messaging.services.MessagingService;
import org.apache.camel.test.infra.messaging.services.MessagingServiceFactory;
import org.junit.jupiter.api.Order;
Expand All @@ -40,10 +39,10 @@ public abstract class ActiveMQITSupport implements ConfigurableContext, Configur
@RegisterExtension
protected static CamelContextExtension contextExtension = new DefaultCamelContextExtension();

public static MessagingLocalContainerService<ArtemisContainer> createLocalService() {
public static MessagingServiceFactory.MessagingLocalContainerService<ArtemisContainer> createLocalService() {
ArtemisContainer container = new ArtemisContainer();

return new MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
return new MessagingServiceFactory.MessagingLocalContainerService<>(container, c -> container.defaultEndpoint());
}

/* We don't want topic advisories here: they may cause publication issues (i.e.:
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ai/camel-chatscript/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@


<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-chatscript</artifactId>
<version>${project.version}</version>
Expand Down
4 changes: 2 additions & 2 deletions components/camel-ai/camel-langchain4j-embeddings/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
Expand Down
6 changes: 6 additions & 0 deletions components/camel-ai/camel-langchain4j-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-ollama</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-ollama</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ai/camel-milvus/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-milvus</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ai/camel-qdrant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-qdrant</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-ai/camel-torchserve/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-torchserve</artifactId>
<version>${project.version}</version>
Expand Down
4 changes: 2 additions & 2 deletions components/camel-amqp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@

<!-- testing -->
<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-artemis</artifactId>
<version>${project.version}</version>
Expand Down
12 changes: 12 additions & 0 deletions components/camel-atmosphere-websocket/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-common</artifactId>
<version>${project.version}</version>
Expand All @@ -82,6 +88,12 @@
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-jetty</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-jetty</artifactId>
<version>${project.version}</version>
Expand Down
12 changes: 12 additions & 0 deletions components/camel-atom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@

<!-- test infra -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-common</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-common</artifactId>
<version>${project.version}</version>
Expand All @@ -67,6 +73,12 @@
</dependency>

<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-jetty</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-jetty</artifactId>
<version>${project.version}</version>
Expand Down
3 changes: 1 addition & 2 deletions components/camel-aws/camel-aws-bedrock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@
<scope>test</scope>
</dependency>


<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws-cloudtrail/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion ...config/src/test/java/org/apache/camel/component/aws/config/integration/AWSConfigBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.config.AWSConfigComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws-secrets-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion .../org/apache/camel/component/aws/secretsmanager/integration/AwsSecretsManagerBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws.secretsmanager.SecretsManagerComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-athena/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-cw/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion ...amel-aws2-cw/src/test/java/org/apache/camel/component/aws2/cw/integration/Aws2CwBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.cw.Cw2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-ddb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion ...el-aws2-ddb/src/test/java/org/apache/camel/component/aws2/ddb/localstack/Aws2DDBBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.ddb.Ddb2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
2 changes: 1 addition & 1 deletion .../test/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamConsumerHealthCheckIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.camel.health.HealthCheckRegistry;
import org.apache.camel.health.HealthCheckRepository;
import org.apache.camel.impl.health.DefaultHealthCheckRegistry;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Assertions;
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-ec2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion ...l-aws2-ec2/src/test/java/org/apache/camel/component/aws2/ec2/integration/Aws2EC2Base.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.ec2.AWS2EC2Component;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-eks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<scope>test</scope>
</dependency>

<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion components/camel-aws/camel-aws2-eventbridge/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</dependency>

<!-- test infra -->
<dependency>
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-aws-v2</artifactId>
<version>${project.version}</version>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/org/apache/camel/component/aws2/eventbridge/localstack/Aws2EventbridgeBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import org.apache.camel.CamelContext;
import org.apache.camel.component.aws2.eventbridge.EventbridgeComponent;
import org.apache.camel.test.infra.aws.common.services.AWSService;
import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils;
import org.apache.camel.test.infra.aws2.services.AWSService;
import org.apache.camel.test.infra.aws2.services.AWSServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.TestInstance;
Expand Down
Loading
Loading