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 aabbf59  CAMEL-16400: split unit and integration tests for 
camel-couchbase (#5333)
aabbf59 is described below

commit aabbf59cfbc629b1b820b9b20fcef2417ecf4c61
Author: Otavio Rodolfo Piske <orpi...@users.noreply.github.com>
AuthorDate: Sun Apr 11 19:12:11 2021 +0200

    CAMEL-16400: split unit and integration tests for camel-couchbase (#5333)
---
 components/camel-couchbase/pom.xml                 | 57 +++-------------------
 .../ConsumeMessagesWithLimitIT.java}               |  4 +-
 .../CouchbaseIntegrationTestBase.java              |  2 +-
 .../ProduceMessagesSimpleIT.java}                  |  5 +-
 .../ProduceMessagesWithAutoIDIT.java}              |  4 +-
 .../RemoveMessagesIT.java}                         |  4 +-
 6 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/components/camel-couchbase/pom.xml 
b/components/camel-couchbase/pom.xml
index 65b17ae..4bf88dc 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -85,55 +85,14 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
-    <profiles>
-    <!-- activate test if the docker socket file is accessible -->
-    <profile>
-        <id>couchbase-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>couchbase-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-couchbase/src/test/java/org/apache/camel/component/couchbase/ConsumeMessagesWithLimitTest.java
 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
similarity index 93%
rename from 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ConsumeMessagesWithLimitTest.java
rename to 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
index 5b5b1bc..40bcd5f 100644
--- 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ConsumeMessagesWithLimitTest.java
+++ 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ConsumeMessagesWithLimitIT.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.couchbase;
+package org.apache.camel.component.couchbase.integration;
 
 import java.util.concurrent.TimeUnit;
 
@@ -23,7 +23,7 @@ import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.After;
 import org.junit.jupiter.api.Test;
 
-public class ConsumeMessagesWithLimitTest extends CouchbaseIntegrationTestBase 
{
+public class ConsumeMessagesWithLimitIT extends CouchbaseIntegrationTestBase {
 
     @Test
     public void testQueryForBeers() throws Exception {
diff --git 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseIntegrationTestBase.java
 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
similarity index 98%
rename from 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseIntegrationTestBase.java
rename to 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
index c0ecf38..2d8a942 100644
--- 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/CouchbaseIntegrationTestBase.java
+++ 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/CouchbaseIntegrationTestBase.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.camel.component.couchbase;
+package org.apache.camel.component.couchbase.integration;
 
 import java.util.Collections;
 
diff --git 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesSimpleTest.java
 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
similarity index 90%
rename from 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesSimpleTest.java
rename to 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
index 03137e0..26f63c5 100644
--- 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesSimpleTest.java
+++ 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesSimpleIT.java
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.couchbase;
+package org.apache.camel.component.couchbase.integration;
 
 import java.time.Duration;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.couchbase.CouchbaseConstants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 
-public class ProduceMessagesSimpleTest extends CouchbaseIntegrationTestBase {
+public class ProduceMessagesSimpleIT extends CouchbaseIntegrationTestBase {
 
     @Test
     public void testInsert() throws Exception {
diff --git 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesWithAutoIDTest.java
 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
similarity index 92%
rename from 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesWithAutoIDTest.java
rename to 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
index 4eee7a6..8f1fc0c 100644
--- 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/ProduceMessagesWithAutoIDTest.java
+++ 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/ProduceMessagesWithAutoIDIT.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.couchbase;
+package org.apache.camel.component.couchbase.integration;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.jupiter.api.Test;
 
-public class ProduceMessagesWithAutoIDTest extends 
CouchbaseIntegrationTestBase {
+public class ProduceMessagesWithAutoIDIT extends CouchbaseIntegrationTestBase {
 
     @Test
     public void testInsert() throws Exception {
diff --git 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/RemoveMessagesTest.java
 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
similarity index 94%
rename from 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/RemoveMessagesTest.java
rename to 
components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
index 26bf3b1..8951052 100644
--- 
a/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/RemoveMessagesTest.java
+++ 
b/components/camel-couchbase/src/test/java/org/apache/camel/component/couchbase/integration/RemoveMessagesIT.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.couchbase;
+package org.apache.camel.component.couchbase.integration;
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.mock.MockEndpoint;
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
 import static 
org.apache.camel.component.couchbase.CouchbaseConstants.COUCHBASE_DELETE;
 import static 
org.apache.camel.component.couchbase.CouchbaseConstants.HEADER_ID;
 
-public class RemoveMessagesTest extends CouchbaseIntegrationTestBase {
+public class RemoveMessagesIT extends CouchbaseIntegrationTestBase {
 
     @Test
     public void testDelete() throws Exception {

Reply via email to