Skip to content

Commit 6a3e649

Browse files
eddumelendezkiview
eddumelendez
and
kiview
authored
Move junit4 to assertj (#5685)
Co-authored-by: Kevin Wittek <[email protected]>
1 parent 074295e commit 6a3e649

File tree

55 files changed

+325
-396
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+325
-396
lines changed

‎config/checkstyle/checkstyle.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@
2929
org.assertj.core.api.Assertions.*,
3030
org.assertj.core.api.Assumptions.*,
3131
org.awaitility.Awaitility.*,
32-
org.hamcrest.Matchers.*,
33-
org.hamcrest.MatcherAssert.*,
34-
org.junit.Assert.*,
3532
org.junit.Assume.*,
36-
org.junit.jupiter.api.Assertions.*,
3733
org.mockito.Mockito.*,
3834
org.mockito.ArgumentMatchers.*,
3935
org.mockserver.model.HttpRequest.*,

‎core/src/test/java/org/testcontainers/containers/output/FrameConsumerResultCallbackTest.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import java.util.concurrent.TimeoutException;
1111
import java.util.function.Consumer;
1212

13-
import static org.junit.Assert.assertEquals;
14-
import static org.junit.Assert.assertTrue;
13+
import static org.assertj.core.api.Assertions.assertThat;
1514

1615
public class FrameConsumerResultCallbackTest {
1716

@@ -26,7 +25,7 @@ public void passStderrFrameWithoutColors() {
2625
ToStringConsumer consumer = new ToStringConsumer();
2726
callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
2827
callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
29-
assertEquals(LOG_RESULT, consumer.toUtf8String());
28+
assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
3029
}
3130

3231
@Test
@@ -35,7 +34,7 @@ public void passStderrFrameWithColors() {
3534
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
3635
callback.addConsumer(OutputFrame.OutputType.STDERR, consumer);
3736
callback.onNext(new Frame(StreamType.STDERR, FRAME_PAYLOAD.getBytes()));
38-
assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
37+
assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
3938
}
4039

4140
@Test
@@ -44,7 +43,7 @@ public void passStdoutFrameWithoutColors() {
4443
ToStringConsumer consumer = new ToStringConsumer();
4544
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
4645
callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
47-
assertEquals(LOG_RESULT, consumer.toUtf8String());
46+
assertThat(consumer.toUtf8String()).isEqualTo(LOG_RESULT);
4847
}
4948

5049
@Test
@@ -53,7 +52,7 @@ public void passStdoutFrameWithColors() {
5352
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
5453
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
5554
callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
56-
assertEquals(FRAME_PAYLOAD, consumer.toUtf8String());
55+
assertThat(consumer.toUtf8String()).isEqualTo(FRAME_PAYLOAD);
5756
}
5857

5958
@Test
@@ -62,7 +61,7 @@ public void basicConsumer() {
6261
BasicConsumer consumer = new BasicConsumer();
6362
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
6463
callback.onNext(new Frame(StreamType.STDOUT, FRAME_PAYLOAD.getBytes()));
65-
assertEquals(LOG_RESULT, consumer.toString());
64+
assertThat(consumer.toString()).isEqualTo(LOG_RESULT);
6665
}
6766

6867
@Test
@@ -71,7 +70,7 @@ public void passStdoutNull() {
7170
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
7271
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
7372
callback.onNext(new Frame(StreamType.STDOUT, null));
74-
assertEquals("", consumer.toUtf8String());
73+
assertThat(consumer.toUtf8String()).isEqualTo("");
7574
}
7675

7776
@Test
@@ -81,7 +80,7 @@ public void passStdoutEmptyLine() {
8180
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
8281
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
8382
callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
84-
assertEquals(payload, consumer.toUtf8String());
83+
assertThat(consumer.toUtf8String()).isEqualTo(payload);
8584
}
8685

8786
@Test
@@ -91,7 +90,7 @@ public void passStdoutSingleLine() {
9190
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
9291
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
9392
callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
94-
assertEquals(payload, consumer.toUtf8String());
93+
assertThat(consumer.toUtf8String()).isEqualTo(payload);
9594
}
9695

9796
@Test
@@ -101,7 +100,7 @@ public void passStdoutSingleLineWithNewline() {
101100
ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
102101
callback.addConsumer(OutputFrame.OutputType.STDOUT, consumer);
103102
callback.onNext(new Frame(StreamType.STDOUT, payload.getBytes()));
104-
assertEquals(payload, consumer.toUtf8String());
103+
assertThat(consumer.toUtf8String()).isEqualTo(payload);
105104
}
106105

107106
@Test
@@ -130,7 +129,7 @@ public void passRawFrameWithoutColors() throws TimeoutException, IOException {
130129
} catch (Exception e) {
131130
exception = e;
132131
}
133-
assertTrue(exception instanceof TimeoutException);
132+
assertThat(exception instanceof TimeoutException).isTrue();
134133
callback.close();
135134
waitConsumer.waitUntil(
136135
frame -> frame.getType() == OutputFrame.OutputType.STDOUT && frame.getUtf8String().equals("Test3"),
@@ -180,7 +179,7 @@ public void passRawFrameWithColors() throws TimeoutException, IOException {
180179
} catch (Exception e) {
181180
exception = e;
182181
}
183-
assertTrue(exception instanceof TimeoutException);
182+
assertThat(exception instanceof TimeoutException).isTrue();
184183
callback.close();
185184
waitConsumer.waitUntil(
186185
frame -> {
@@ -208,7 +207,7 @@ public void reconstructBreakedUnicode() throws IOException {
208207
callback.onNext(new Frame(StreamType.RAW, bytes1));
209208
callback.onNext(new Frame(StreamType.RAW, bytes2));
210209
callback.close();
211-
assertEquals(payload, consumer.toUtf8String());
210+
assertThat(consumer.toUtf8String()).isEqualTo(payload);
212211
}
213212

214213
private static class BasicConsumer implements Consumer<OutputFrame> {

‎core/src/test/java/org/testcontainers/dockerclient/DockerClientConfigUtilsTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77

88
import java.net.URI;
99

10-
import static org.junit.Assert.assertEquals;
11-
import static org.junit.Assert.assertNotNull;
12-
import static org.junit.Assert.assertNull;
10+
import static org.assertj.core.api.Assertions.assertThat;
1311

1412
public class DockerClientConfigUtilsTest {
1513

@@ -23,7 +21,7 @@ public void getDockerHostIpAddressShouldReturnLocalhostWhenUnixSocket() {
2321
client,
2422
URI.create("unix:///var/run/docker.sock")
2523
);
26-
assertEquals("localhost", actual);
24+
assertThat(actual).isEqualTo("localhost");
2725
}
2826

2927
@Test
@@ -32,7 +30,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenHttpsUri() {
3230
client,
3331
URI.create("http://12.23.34.45")
3432
);
35-
assertEquals("12.23.34.45", actual);
33+
assertThat(actual).isEqualTo("12.23.34.45");
3634
}
3735

3836
@Test
@@ -41,7 +39,7 @@ public void getDockerHostIpAddressShouldReturnDockerHostIpWhenTcpUri() {
4139
client,
4240
URI.create("tcp://12.23.34.45")
4341
);
44-
assertEquals("12.23.34.45", actual);
42+
assertThat(actual).isEqualTo("12.23.34.45");
4543
}
4644

4745
@Test
@@ -50,11 +48,11 @@ public void getDockerHostIpAddressShouldReturnNullWhenUnsupportedUriScheme() {
5048
client,
5149
URI.create("gopher://12.23.34.45")
5250
);
53-
assertNull(actual);
51+
assertThat(actual).isNull();
5452
}
5553

5654
@Test(timeout = 5_000)
5755
public void getDefaultGateway() {
58-
assertNotNull(DockerClientConfigUtils.getDefaultGateway());
56+
assertThat(DockerClientConfigUtils.getDefaultGateway()).isNotNull();
5957
}
6058
}

‎core/src/test/java/org/testcontainers/images/AgeBasedPullPolicyTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
import java.time.temporal.ChronoUnit;
99
import java.util.UUID;
1010

11-
import static org.junit.Assert.assertFalse;
12-
import static org.junit.Assert.assertTrue;
11+
import static org.assertj.core.api.Assertions.assertThat;
1312

1413
public class AgeBasedPullPolicyTest {
1514

@@ -20,9 +19,9 @@ public void shouldPull() {
2019
ImageData imageData = ImageData.builder().createdAt(Instant.now().minus(2, ChronoUnit.HOURS)).build();
2120

2221
AgeBasedPullPolicy oneHour = new AgeBasedPullPolicy(Duration.of(1L, ChronoUnit.HOURS));
23-
assertTrue(oneHour.shouldPullCached(imageName, imageData));
22+
assertThat(oneHour.shouldPullCached(imageName, imageData)).isTrue();
2423

2524
AgeBasedPullPolicy fiveHours = new AgeBasedPullPolicy(Duration.of(5L, ChronoUnit.HOURS));
26-
assertFalse(fiveHours.shouldPullCached(imageName, imageData));
25+
assertThat(fiveHours.shouldPullCached(imageName, imageData)).isFalse();
2726
}
2827
}

‎core/src/test/java/org/testcontainers/images/ParsedDockerfileTest.java‎

Lines changed: 31 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.nio.file.Paths;
77
import java.util.Arrays;
88

9-
import static org.junit.Assert.assertEquals;
9+
import static org.assertj.core.api.Assertions.assertThat;
1010

1111
public class ParsedDockerfileTest {
1212

@@ -15,108 +15,96 @@ public void doesSimpleParsing() {
1515
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
1616
Arrays.asList("FROM someimage", "RUN something")
1717
);
18-
assertEquals(
19-
"extracts a single image name",
20-
Sets.newHashSet("someimage"),
21-
parsedDockerfile.getDependencyImageNames()
22-
);
18+
assertThat(parsedDockerfile.getDependencyImageNames())
19+
.as("extracts a single image name")
20+
.isEqualTo(Sets.newHashSet("someimage"));
2321
}
2422

2523
@Test
2624
public void isCaseInsensitive() {
2725
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
2826
Arrays.asList("from someimage", "RUN something")
2927
);
30-
assertEquals(
31-
"extracts a single image name",
32-
Sets.newHashSet("someimage"),
33-
parsedDockerfile.getDependencyImageNames()
34-
);
28+
assertThat(parsedDockerfile.getDependencyImageNames())
29+
.as("extracts a single image name")
30+
.isEqualTo(Sets.newHashSet("someimage"));
3531
}
3632

3733
@Test
3834
public void handlesTags() {
3935
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
4036
Arrays.asList("FROM someimage:tag", "RUN something")
4137
);
42-
assertEquals(
43-
"retains tags in image names",
44-
Sets.newHashSet("someimage:tag"),
45-
parsedDockerfile.getDependencyImageNames()
46-
);
38+
assertThat(parsedDockerfile.getDependencyImageNames())
39+
.as("retains tags in image names")
40+
.isEqualTo(Sets.newHashSet("someimage:tag"));
4741
}
4842

