Skip to content

Commit 9e5bbdb

Browse files
botenbreukbotenbreuk
committed
Changed tests to use AssertJ for assertions
- Added assertj-core dependency. - Updated dependencies.
1 parent 3c8e983 commit 9e5bbdb

9 files changed

Lines changed: 90 additions & 85 deletions

File tree

‎pom.xml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
<commons-lang3.version>3.20.0</commons-lang3.version>
1717
<lombok.version>1.18.42</lombok.version>
1818
<gson.version>2.13.2</gson.version>
19-
<jackson.version>3.0.2</jackson.version>
19+
<jackson.version>3.0.4</jackson.version>
2020
<reflections.version>0.10.2</reflections.version>
2121

22-
<logback.version>1.5.21</logback.version>
22+
<logback.version>1.5.26</logback.version>
2323
<slf4j.version>2.0.17</slf4j.version>
2424

25-
<junit.version>6.0.1</junit.version>
25+
<junit.version>6.0.2</junit.version>
2626
<archunit.version>1.4.1</archunit.version>
27-
<dependency-check-maven.version>12.1.9</dependency-check-maven.version>
27+
<assertj.version>3.27.7</assertj.version>
28+
<dependency-check-maven.version>12.2.0</dependency-check-maven.version>
2829
</properties>
2930

3031
<dependencyManagement>
@@ -126,6 +127,12 @@
126127
<version>${archunit.version}</version>
127128
<scope>test</scope>
128129
</dependency>
130+
<dependency>
131+
<groupId>org.assertj</groupId>
132+
<artifactId>assertj-core</artifactId>
133+
<version>${assertj.version}</version>
134+
<scope>test</scope>
135+
</dependency>
129136
</dependencies>
130137

131138
<build>

‎src/test/java/nl/rdb/java_examples/api_version/ApiVersionTest.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package nl.rdb.java_examples.api_version;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertNotEquals;
3+
import static org.assertj.core.api.Assertions.assertThat;
54

65
import java.util.ArrayList;
76
import java.util.Collections;
@@ -23,8 +22,8 @@ void reverseOrderTest_shouldSucceed() {
2322

2423
Collections.reverse(versionConfigs);
2524

26-
assertEquals("1.2.0", versionConfigs.getFirst().getVersion());
27-
assertEquals("1.0.0", versionConfigs.getLast().getVersion());
25+
assertThat(versionConfigs.getFirst().getVersion()).isEqualTo("1.2.0");
26+
assertThat(versionConfigs.getLast().getVersion()).isEqualTo("1.0.0");
2827
}
2928

3029
@Test
@@ -38,8 +37,8 @@ void reverseOrderTest_shouldFail() {
3837

3938
Collections.reverse(versionConfigs);
4039

41-
assertNotEquals("1.2.0", versionConfigs.getFirst().getVersion());
42-
assertNotEquals("1.0.0", versionConfigs.getLast().getVersion());
40+
assertThat(versionConfigs.getFirst().getVersion()).isNotEqualTo("1.2.0");
41+
assertThat(versionConfigs.getLast().getVersion()).isNotEqualTo("1.0.0");
4342
}
4443

4544
@Test
@@ -60,8 +59,8 @@ void orderTest_withComparator_shouldSucceed() {
6059

6160
versionConfigs = versionConfigs.stream().sorted(new ApiVersionComparator()).toList();
6261

63-
assertEquals("0.1.0", versionConfigs.getFirst().getVersion());
64-
assertEquals("21", versionConfigs.getLast().getVersion());
62+
assertThat(versionConfigs.getFirst().getVersion()).isEqualTo("0.1.0");
63+
assertThat(versionConfigs.getLast().getVersion()).isEqualTo("21");
6564
}
6665

6766
@Test
@@ -82,7 +81,7 @@ void reverseOrderTest_withComparator_shouldSucceed() {
8281

8382
versionConfigs = versionConfigs.stream().sorted(new ApiVersionComparator().reversed()).toList();
8483

85-
assertEquals("21", versionConfigs.getFirst().getVersion());
86-
assertEquals("0.1.0", versionConfigs.getLast().getVersion());
84+
assertThat(versionConfigs.getFirst().getVersion()).isEqualTo("21");
85+
assertThat(versionConfigs.getLast().getVersion()).isEqualTo("0.1.0");
8786
}
8887
}

