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 179ad9b CAMEL-16400: split unit and integration tests for camel-hbase
(#5341)
179ad9b is described below
commit 179ad9b7202d9f92dc6e6401bc3523e36a2bb474
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Mon Apr 12 18:26:56 2021 +0200
CAMEL-16400: split unit and integration tests for camel-hbase (#5341)
---
components/camel-hbase/pom.xml | 80 +---------------------
...BaseFilterTest.java => CamelHBaseFilterIT.java} | 2 +-
...aseComponentTest.java => HBaseComponentIT.java} | 6 +-
...HBaseConsumerTest.java => HBaseConsumerIT.java} | 2 +-
...onvertionsTest.java => HBaseConvertionsIT.java} | 2 +-
...HBaseProducerTest.java => HBaseProducerIT.java} | 2 +-
...yTest.java => HBaseIdempotentRepositoryIT.java} | 2 +-
7 files changed, 9 insertions(+), 87 deletions(-)
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index 3c35427..766be74 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -97,90 +97,12 @@
</dependencies>
<build>
- <testResources>
- <testResource>
- <directory>${project.basedir}/src/test/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- This is required by the hbase testing utility -->
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
+ <artifactId>maven-failsafe-plugin</artifactId>
</plugin>
</plugins>
</build>
- <profiles>
- <profile>
- <id>hbase-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>hbase-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>
- <systemPropertyVariables>
-
<visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the DOCKER_HOST env var is set -->
- <profile>
- <id>hbase-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>
- <systemPropertyVariables>
-
<visibleassertions.silence>true</visibleassertions.silence>
- </systemPropertyVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
</project>
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterIT.java
similarity index 97%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterIT.java
index c5c2ba7..0957a39 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/CamelHBaseFilterIT.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class CamelHBaseFilterTest extends CamelHBaseTestSupport {
+public class CamelHBaseFilterIT extends CamelHBaseTestSupport {
@BindToRegistry("myFilters")
public List<Filter> addFilters() {
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentIT.java
similarity index 93%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentIT.java
index d80aec2..94da025 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseComponentIT.java
@@ -26,11 +26,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertSame;
-public class HBaseComponentTest {
+public class HBaseComponentIT {
@Test
public void testHBaseConfigurationClassLoaderSetToAppContextClassLoader()
throws Exception {
- ClassLoader expectedClassLoader =
HBaseComponentTest.class.getClassLoader();
+ ClassLoader expectedClassLoader =
HBaseComponentIT.class.getClassLoader();
CamelContext camelContext = new DefaultCamelContext();
camelContext.setApplicationContextClassLoader(expectedClassLoader);
@@ -45,7 +45,7 @@ public class HBaseComponentTest {
@Test
public void testHBaseConfigurationClassLoaderNotOverridden() throws
Exception {
- ClassLoader expectedClassLoader =
HBaseComponentTest.class.getClassLoader().getParent();
+ ClassLoader expectedClassLoader =
HBaseComponentIT.class.getClassLoader().getParent();
Configuration configuration = HBaseConfiguration.create();
configuration.setClassLoader(expectedClassLoader);
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerIT.java
similarity index 97%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerIT.java
index 370a81d..94e7b3d 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConsumerIT.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-public class HBaseConsumerTest extends CamelHBaseTestSupport {
+public class HBaseConsumerIT extends CamelHBaseTestSupport {
@Test
public void testPutMultiRowsAndConsume() throws Exception {
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsIT.java
similarity index 98%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsIT.java
index 5f540a6..1c864ab 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseConvertionsIT.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-public class HBaseConvertionsTest extends CamelHBaseTestSupport {
+public class HBaseConvertionsIT extends CamelHBaseTestSupport {
protected Object[] key = { 1, "2", "3" };
protected final Object[] body = { 1L, false, "3" };
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerIT.java
similarity index 99%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerIT.java
index 50c4ab6..b690ed6 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/HBaseProducerIT.java
@@ -36,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class HBaseProducerTest extends CamelHBaseTestSupport {
+public class HBaseProducerIT extends CamelHBaseTestSupport {
@Test
public void testPut() throws Exception {
diff --git
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryIT.java
similarity index 98%
rename from
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
rename to
components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryIT.java
index 799091c..810a699 100644
---
a/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryTest.java
+++
b/components/camel-hbase/src/test/java/org/apache/camel/component/hbase/processor/idempotent/HBaseIdempotentRepositoryIT.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class HBaseIdempotentRepositoryTest extends CamelHBaseTestSupport {
+public class HBaseIdempotentRepositoryIT extends CamelHBaseTestSupport {
IdempotentRepository repository;