4943
@Test
5044
public void handlesDigests() {
5145
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
5246
Arrays.asList("FROM someimage@sha256:abc123", "RUN something")
5347
);
54-
assertEquals(
55-
"retains digests in image names",
56-
Sets.newHashSet("someimage@sha256:abc123"),
57-
parsedDockerfile.getDependencyImageNames()
58-
);
48+
assertThat(parsedDockerfile.getDependencyImageNames())
49+
.as("retains digests in image names")
50+
.isEqualTo(Sets.newHashSet("someimage@sha256:abc123"));
5951
}
6052

6153
@Test
6254
public void ignoringCommentedFromLines() {
6355
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
6456
Arrays.asList("FROM someimage", "#FROM somethingelse")
6557
);
66-
assertEquals(
67-
"ignores commented from lines",
68-
Sets.newHashSet("someimage"),
69-
parsedDockerfile.getDependencyImageNames()
70-
);
58+
assertThat(parsedDockerfile.getDependencyImageNames())
59+
.as("ignores commented from lines")
60+
.isEqualTo(Sets.newHashSet("someimage"));
7161
}
7262

7363
@Test
7464
public void ignoringBuildStageNames() {
7565
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
7666
Arrays.asList("FROM someimage --as=base", "RUN something", "FROM nextimage", "RUN something")
7767
);
78-
assertEquals(
79-
"ignores build stage names and allows multiple images to be extracted",
80-
Sets.newHashSet("someimage", "nextimage"),
81-
parsedDockerfile.getDependencyImageNames()
82-
);
68+
assertThat(parsedDockerfile.getDependencyImageNames())
69+
.as("ignores build stage names and allows multiple images to be extracted")
70+
.isEqualTo(Sets.newHashSet("someimage", "nextimage"));
8371
}
8472

