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 4c246f5 CAMEL-16400: split unit and integration tests for
camel-zookeeper-master (#5375)
4c246f5 is described below
commit 4c246f5f3bc9749fbf6a529552a63eb3e15d1bb9
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Thu Apr 15 11:43:46 2021 +0200
CAMEL-16400: split unit and integration tests for camel-zookeeper-master
(#5375)
---
components/camel-zookeeper-master/pom.xml | 98 +++++-----------------
.../MasterEndpointFailoverIT.java} | 7 +-
2 files changed, 26 insertions(+), 79 deletions(-)
diff --git a/components/camel-zookeeper-master/pom.xml
b/components/camel-zookeeper-master/pom.xml
index 983d994..faa1aef 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -161,81 +161,27 @@
</dependencies>
- <profiles>
- <profile>
- <id>zookeeper-master-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>zookeeper-master-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>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
-
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!-- activate test if the DOCKER_HOST env var is set -->
- <profile>
- <id>zookeeper-master-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>
- <childDelegation>false</childDelegation>
- <useFile>true</useFile>
- <forkCount>1</forkCount>
- <reuseForks>true</reuseForks>
-
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <systemPropertyVariables>
+
<visibleassertions.silence>true</visibleassertions.silence>
+ </systemPropertyVariables>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
+
<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
similarity index 96%
rename from
components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
rename to
components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
index 367a90b..f22c867 100644
---
a/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/MasterEndpointFailoverTest.java
+++
b/components/camel-zookeeper-master/src/test/java/org/apache/camel/component/zookeepermaster/integration/MasterEndpointFailoverIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.zookeepermaster;
+package org.apache.camel.component.zookeepermaster.integration;
import java.util.concurrent.atomic.AtomicInteger;
@@ -22,6 +22,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.zookeepermaster.CuratorFactoryBean;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.support.SimpleRegistry;
import org.apache.camel.test.infra.zookeeper.services.ZooKeeperService;
@@ -34,11 +35,11 @@ import org.junit.jupiter.api.extension.RegisterExtension;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class MasterEndpointFailoverTest {
+public class MasterEndpointFailoverIT {
@RegisterExtension
static ZooKeeperService service = ZooKeeperServiceFactory.createService();
- private static final transient Logger LOG =
LoggerFactory.getLogger(MasterEndpointFailoverTest.class);
+ private static final transient Logger LOG =
LoggerFactory.getLogger(MasterEndpointFailoverIT.class);
protected ProducerTemplate template;
protected CamelContext producerContext;
