Skip to content

Commit 77ebac8

Browse files
jqnojqno
authored
Merge pull request #1031 from timtebeek/assertj-best-practices
Apply AssertJ best practices
2 parents 5a8f5d8 + 6004455 commit 77ebac8

14 files changed

Lines changed: 35 additions & 37 deletions

File tree

‎equalsverifier-16/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/RecordObjectAccessorCopyingTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ void copyHappyPath() {
1818
Object original = instantiate(SimpleRecord.class);
1919
Object copy = copyOf(original);
2020

21-
assertThat(copy).isNotSameAs(original);
22-
assertThat(copy).isEqualTo(original);
21+
assertThat(copy).isNotSameAs(original).isEqualTo(original);
2322
}
2423

2524
@Test

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/MultipleTypeEqualsVerifierTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void succeed_whenCallingForPackageRecursivelyOnAPackageContainingFailingClasses_
241241
void succeed_whenReportingOnSeveralCorrectClasses() {
242242
List<EqualsVerifierReport> reports = EqualsVerifier.forClasses(A.class, B.class, C.class).report();
243243

244-
assertThat(reports.size()).isEqualTo(3);
244+
assertThat(reports).hasSize(3);
245245
assertSuccessful(reports.get(0), A.class);
246246
assertSuccessful(reports.get(1), B.class);
247247
assertSuccessful(reports.get(2), C.class);
@@ -251,7 +251,7 @@ void succeed_whenReportingOnSeveralCorrectClasses() {
251251
void fail_whenReportingOnOneIncorrectClass() {
252252
List<EqualsVerifierReport> reports = EqualsVerifier.forClasses(A.class, IncorrectM.class, C.class).report();
253253

254-
assertThat(reports.size()).isEqualTo(3);
254+
assertThat(reports).hasSize(3);
255255
assertSuccessful(reports.get(0), A.class);
256256
assertSuccessful(reports.get(2), C.class);
257257
assertUnsuccessful(reports.get(1), IncorrectM.class, "Subclass: equals is not final.");
@@ -262,7 +262,7 @@ void fail_whenReportingOnTwoIncorrectClasses() {
262262
List<EqualsVerifierReport> reports =
263263
EqualsVerifier.forClasses(A.class, IncorrectM.class, C.class, IncorrectN.class).report();
264264

265-
assertThat(reports.size()).isEqualTo(4);
265+
assertThat(reports).hasSize(4);
266266
assertSuccessful(reports.get(0), A.class);
267267
assertSuccessful(reports.get(2), C.class);
268268
assertUnsuccessful(reports.get(1), IncorrectM.class, "Subclass: equals is not final.");

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/OriginalStateTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void allValuesReturnToOriginalState_whenEqualsVerifierIsFinishedWithException()
5353
}
5454
catch (AssertionError e) {
5555
// Make sure EV fails on a check that actually mutates fields.
56-
assertThat(e.getMessage().contains("Mutability")).isTrue();
56+
assertThat(e.getMessage()).contains("Mutability");
5757
}
5858
catch (Throwable ignored) {
5959
fail("EqualsVerifier should have failed on FailingEqualsContainerContainer with a different exception.");

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/integration/operational/ReportTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ void isEmptyWhenClassIsCorrect() {
1818

1919
assertThat(report.getType()).isEqualTo(FinalPoint.class);
2020
assertThat(report.isSuccessful()).isTrue();
21-
assertThat(report.getMessage()).isEqualTo("");
21+
assertThat(report.getMessage()).isEmpty();
2222
assertThat(report.getCause()).isNull();
2323
}
2424

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/EqualsVerifierInternalBugExceptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private void assertMessagePreamble() {
6060
}
6161

6262
private void assertNoCause() {
63-
assertThat(actual.getCause()).isEqualTo(null);
63+
assertThat(actual.getCause()).isNull();
6464
}
6565

6666
private void assertCause(Throwable cause) {

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/NoValueExceptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ class NoValueExceptionTest {
1111
void description() {
1212
TypeTag tag = new TypeTag(String.class);
1313
NoValueException e = new NoValueException(tag);
14-
assertThat(e.getDescription().contains("String")).isTrue();
14+
assertThat(e.getDescription()).contains("String");
1515
}
1616
}

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/exceptions/RecursionExceptionTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ void descriptionContainsAllTypes() {
2020
String message = new RecursionException(stack).getDescription();
2121

2222
for (TypeTag tag : stack) {
23-
assertThat(message.contains(tag.toString())).isTrue();
23+
assertThat(message).contains(tag.toString());
2424
}
2525
}
2626
}

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/SubjectCreatorTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ void copy() {
163163
SomeClass original = new SomeClass(I_RED, I_RED, S_RED);
164164
actual = sut.copy(original);
165165

166-
assertThat(actual).isEqualTo(expected);
167-
assertThat(actual).isNotSameAs(expected);
166+
assertThat(actual).isEqualTo(expected).isNotSameAs(expected);
168167
}
169168

170169
@Test

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/VintageValueProviderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void sanityTestFactoryIncreasesStringLength() {
4646
@Test
4747
void provide() {
4848
Optional<Tuple<Point>> actual = vp.provide(POINT_TAG);
49-
assertThat(actual.get()).isEqualTo(Tuple.of(new Point(42, 42), new Point(1337, 1337), new Point(42, 42)));
49+
assertThat(actual).contains(Tuple.of(new Point(42, 42), new Point(1337, 1337), new Point(42, 42)));
5050
}
5151

5252
@Test

‎equalsverifier-core/src/test/java/nl/jqno/equalsverifier/internal/instantiation/vintage/reflection/InPlaceObjectAccessorScramblingTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ void scramblePrivateFinalPoint() {
114114
void scrambleNestedGenerics() {
115115
GenericContainerContainer foo = new GenericContainerContainer();
116116

117-
assertThat(foo.strings.ts.isEmpty()).isTrue();
118-
assertThat(foo.points.ts.isEmpty()).isTrue();
117+
assertThat(foo.strings.ts).isEmpty();
118+
assertThat(foo.points.ts).isEmpty();
119119

120120
doScramble(foo);
121121

122-
assertThat(foo.strings.ts.isEmpty()).isFalse();
122+
assertThat(foo.strings.ts).isNotEmpty();
123123
assertThat(foo.strings.ts.get(0).getClass()).isEqualTo(String.class);
124-
assertThat(foo.points.ts.isEmpty()).isFalse();
124+
assertThat(foo.points.ts).isNotEmpty();
125125
assertThat(foo.points.ts.get(0).getClass()).isEqualTo(Point.class);
126126
}
127127

0 commit comments

Comments
 (0)