8573
@Test
8674
public void ignoringPlatformArgs() {
8775
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
8876
Arrays.asList("FROM --platform=linux/amd64 someimage", "RUN something")
8977
);
90-
assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
78+
assertThat(parsedDockerfile.getDependencyImageNames())
79+
.as("ignores platform args")
80+
.isEqualTo(Sets.newHashSet("someimage"));
9181
}
9282

9383
@Test
9484
public void ignoringExtraPlatformArgs() {
9585
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
9686
Arrays.asList("FROM --platform=linux/amd64 --somethingelse=value someimage", "RUN something")
9787
);
98-
assertEquals("ignores platform args", Sets.newHashSet("someimage"), parsedDockerfile.getDependencyImageNames());
88+
assertThat(parsedDockerfile.getDependencyImageNames())
89+
.as("ignores platform args")
90+
.isEqualTo(Sets.newHashSet("someimage"));
9991
}
10092

10193
@Test
10294
public void handlesGracefullyIfNoFromLine() {
10395
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(
10496
Arrays.asList("RUN something", "# is this even a valid Dockerfile?")
10597
);
106-
assertEquals(
107-
"handles invalid Dockerfiles gracefully",
108-
Sets.newHashSet(),
109-
parsedDockerfile.getDependencyImageNames()
110-
);
98+
assertThat(parsedDockerfile.getDependencyImageNames())
99+
.as("handles invalid Dockerfiles gracefully")
100+
.isEqualTo(Sets.newHashSet());
111101
}
112102

113103
@Test
114104
public void handlesGracefullyIfDockerfileNotFound() {
115105
final ParsedDockerfile parsedDockerfile = new ParsedDockerfile(Paths.get("nonexistent.Dockerfile"));
116-
assertEquals(
117-
"handles missing Dockerfiles gracefully",
118-
Sets.newHashSet(),
119-
parsedDockerfile.getDependencyImageNames()
120-
);
106+
assertThat(parsedDockerfile.getDependencyImageNames())
107+
.as("handles missing Dockerfiles gracefully")
108+
.isEqualTo(Sets.newHashSet());
121109
}
122110
}

0 commit comments

Comments
 (0)