File tree Expand file tree Collapse file tree 7 files changed +28
-3
lines changed
core/src/test/java/org/testcontainers/junit Expand file tree Collapse file tree 7 files changed +28
-3
lines changed Original file line number Diff line number Diff line change 77import org .junit .jupiter .api .Test ;
88import org .testcontainers .DockerClientFactory ;
99import org .testcontainers .containers .DockerComposeContainer ;
10- import org .testcontainers .utility .CommandLine ;
1110import org .testcontainers .utility .TestEnvironment ;
1211import redis .clients .jedis .Jedis ;
1312
@@ -32,8 +31,6 @@ public abstract class BaseDockerComposeTest {
3231 @ BeforeAll
3332 public static void checkVersion () {
3433 assumeThat (TestEnvironment .dockerApiAtLeast ("1.22" )).isTrue ();
35- assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
36- .doesNotStartWith ("Docker Compose version v2" );
3734 }
3835
3936 @ Test
Original file line number Diff line number Diff line change 22
33import org .junit .jupiter .api .AutoClose ;
44import org .testcontainers .containers .DockerComposeContainer ;
5+ import org .testcontainers .utility .CommandLine ;
56import org .testcontainers .utility .DockerImageName ;
67
78import java .io .File ;
89
10+ import static org .assertj .core .api .Assumptions .assumeThat ;
11+
912class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
1013
1114 @ AutoClose
@@ -17,6 +20,8 @@ class DockerComposeContainerPortViaEnvTest extends BaseDockerComposeTest {
1720 .withEnv ("REDIS_PORT" , String .valueOf (REDIS_PORT ));
1821
1922 DockerComposeContainerPortViaEnvTest () {
23+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
24+ .doesNotStartWith ("Docker Compose version v2" );
2025 environment .start ();
2126 }
2227
Original file line number Diff line number Diff line change 44import org .junit .jupiter .api .Test ;
55import org .testcontainers .containers .ContainerState ;
66import org .testcontainers .containers .DockerComposeContainer ;
7+ import org .testcontainers .utility .CommandLine ;
78import org .testcontainers .utility .DockerImageName ;
89
910import java .io .File ;
1415import java .util .Optional ;
1516
1617import static org .assertj .core .api .Assertions .assertThat ;
18+ import static org .assertj .core .api .Assumptions .assumeThat ;
1719
1820/**
1921 * Created by rnorth on 08/08/2015.
@@ -29,6 +31,8 @@ class DockerComposeContainerTest extends BaseDockerComposeTest {
2931 .withExposedService ("db_1" , 3306 );
3032
3133 DockerComposeContainerTest () {
34+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
35+ .doesNotStartWith ("Docker Compose version v2" );
3236 environment .start ();
3337 }
3438
Original file line number Diff line number Diff line change 33import org .junit .jupiter .api .AutoClose ;
44import org .junit .jupiter .api .Test ;
55import org .testcontainers .containers .DockerComposeContainer ;
6+ import org .testcontainers .utility .CommandLine ;
67import org .testcontainers .utility .DockerImageName ;
78
89import java .io .File ;
910
1011import static org .assertj .core .api .Assertions .assertThat ;
1112import static org .assertj .core .api .Assertions .assertThatThrownBy ;
13+ import static org .assertj .core .api .Assumptions .assumeThat ;
1214
1315class DockerComposeServiceTest extends BaseDockerComposeTest {
1416
@@ -21,6 +23,8 @@ class DockerComposeServiceTest extends BaseDockerComposeTest {
2123 .withExposedService ("redis_1" , REDIS_PORT );
2224
2325 DockerComposeServiceTest () {
26+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
27+ .doesNotStartWith ("Docker Compose version v2" );
2428 environment .start ();
2529 }
2630
Original file line number Diff line number Diff line change 22
33import org .junit .jupiter .api .AutoClose ;
44import org .testcontainers .containers .DockerComposeContainer ;
5+ import org .testcontainers .utility .CommandLine ;
56import org .testcontainers .utility .DockerImageName ;
67
78import java .io .File ;
89
10+ import static org .assertj .core .api .Assumptions .assumeThat ;
11+
912/**
1013 * Created by rnorth on 21/05/2016.
1114 */
@@ -19,6 +22,8 @@ class DockerComposeV2FormatTest extends BaseDockerComposeTest {
1922 .withExposedService ("redis_1" , REDIS_PORT );
2023
2124 DockerComposeV2FormatTest () {
25+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
26+ .doesNotStartWith ("Docker Compose version v2" );
2227 environment .start ();
2328 }
2429
Original file line number Diff line number Diff line change 22
33import org .junit .jupiter .api .AutoClose ;
44import org .testcontainers .containers .DockerComposeContainer ;
5+ import org .testcontainers .utility .CommandLine ;
56import org .testcontainers .utility .DockerImageName ;
67
78import java .io .File ;
89
10+ import static org .assertj .core .api .Assumptions .assumeThat ;
11+
912class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
1013
1114 @ AutoClose
@@ -17,6 +20,8 @@ class DockerComposeV2FormatWithIdentifierTest extends BaseDockerComposeTest {
1720 .withExposedService ("redis_1" , REDIS_PORT );
1821
1922 DockerComposeV2FormatWithIdentifierTest () {
23+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
24+ .doesNotStartWith ("Docker Compose version v2" );
2025 environment .start ();
2126 }
2227
Original file line number Diff line number Diff line change 22
33import org .junit .jupiter .api .AutoClose ;
44import org .testcontainers .containers .DockerComposeContainer ;
5+ import org .testcontainers .utility .CommandLine ;
56import org .testcontainers .utility .DockerImageName ;
67
78import java .io .File ;
89
10+ import static org .assertj .core .api .Assumptions .assumeThat ;
11+
912class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
1013
1114 @ AutoClose
@@ -16,6 +19,8 @@ class DockerComposeV2WithNetworkTest extends BaseDockerComposeTest {
1619 .withExposedService ("redis_1" , REDIS_PORT );
1720
1821 DockerComposeV2WithNetworkTest () {
22+ assumeThat (CommandLine .runShellCommand ("docker-compose" , "--version" ))
23+ .doesNotStartWith ("Docker Compose version v2" );
1924 environment .start ();
2025 }
2126
You can’t perform that action at this time.
0 commit comments