You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/04/14 08:31:02 UTC
[camel] branch master updated: CAMEL-16400: split unit and
integration tests for camel-minio (#5354)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new d9cfe5f CAMEL-16400: split unit and integration tests for camel-minio (#5354)
d9cfe5f is described below
commit d9cfe5f6a43892dea3c0988d6871d05b2b427ab3
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Wed Apr 14 10:30:33 2021 +0200
CAMEL-16400: split unit and integration tests for camel-minio (#5354)
---
components/camel-minio/pom.xml | 75 +++-------------------
...nioComponentTest.java => MinioComponentIT.java} | 2 +-
...MinioConsumerTest.java => MinioConsumerIT.java} | 2 +-
...onTest.java => MinioCopyObjectOperationIT.java} | 4 +-
...Test.java => MinioDeleteBucketOperationIT.java} | 2 +-
...pport.java => MinioIntegrationTestSupport.java} | 2 +-
...nTest.java => MinioListObjectsOperationIT.java} | 4 +-
...nTest.java => MinioObjectRangeOperationIT.java} | 6 +-
8 files changed, 19 insertions(+), 78 deletions(-)
diff --git a/components/camel-minio/pom.xml b/components/camel-minio/pom.xml
index e803318..a955727 100644
--- a/components/camel-minio/pom.xml
+++ b/components/camel-minio/pom.xml
@@ -108,71 +108,12 @@
</dependency>
</dependencies>
- <profiles>
- <profile>
- <id>minio-skip-tests</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the docker socket file is accessible -->
- <profile>
- <id>minio-tests-docker-file</id>
- <activation>
- <file>
- <exists>/var/run/docker.sock</exists>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <forkCount>1</forkCount>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the DOCKER_HOST env var is set -->
- <profile>
- <id>minio-tests-docker-env</id>
- <activation>
- <property>
- <name>env.DOCKER_HOST</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <forkCount>1</forkCount>
- <systemPropertyVariables>
- <visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentIT.java
similarity index 98%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentIT.java
index 30f4a5a..fd16ad3 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioComponentIT.java
@@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class MinioComponentTest extends MinioTestContainerSupport {
+class MinioComponentIT extends MinioIntegrationTestSupport {
@EndpointInject("direct:start")
private ProducerTemplate template;
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerIT.java
similarity index 97%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerIT.java
index 9af7e2e..9c7f7bb 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioConsumerIT.java
@@ -25,7 +25,7 @@ import org.apache.camel.component.minio.MinioConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-class MinioConsumerTest extends MinioTestContainerSupport {
+class MinioConsumerIT extends MinioIntegrationTestSupport {
@BindToRegistry("minioClient")
MinioClient client = MinioClient.builder()
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationIT.java
similarity index 96%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationIT.java
index 19c1e8f..1b90138 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioCopyObjectOperationIT.java
@@ -28,7 +28,7 @@ import org.apache.camel.component.minio.MinioOperations;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-class MinioCopyObjectOperationTest extends MinioTestContainerSupport {
+class MinioCopyObjectOperationIT extends MinioIntegrationTestSupport {
@BindToRegistry("minioClient")
MinioClient client = MinioClient.builder()
@@ -42,7 +42,7 @@ class MinioCopyObjectOperationTest extends MinioTestContainerSupport {
@EndpointInject("mock:result")
private MockEndpoint result;
- MinioCopyObjectOperationTest() throws IOException {
+ MinioCopyObjectOperationIT() throws IOException {
}
@Test
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationIT.java
similarity index 97%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationIT.java
index 27e8081..25b7d3d 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioDeleteBucketOperationIT.java
@@ -26,7 +26,7 @@ import org.apache.camel.component.minio.MinioOperations;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-class MinioDeleteBucketOperationTest extends MinioTestContainerSupport {
+class MinioDeleteBucketOperationIT extends MinioIntegrationTestSupport {
@BindToRegistry("minioClient")
MinioClient client = MinioClient.builder()
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioTestContainerSupport.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java
similarity index 95%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioTestContainerSupport.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java
index 4387c85..cf4fd86 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioTestContainerSupport.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioIntegrationTestSupport.java
@@ -21,7 +21,7 @@ import org.apache.camel.test.infra.minio.services.MinioServiceFactory;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.extension.RegisterExtension;
-class MinioTestContainerSupport extends CamelTestSupport {
+class MinioIntegrationTestSupport extends CamelTestSupport {
@RegisterExtension
static MinioService service = MinioServiceFactory.createService();
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
similarity index 97%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
index 1b83e63..7ab90b0 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioListObjectsOperationIT.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
-class MinioListObjectsOperationTest extends MinioTestContainerSupport {
+class MinioListObjectsOperationIT extends MinioIntegrationTestSupport {
@BindToRegistry("minioClient")
MinioClient client = MinioClient.builder()
@@ -50,7 +50,7 @@ class MinioListObjectsOperationTest extends MinioTestContainerSupport {
@EndpointInject("mock:result")
private MockEndpoint result;
- MinioListObjectsOperationTest() throws IOException {
+ MinioListObjectsOperationIT() throws IOException {
}
@SuppressWarnings("unchecked")
diff --git a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationTest.java b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationIT.java
similarity index 96%
rename from components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationTest.java
rename to components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationIT.java
index 9ad660d..76ea634 100644
--- a/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationTest.java
+++ b/components/camel-minio/src/test/java/org/apache/camel/component/minio/integration/MinioObjectRangeOperationIT.java
@@ -35,9 +35,9 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-class MinioObjectRangeOperationTest extends MinioTestContainerSupport {
+class MinioObjectRangeOperationIT extends MinioIntegrationTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(MinioObjectRangeOperationTest.class);
+ private static final Logger LOG = LoggerFactory.getLogger(MinioObjectRangeOperationIT.class);
@BindToRegistry("minioClient")
MinioClient client = MinioClient.builder()
@@ -51,7 +51,7 @@ class MinioObjectRangeOperationTest extends MinioTestContainerSupport {
@EndpointInject("mock:result")
private MockEndpoint result;
- MinioObjectRangeOperationTest() throws IOException {
+ MinioObjectRangeOperationIT() throws IOException {
}
@Test