Skip to content

Commit 0342c41

Browse files
fokioneddumelendez
authored andcommitted
fix tests apply spotless
1 parent 8e0f8a1 commit 0342c41

File tree

4 files changed

+16
-18
lines changed

4 files changed

+16
-18
lines changed

core/src/main/java/org/testcontainers/containers/ComposeContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.testcontainers.lifecycle.Startable;
1212
import org.testcontainers.utility.Base58;
1313
import org.testcontainers.utility.DockerImageName;
14-
import org.testcontainers.utility.TestcontainersConfiguration;
1514

1615
import java.io.File;
1716
import java.time.Duration;
@@ -67,6 +66,7 @@ public class ComposeContainer implements Startable {
6766
private String project;
6867

6968
private List<String> filesInDirectory = new ArrayList<>();
69+
7070
/**
7171
* Creates a new ComposeContainer with a random identifier using the specified Docker image and compose files.
7272
*

core/src/main/java/org/testcontainers/containers/DockerComposeContainer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ public DockerComposeContainer(String identifier, File... composeFiles) {
147147
this(identifier, Arrays.asList(composeFiles));
148148
}
149149

150-
151150
/**
152151
* @deprecated
153152
* Use the new constructor DockerComposeContainer(String identifier,List composeFiles)

core/src/test/java/org/testcontainers/containers/ComposeContainerTest.java

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,37 @@ public void setup() {
3333
rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
3434
rootLogger.addAppender(testLogAppender);
3535
TestcontainersConfiguration.getInstance().updateUserConfig("compose.container.image", DOCKER_IMAGE);
36-
composeContainer.stop();
3736
}
3837

3938
@After
4039
public void tearDown() {
40+
composeContainer.stop();
4141
rootLogger.detachAppender(testLogAppender);
4242
TestcontainersConfiguration.getInstance().updateUserConfig("compose.container.image", "");
4343
System.clearProperty("compose.container.image");
4444
}
4545

4646
@Test
4747
public void testWithCustomDockerImage() {
48-
composeContainer = new ComposeContainer(
49-
DockerImageName.parse(DOCKER_IMAGE), new File(COMPOSE_FILE_PATH)
50-
);
48+
composeContainer = new ComposeContainer(DockerImageName.parse(DOCKER_IMAGE), new File(COMPOSE_FILE_PATH));
5149
composeContainer.start();
5250
verifyContainerCreation();
5351
}
5452

5553
@Test
5654
public void testWithCustomDockerImageAndIdentifier() {
57-
composeContainer = new ComposeContainer(
58-
DockerImageName.parse(DOCKER_IMAGE), "myidentifier", new File(COMPOSE_FILE_PATH)
59-
);
55+
composeContainer =
56+
new ComposeContainer(DockerImageName.parse(DOCKER_IMAGE), "myidentifier", new File(COMPOSE_FILE_PATH));
6057
composeContainer.start();
6158
verifyContainerCreation();
6259
}
6360

6461
private void verifyContainerCreation() {
6562
List<String> logs = testLogAppender.getLogs();
6663

67-
assertThat(logs)
68-
.isNotNull()
69-
.anyMatch(line -> line.contains("Creating container for image: " + DOCKER_IMAGE));
64+
assertThat(logs).isNotNull().anyMatch(line -> line.contains("Creating container for image: " + DOCKER_IMAGE));
7065
}
7166

72-
7367
private static class TestLogAppender extends AppenderBase<ILoggingEvent> {
7468

7569
private final List<String> logs = new ArrayList<>();

core/src/test/java/org/testcontainers/containers/DockerComposeContainerCustomImageTest.java

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import static org.assertj.core.api.Assertions.assertThat;
1818

1919
public class DockerComposeContainerCustomImageTest {
20+
2021
public static final String DOCKER_IMAGE = "docker/compose:debian-1.29.2";
2122
private static final String COMPOSE_FILE_PATH = "src/test/resources/docker-compose-imagename-parsing-v1.yml";
2223

@@ -43,24 +44,28 @@ public void tearDown() {
4344

4445
@Test
4546
public void testWithCustomDockerImage() {
46-
composeContainer = new DockerComposeContainer(DockerImageName.parse(DOCKER_IMAGE),"testing", new File(COMPOSE_FILE_PATH));
47+
composeContainer =
48+
new DockerComposeContainer(DockerImageName.parse(DOCKER_IMAGE), "testing", new File(COMPOSE_FILE_PATH));
4749
composeContainer.start();
4850
verifyContainerCreation();
4951
}
5052

5153
@Test
5254
public void testWithCustomDockerImageAndIdentifier() {
53-
composeContainer = new DockerComposeContainer(DockerImageName.parse(DOCKER_IMAGE), "myidentifier", new File(COMPOSE_FILE_PATH));
55+
composeContainer =
56+
new DockerComposeContainer(
57+
DockerImageName.parse(DOCKER_IMAGE),
58+
"myidentifier",
59+
new File(COMPOSE_FILE_PATH)
60+
);
5461
composeContainer.start();
5562
verifyContainerCreation();
5663
}
5764

5865
private void verifyContainerCreation() {
5966
List<String> logs = testLogAppender.getLogs();
6067

61-
assertThat(logs)
62-
.isNotNull()
63-
.anyMatch(line -> line.contains("Creating container for image: " + DOCKER_IMAGE));
68+
assertThat(logs).isNotNull().anyMatch(line -> line.contains("Creating container for image: " + DOCKER_IMAGE));
6469
}
6570

6671
private static class TestLogAppender extends AppenderBase<ILoggingEvent> {

0 commit comments

Comments
 (0)