This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 a715ef5 CAMEL-16400: split unit and integration tests for camel-etcd
(#5336)
a715ef5 is described below
commit a715ef5f7c6b869236218ae1fdea3be78f651040
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Mon Apr 12 06:27:12 2021 +0200
CAMEL-16400: split unit and integration tests for camel-etcd (#5336)
---
components/camel-etcd/pom.xml | 73 +++-------------------
.../EtcdServiceCallRouteIT.java} | 4 +-
.../EtcdServiceDiscoveryIT.java} | 6 +-
.../SpringEtcdServiceCallDefaultRouteIT.java} | 4 +-
.../SpringEtcdServiceCallRouteIT.java} | 4 +-
.../EtcdKeysIT.java} | 5 +-
.../EtcdStatsIT.java} | 5 +-
.../EtcdWatchIT.java} | 5 +-
8 files changed, 27 insertions(+), 79 deletions(-)
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 610d038..f69ea3e 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -99,69 +99,12 @@
</dependencies>
- <profiles>
- <profile>
- <id>etcd-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>etcd-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>etcd-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>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceCallRouteTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceCallRouteIT.java
similarity index 97%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceCallRouteTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceCallRouteIT.java
index 068acb7..5e31bd0 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceCallRouteTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceCallRouteIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd.cloud;
+package org.apache.camel.component.etcd.cloud.integration;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,7 +30,7 @@ import org.apache.camel.component.etcd.EtcdHelper;
import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.junit.jupiter.api.Test;
-public class EtcdServiceCallRouteTest extends EtcdTestSupport {
+public class EtcdServiceCallRouteIT extends EtcdTestSupport {
private static final ObjectMapper MAPPER = EtcdHelper.createObjectMapper();
private static final String SERVICE_NAME = "http-service";
private static final int SERVICE_COUNT = 5;
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceDiscoveryTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceDiscoveryIT.java
similarity index 94%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceDiscoveryTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceDiscoveryIT.java
index 748a643..771bee1 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/EtcdServiceDiscoveryTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/EtcdServiceDiscoveryIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd.cloud;
+package org.apache.camel.component.etcd.cloud.integration;
import java.util.HashMap;
import java.util.List;
@@ -27,6 +27,8 @@ import mousio.etcd4j.responses.EtcdException;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.component.etcd.EtcdConfiguration;
import org.apache.camel.component.etcd.EtcdHelper;
+import org.apache.camel.component.etcd.cloud.EtcdOnDemandServiceDiscovery;
+import org.apache.camel.component.etcd.cloud.EtcdWatchServiceDiscovery;
import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.junit.jupiter.api.Test;
@@ -34,7 +36,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public class EtcdServiceDiscoveryTest extends EtcdTestSupport {
+public class EtcdServiceDiscoveryIT extends EtcdTestSupport {
private static final ObjectMapper MAPPER = EtcdHelper.createObjectMapper();
private static final AtomicInteger PORT = new AtomicInteger();
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallDefaultRouteTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallDefaultRouteIT.java
similarity index 95%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallDefaultRouteTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallDefaultRouteIT.java
index 13ddee4..3ec790c 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallDefaultRouteTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallDefaultRouteIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd.cloud;
+package org.apache.camel.component.etcd.cloud.integration;
import com.fasterxml.jackson.databind.JsonNode;
import mousio.etcd4j.EtcdClient;
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringEtcdServiceCallDefaultRouteTest extends
SpringEtcdTestSupport {
+public class SpringEtcdServiceCallDefaultRouteIT extends SpringEtcdTestSupport
{
@Override
protected AbstractApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext(
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallRouteTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallRouteIT.java
similarity index 96%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallRouteTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallRouteIT.java
index b698325..9901581 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallRouteTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/cloud/integration/SpringEtcdServiceCallRouteIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd.cloud;
+package org.apache.camel.component.etcd.cloud.integration;
import com.fasterxml.jackson.databind.JsonNode;
import mousio.etcd4j.EtcdClient;
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringEtcdServiceCallRouteTest extends SpringEtcdTestSupport {
+public class SpringEtcdServiceCallRouteIT extends SpringEtcdTestSupport {
@Override
protected AbstractApplicationContext createApplicationContext() {
return new
ClassPathXmlApplicationContext("org/apache/camel/component/etcd/cloud/SpringEtcdServiceCallRouteTest.xml");
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdKeysIT.java
similarity index 96%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdKeysIT.java
index 6f49f1c..8387b33 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdKeysTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdKeysIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd;
+package org.apache.camel.component.etcd.integration;
import java.util.HashMap;
import java.util.Map;
@@ -26,6 +26,7 @@ import mousio.etcd4j.responses.EtcdKeysResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.etcd.EtcdConstants;
import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
@@ -33,7 +34,7 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
-public class EtcdKeysTest extends EtcdTestSupport {
+public class EtcdKeysIT extends EtcdTestSupport {
@Test
public void testKeys() throws Exception {
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdStatsTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdStatsIT.java
similarity index 96%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdStatsTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdStatsIT.java
index c39e536..46cc330 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdStatsTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdStatsIT.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd;
+package org.apache.camel.component.etcd.integration;
import mousio.etcd4j.responses.EtcdLeaderStatsResponse;
import mousio.etcd4j.responses.EtcdSelfStatsResponse;
@@ -22,11 +22,12 @@ import mousio.etcd4j.responses.EtcdStoreStatsResponse;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.etcd.EtcdConstants;
import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-public class EtcdStatsTest extends EtcdTestSupport {
+public class EtcdStatsIT extends EtcdTestSupport {
@Test
public void testStats() throws Exception {
diff --git
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdWatchIT.java
similarity index 96%
rename from
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
rename to
components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdWatchIT.java
index 247cec4..08aa249 100644
---
a/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/EtcdWatchTest.java
+++
b/components/camel-etcd/src/test/java/org/apache/camel/component/etcd/integration/EtcdWatchIT.java
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.etcd;
+package org.apache.camel.component.etcd.integration;
import mousio.etcd4j.EtcdClient;
import mousio.etcd4j.responses.EtcdErrorCode;
import mousio.etcd4j.responses.EtcdException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.etcd.EtcdConstants;
import org.apache.camel.component.etcd.support.EtcdTestSupport;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
-public class EtcdWatchTest extends EtcdTestSupport {
+public class EtcdWatchIT extends EtcdTestSupport {
@Test
public void testWatchWithPath() throws Exception {