‎src/test/java/nl/rdb/java_examples/datetime/LocalDateTimeExampleTest.java‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package nl.rdb.java_examples.datetime;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertFalse;
5-
import static org.junit.jupiter.api.Assertions.assertTrue;
3+
import static org.assertj.core.api.Assertions.assertThat;
64

75
import java.lang.invoke.MethodHandles;
86
import java.time.LocalDate;
@@ -22,16 +20,16 @@ class LocalDateTimeExampleTest {
2220
@Test
2321
void fomatTest() {
2422
LocalDateTimeExample example = new LocalDateTimeExample(LocalDateTime.of(2019, Month.DECEMBER, 31, 8, 15, 0));
25-
assertEquals("2019-12-31 08:15:00", example.getOrdinaryYearFormat());
26-
assertEquals("2020-12-31 08:15:00", example.getWeekBasedYearFormat());
23+
assertThat(example.getOrdinaryYearFormat()).isEqualTo("2019-12-31 08:15:00");
24+
assertThat(example.getWeekBasedYearFormat()).isEqualTo("2020-12-31 08:15:00");
2725
}
2826

2927
@Test
3028
void testEquals() {
3129
LocalDateTime dateTime1 = LocalDateTime.of(2022, 11, 1, 10, 0);
3230
LocalDateTime dateTime2 = LocalDateTime.of(2022, 11, 1, 10, 0);
33-
assertTrue(dateTime1.equals(dateTime2));
34-
assertTrue(Objects.equals(dateTime1, dateTime2));
31+
assertThat(dateTime1.equals(dateTime2)).isTrue();
32+
assertThat(Objects.equals(dateTime1, dateTime2)).isTrue();
3533
}
3634

3735
@Test
@@ -42,7 +40,7 @@ void formatDateToString() {
4240
String expected = "2020-11-02 12:00:00";
4341
String actual = example.getOrdinaryYearFormat();
4442

45-
assertEquals(expected, actual);
43+
assertThat(actual).isEqualTo(expected);
4644
}
4745

4846
@Test
@@ -53,7 +51,7 @@ void parseDateToString() {
5351
LocalDateTime expected = LocalDateTime.of(2020, Month.NOVEMBER, 2, 14, 10);
5452
LocalDateTime actual = example.parse(time, "dd-MM-yyyy HH:mm");
5553

56-
assertEquals(expected, actual);
54+
assertThat(actual).isEqualTo(expected);
5755
}
5856

5957
@Test
@@ -78,39 +76,39 @@ void isBefore_localDate_nowIsBetween() {
7876
startCheck = LocalDate.now().minusDays(12);
7977
endCheck = LocalDate.now().plusDays(5);
8078

81-
assertTrue(inSameDateInterval(LocalDate.now(), LocalDate.now()));
79+
assertThat(inSameDateInterval(LocalDate.now(), LocalDate.now())).isTrue();
8280
}
8381

8482
@Test
8583
void isBefore_localDate_nowIsBefore() {
8684
startCheck = LocalDate.now().plusDays(1);
8785
endCheck = LocalDate.now().plusDays(5);
8886

89-
assertFalse(inSameDateInterval(LocalDate.now(), LocalDate.now()));
87+
assertThat(inSameDateInterval(LocalDate.now(), LocalDate.now())).isFalse();
9088
}
9189

9290
@Test
9391
void isBefore_localDate_nowIsAfter() {
9492
startCheck = LocalDate.now().minusDays(12);
9593
endCheck = LocalDate.now().minusDays(1);
9694

97-
assertFalse(inSameDateInterval(LocalDate.now(), LocalDate.now()));
95+
assertThat(inSameDateInterval(LocalDate.now(), LocalDate.now())).isFalse();
9896
}
9997

10098
@Test
10199
void isBefore_localDate_endIsEmpty() {
102100
startCheck = LocalDate.now().minusDays(12);
103101
endCheck = null;
104102

105-
assertTrue(inSameDateInterval(LocalDate.now(), LocalDate.now()));
103+
assertThat(inSameDateInterval(LocalDate.now(), LocalDate.now())).isTrue();
106104
}
107105

108106
@Test
109107
void isBefore_localDate_nowIsEmpty() {
110108
startCheck = LocalDate.now().minusDays(12);
111109
endCheck = LocalDate.now().plusDays(4);
112110

113-
assertTrue(inSameDateInterval(LocalDate.now(), null));
111+
assertThat(inSameDateInterval(LocalDate.now(), null)).isTrue();
114112
}
115113

116114
private boolean inSameDateInterval(LocalDate start1, LocalDate end1) {
@@ -152,7 +150,7 @@ void isBefore_localDate_nowIsBetween() {
152150
gStartCheck = LocalDate.now().minusDays(20);
153151
gEndCheck = LocalDate.now().plusDays(10);
154152

155-
assertTrue(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now()));
153+
assertThat(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now())).isTrue();
156154
}
157155

