Skip to content

Commit 0335839

Browse files
committed
Migrated Docker based integration tests to TestContainers
1 parent cc69017 commit 0335839

32 files changed

+1622
-1222
lines changed

.github/workflows/maven.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,4 @@ jobs:
4949
distribution: 'temurin'
5050
java-version: ${{ matrix.java }}
5151
- name: Build with Maven
52-
run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains
52+
run: mvn -V --file pom.xml --no-transfer-progress -DtrimStackTrace=false -P-use-toolchains,docker

httpclient5-testing/docker/.dockerignore

-16
This file was deleted.

httpclient5-testing/docker/apache-httpd/Dockerfile

-45
This file was deleted.

httpclient5-testing/docker/docker-compose.yml

-32
This file was deleted.

httpclient5-testing/docker/squid/Dockerfile

-29
This file was deleted.

httpclient5-testing/pom.xml

+35
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,43 @@
9797
<artifactId>rxjava</artifactId>
9898
<scope>test</scope>
9999
</dependency>
100+
<dependency>
101+
<groupId>org.testcontainers</groupId>
102+
<artifactId>testcontainers</artifactId>
103+
<scope>test</scope>
104+
</dependency>
105+
<dependency>
106+
<groupId>org.testcontainers</groupId>
107+
<artifactId>junit-jupiter</artifactId>
108+
<scope>test</scope>
109+
</dependency>
100110
</dependencies>
101111

112+
<profiles>
113+
<profile>
114+
<id>docker</id>
115+
<build>
116+
<plugins>
117+
118+
<plugin>
119+
<groupId>org.apache.maven.plugins</groupId>
120+
<artifactId>maven-failsafe-plugin</artifactId>
121+
<version>${hc.surefire.version}</version>
122+
<executions>
123+
<execution>
124+
<goals>
125+
<goal>integration-test</goal>
126+
<goal>verify</goal>
127+
</goals>
128+
</execution>
129+
</executions>
130+
</plugin>
131+
132+
</plugins>
133+
</build>
134+
</profile>
135+
</profiles>
136+
102137
<reporting>
103138
<plugins>
104139
<plugin>

0 commit comments

Comments
 (0)