Skip to content

Commit fdd303e

Browse files
committed
Add assumptions
1 parent ee13d7d commit fdd303e

7 files changed

+28
-3
lines changed

core/src/test/java/org/testcontainers/junit/BaseDockerComposeTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import org.junit.jupiter.api.Test;
88
import org.testcontainers.DockerClientFactory;
99
import org.testcontainers.containers.DockerComposeContainer;
10-
import org.testcontainers.utility.CommandLine;
1110
import org.testcontainers.utility.TestEnvironment;
1211
import 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

core/src/test/java/org/testcontainers/junit/DockerComposeContainerPortViaEnvTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import org.junit.jupiter.api.AutoClose;
44
import org.testcontainers.containers.DockerComposeContainer;
5+
import org.testcontainers.utility.CommandLine;
56
import org.testcontainers.utility.DockerImageName;
67

78
import java.io.File;
89

10+
import static org.assertj.core.api.Assumptions.assumeThat;
11+
912
class 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

core/src/test/java/org/testcontainers/junit/DockerComposeContainerTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.jupiter.api.Test;
55
import org.testcontainers.containers.ContainerState;
66
import org.testcontainers.containers.DockerComposeContainer;
7+
import org.testcontainers.utility.CommandLine;
78
import org.testcontainers.utility.DockerImageName;
89

910
import java.io.File;
@@ -14,6 +15,7 @@
1415
import java.util.Optional;
1516

1617
import 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

core/src/test/java/org/testcontainers/junit/DockerComposeServiceTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
import org.junit.jupiter.api.AutoClose;
44
import org.junit.jupiter.api.Test;
55
import org.testcontainers.containers.DockerComposeContainer;
6+
import org.testcontainers.utility.CommandLine;
67
import org.testcontainers.utility.DockerImageName;
78

89
import java.io.File;
910

1011
import static org.assertj.core.api.Assertions.assertThat;
1112
import static org.assertj.core.api.Assertions.assertThatThrownBy;
13+
import static org.assertj.core.api.Assumptions.assumeThat;
1214

1315
class 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

core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import org.junit.jupiter.api.AutoClose;
44
import org.testcontainers.containers.DockerComposeContainer;
5+
import org.testcontainers.utility.CommandLine;
56
import org.testcontainers.utility.DockerImageName;
67

78
import 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

core/src/test/java/org/testcontainers/junit/DockerComposeV2FormatWithIdentifierTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import org.junit.jupiter.api.AutoClose;
44
import org.testcontainers.containers.DockerComposeContainer;
5+
import org.testcontainers.utility.CommandLine;
56
import org.testcontainers.utility.DockerImageName;
67

78
import java.io.File;
89

10+
import static org.assertj.core.api.Assumptions.assumeThat;
11+
912
class 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

core/src/test/java/org/testcontainers/junit/DockerComposeV2WithNetworkTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

33
import org.junit.jupiter.api.AutoClose;
44
import org.testcontainers.containers.DockerComposeContainer;
5+
import org.testcontainers.utility.CommandLine;
56
import org.testcontainers.utility.DockerImageName;
67

78
import java.io.File;
89

10+
import static org.assertj.core.api.Assumptions.assumeThat;
11+
912
class 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

0 commit comments

Comments
 (0)