158156
@Test
@@ -163,7 +161,7 @@ void isBefore_localDate_isBetweenZg_notBetweenG() {
163161
gStartCheck = LocalDate.now().minusDays(20);
164162
gEndCheck = LocalDate.now().minusDays(10);
165163

166-
assertFalse(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now()));
164+
assertThat(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now())).isFalse();
167165
}
168166

169167
@Test
@@ -174,7 +172,7 @@ void isBefore_localDate_notBetweenZg_isBetweenG() {
174172
gStartCheck = LocalDate.now().minusDays(20);
175173
gEndCheck = LocalDate.now().plusDays(10);
176174

177-
assertFalse(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now()));
175+
assertThat(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now())).isFalse();
178176
}
179177

180178
@Test
@@ -185,7 +183,7 @@ void isBefore_localDate_isBetweenZg_notBetweenG_gEindIsNull() {
185183
gStartCheck = LocalDate.now().minusDays(20);
186184
gEndCheck = null;
187185

188-
assertFalse(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now()));
186+
assertThat(inZGSameDateInterval(LocalDate.now(), LocalDate.now()) && inGSameDateInterval(LocalDate.now(), LocalDate.now())).isFalse();
189187
}
190188

191189
private boolean inZGSameDateInterval(LocalDate start1, LocalDate end1) {
@@ -239,7 +237,7 @@ void isBefore_localDate_nowIsBetween() {
239237
gStartCheck = LocalDate.now().minusDays(20);
240238
gEndCheck = LocalDate.now().plusDays(10);
241239

242-
assertTrue(inZGSameDateInterval());
240+
assertThat(inZGSameDateInterval()).isTrue();
243241
}
244242

245243
@Test
@@ -250,7 +248,7 @@ void isBefore_localDate_nowIsBetween_startIsSame() {
250248
gStartCheck = LocalDate.now().minusDays(20);
251249
gEndCheck = LocalDate.now().plusDays(10);
252250

253-
assertTrue(inZGSameDateInterval());
251+
assertThat(inZGSameDateInterval()).isTrue();
254252
}
255253

256254
@Test
@@ -261,7 +259,7 @@ void isBefore_localDate_nowIsBetween_endIsSame() {
261259
gStartCheck = LocalDate.now().minusDays(20);
262260
gEndCheck = LocalDate.now();
263261

264-
assertTrue(inZGSameDateInterval());
262+
assertThat(inZGSameDateInterval()).isTrue();
265263
}
266264

267265
@Test
@@ -272,7 +270,7 @@ void isBefore_localDate_isBetweenZg_notBetweenG() {
272270
gStartCheck = LocalDate.now().minusDays(20);
273271
gEndCheck = LocalDate.now().minusDays(10);
274272

275-
assertFalse(inZGSameDateInterval());
273+
assertThat(inZGSameDateInterval()).isFalse();
276274
}
277275

278276
@Test
@@ -283,7 +281,7 @@ void isBefore_localDate_notBetweenZg_isBetweenG() {
283281
gStartCheck = LocalDate.now().minusDays(20);
284282
gEndCheck = LocalDate.now().plusDays(10);
285283

286-
assertFalse(inZGSameDateInterval());
284+
assertThat(inZGSameDateInterval()).isFalse();
287285
}
288286

289287
@Test
@@ -294,7 +292,7 @@ void isBefore_localDate_isBetweenZg_notBetweenG_gEindIsNull() {
294292
gStartCheck = LocalDate.now().minusDays(20);
295293
gEndCheck = null;
296294

297-
assertFalse(inZGSameDateInterval());
295+
assertThat(inZGSameDateInterval()).isFalse();
298296
}
299297

300298
private boolean inZGSameDateInterval() {

‎src/test/java/nl/rdb/java_examples/enums/EnumsTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package nl.rdb.java_examples.enums;
22

3-
import static org.junit.jupiter.api.Assertions.assertFalse;
3+
import static org.assertj.core.api.Assertions.assertThat;
44
import static org.junit.jupiter.api.Assertions.assertThrows;
5-
import static org.junit.jupiter.api.Assertions.assertTrue;
65

76
import org.junit.jupiter.api.Test;
87

@@ -11,10 +10,10 @@ class EnumsTest {
1110
@Test
1211
void equalityCheck() {
1312
assertThrows(NullPointerException.class, () -> getEnum(true).equals(TestEnum.VALUE_ONE));
14-
assertTrue(getEnum(false).equals(TestEnum.VALUE_ONE));
1513

16-
assertFalse(getEnum(true) == TestEnum.VALUE_ONE);
17-
assertTrue(getEnum(false) == TestEnum.VALUE_ONE);
14+
assertThat(getEnum(false)).isEqualTo(TestEnum.VALUE_ONE);
15+
assertThat(getEnum(true)).isNotEqualTo(TestEnum.VALUE_ONE);
16+
assertThat(getEnum(false)).isEqualTo(TestEnum.VALUE_ONE);
1817
}
1918

2019
private TestEnum getEnum(boolean shouldReturnNull) {

‎src/test/java/nl/rdb/java_examples/equals/EqualsTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package nl.rdb.java_examples.equals;
22

3-
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertFalse;
5-
import static org.junit.jupiter.api.Assertions.assertTrue;
3+
import static org.assertj.core.api.Assertions.assertThat;
64

75
import java.util.ArrayList;
86
import java.util.List;
@@ -26,12 +24,13 @@ void equalsListTest() {
2624
testObjects.add(new TestObject("test1", List.of(testListObject1)));
2725
testObjects2.add(new TestObject("test1", List.of(testListObject2)));
2826

29-
assertEquals(testObjects, testObjects2);
27+
assertThat(testObjects2).isEqualTo(testObjects);
3028
}
3129

3230
@Getter
3331
@EqualsAndHashCode
3432
private class TestObject {
33+
3534
private final String name;
3635
private final List<TestListObject> objs;
3736

@@ -44,6 +43,7 @@ public TestObject(String name, List<TestListObject> objs) {
4443
@Getter
4544
@EqualsAndHashCode
4645
private class TestListObject {
46+
4747
@EqualsAndHashCode.Exclude
4848
private final String name;
4949
private final int age;
@@ -60,22 +60,22 @@ class EqualsStringTest {
6060
@Test
6161
void testStringEquals() {
6262
String test = "test";
63-
assertTrue(test.equals("test"));
64-
assertTrue(test == "test");
63+
assertThat(test.equals("test")).isTrue();
64+
assertThat(test == "test").isTrue();
6565

6666
String test2 = "test";
67-
assertTrue(test.equals(test2));
68-
assertTrue(test == test2);
67+
assertThat(test.equals(test2)).isTrue();
68+
assertThat(test == test2).isTrue();
6969

7070
test = test2;
71-
assertTrue(test.equals(test2));
72-
assertTrue(test == test2);
71+
assertThat(test.equals(test2)).isTrue();
72+
assertThat(test == test2).isTrue();
7373

7474
String test3 = test;
75-
assertTrue(test.equals(test2));
76-
assertTrue(test.equals(test3));
77-
assertTrue(test == test2);
78-
assertTrue(test == test3);
75+
assertThat(test.equals(test2)).isTrue();
76+
assertThat(test.equals(test3)).isTrue();
77+
assertThat(test == test2).isTrue();
78+
assertThat(test == test3).isTrue();
7979
}
8080

8181
// Test based on example in https://www.delftstack.com/howto/java/java-string-equals-vs-/
@@ -84,10 +84,10 @@ void testStringEquals_withStringConstructor() {
8484
String str1 = "name";
8585
String str2 = "name";
8686
String str3 = new String("name");
87-
assertTrue(str1.equals(str2));
88-
assertTrue(str1 == str2);
89-
assertTrue(str1.equals(str3));
90-
assertFalse(str3 == str1);
87+
assertThat(str1.equals(str2)).isTrue();
88+
assertThat(str1 == str2).isTrue();
89+
assertThat(str1.equals(str3)).isTrue();
90+
assertThat(str3 == str1).isFalse();
9191
}
9292
}
9393
}

0 commit comments

Comments
 (0)