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/03/12 07:15:06 UTC

[camel-kafka-connector] 02/02: Extract HTTP-related test common into itests-common-http

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-kafka-connector.git

commit 8646c646df81162acb1ef1a1066182aac3926bf9
Author: Tadayoshi Sato <sa...@gmail.com>
AuthorDate: Fri Mar 12 15:10:26 2021 +0900

    Extract HTTP-related test common into itests-common-http
---
 tests/{itests-common => itests-common-http}/pom.xml           | 11 +++++++++--
 .../common/services/mockweb/MockWebService.java               |  0
 tests/itests-common/pom.xml                                   |  8 --------
 tests/itests-https/pom.xml                                    |  7 +++++++
 tests/itests-netty-http/pom.xml                               |  7 +++++++
 tests/pom.xml                                                 |  1 +
 6 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/tests/itests-common/pom.xml b/tests/itests-common-http/pom.xml
similarity index 84%
copy from tests/itests-common/pom.xml
copy to tests/itests-common-http/pom.xml
index 349e49b..0f8f32f 100644
--- a/tests/itests-common/pom.xml
+++ b/tests/itests-common-http/pom.xml
@@ -25,11 +25,18 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>itests-common</artifactId>
-    <name>Camel-Kafka-Connector :: Tests :: Common</name>
+    <artifactId>itests-common-http</artifactId>
+    <name>Camel-Kafka-Connector :: Tests :: Common HTTP</name>
 
     <dependencies>
         <dependency>
+            <groupId>org.apache.camel.kafkaconnector</groupId>
+            <artifactId>itests-common</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
diff --git a/tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/mockweb/MockWebService.java b/tests/itests-common-http/src/test/java/org/apache/camel/kafkaconnector/common/services/mockweb/MockWebService.java
similarity index 100%
rename from tests/itests-common/src/test/java/org/apache/camel/kafkaconnector/common/services/mockweb/MockWebService.java
rename to tests/itests-common-http/src/test/java/org/apache/camel/kafkaconnector/common/services/mockweb/MockWebService.java
diff --git a/tests/itests-common/pom.xml b/tests/itests-common/pom.xml
index 349e49b..bfb5275 100644
--- a/tests/itests-common/pom.xml
+++ b/tests/itests-common/pom.xml
@@ -28,14 +28,6 @@
     <artifactId>itests-common</artifactId>
     <name>Camel-Kafka-Connector :: Tests :: Common</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
          <plugins>
              <plugin>
diff --git a/tests/itests-https/pom.xml b/tests/itests-https/pom.xml
index c550e83..89b5083 100644
--- a/tests/itests-https/pom.xml
+++ b/tests/itests-https/pom.xml
@@ -36,6 +36,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.kafkaconnector</groupId>
+            <artifactId>itests-common-http</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.camel</groupId>
diff --git a/tests/itests-netty-http/pom.xml b/tests/itests-netty-http/pom.xml
index 88a0929..0539798 100644
--- a/tests/itests-netty-http/pom.xml
+++ b/tests/itests-netty-http/pom.xml
@@ -36,6 +36,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel.kafkaconnector</groupId>
+            <artifactId>itests-common-http</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
 
         <!-- test infra -->
         <dependency>
diff --git a/tests/pom.xml b/tests/pom.xml
index cff0878..c0f0dd2 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -41,6 +41,7 @@
     <modules>
         <module>itests-parent</module>
         <module>itests-common</module>
+        <module>itests-common-http</module>
         <module>itests-aws-v1</module>
         <module>itests-aws-v2</module>
         <module>itests-cassandra</module>