Migrated Docker based integration tests to TestContainers

apache · Oct 15, 2024 · 666ca73 · 666ca73
1 parent cc69017
commit 666ca73
Show file tree

Hide file tree

Showing 32 changed files with 1,622 additions and 1,222 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -49,4 +49,4 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}
     - name: Build with Maven
-      run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains
+      run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains,docker
diff --git a/httpclient5-testing/docker/.dockerignore b/httpclient5-testing/docker/.dockerignore
diff --git a/httpclient5-testing/docker/apache-httpd/Dockerfile b/httpclient5-testing/docker/apache-httpd/Dockerfile
diff --git a/httpclient5-testing/docker/docker-compose.yml b/httpclient5-testing/docker/docker-compose.yml
diff --git a/httpclient5-testing/docker/squid/Dockerfile b/httpclient5-testing/docker/squid/Dockerfile
diff --git a/httpclient5-testing/pom.xml b/httpclient5-testing/pom.xml
@@ -97,8 +97,43 @@
       <artifactId>rxjava</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>testcontainers</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.testcontainers</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <build>
+        <plugins>
+
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <version>${hc.surefire.version}</version>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <reporting>
     <plugins>
       <plugin>