Merge branch 'assertj'

jqno · Dec 19, 2024 · 5a8f5d8 · 5a8f5d8
2 parents 6ec9bc6 + b871d6c
commit 5a8f5d8
Show file tree

Hide file tree

Showing 145 changed files with 1,909 additions and 1,923 deletions.
diff --git a/build/checkstyle-config.xml b/build/checkstyle-config.xml
@@ -50,7 +50,10 @@
             <property name="ignoreConstructorParameter" value="true"/>
         </module>
         <module name="HideUtilityClassConstructor"/>
-        <module name="IllegalImport"/>
+        <module name="IllegalImport">
+            <property name="illegalClasses" value="org\.junit\.jupiter\.api\.Assertions\..*"/>
+            <property name="regexp" value="true"/>
+        </module>
         <module name="IllegalThrows"/>
         <module name="IllegalToken">
             <property name="tokens" value="INC,DEC,BSR,BSR_ASSIGN,SL,SL_ASSIGN,SR,SR_ASSIGN"/>

diff --git a/...src/test/java/nl/jqno/equalsverifier/integration/extended_contract/JavaFxClassesTest.java b/...src/test/java/nl/jqno/equalsverifier/integration/extended_contract/JavaFxClassesTest.java
@@ -25,40 +25,40 @@
 
 // CHECKSTYLE OFF: ParameterNumber
 
-public class JavaFxClassesTest {
+class JavaFxClassesTest {
 
     @Test
-    public void successfullyInstantiatesAJavaFxClass_whenJavaFxIsAvailable() {
+    void successfullyInstantiatesAJavaFxClass_whenJavaFxIsAvailable() {
         EqualsVerifier.forClass(JavaFxApiClassesContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtObservableListFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtObservableListFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxObservableListContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtObservableMapFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtObservableMapFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxObservableMapContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtObservableSetFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtObservableSetFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxObservableSetContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtListPropertyFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtListPropertyFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxListPropertyContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtMapPropertyFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtMapPropertyFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxMapPropertyContainer.class).verify();
     }
 
     @Test
-    public void succeed_whenEqualsLooksAtSetPropertyFieldsGenericContent() {
+    void succeed_whenEqualsLooksAtSetPropertyFieldsGenericContent() {
         EqualsVerifier.forClass(JavaFxSetPropertyContainer.class).verify();
     }
 

diff --git a/equalsverifier-16/pom.xml b/equalsverifier-16/pom.xml
@@ -29,5 +29,11 @@
             <version>${version.junit-jupiter}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${version.assertj}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...java/nl/jqno/equalsverifier/integration/extended_contract/InstanceofPatternMatchTest.java b/...java/nl/jqno/equalsverifier/integration/extended_contract/InstanceofPatternMatchTest.java
@@ -4,7 +4,7 @@
 import nl.jqno.equalsverifier.internal.testhelpers.Util;
 import org.junit.jupiter.api.Test;
 
-public class InstanceofPatternMatchTest {
+class InstanceofPatternMatchTest {
 
     @Test
     void succeed_whenEqualsUsesInstanceofPatternMatch() {

diff --git a/...l/jqno/equalsverifier/integration/extended_contract/PrefabValuesForFieldInRecordTest.java b/...l/jqno/equalsverifier/integration/extended_contract/PrefabValuesForFieldInRecordTest.java
@@ -4,31 +4,31 @@
 import nl.jqno.equalsverifier.internal.testhelpers.ExpectedException;
 import org.junit.jupiter.api.Test;
 
-public class PrefabValuesForFieldInRecordTest {
+class PrefabValuesForFieldInRecordTest {
 
     @Test
-    public void fail_whenRecordHasSinglePrecondition() {
+    void fail_whenRecordHasSinglePrecondition() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(SinglePrecondition.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record:", "failed to run constructor", "[1]");
     }
 
     @Test
-    public void succeed_whenRecordHasSinglePrecondition_givenPrefabValuesForField() {
+    void succeed_whenRecordHasSinglePrecondition_givenPrefabValuesForField() {
         EqualsVerifier.forClass(SinglePrecondition.class).withPrefabValuesForField("i", 111, 142).verify();
     }
 
     @Test
-    public void fail_whenRecordHasDualPrecondition() {
+    void fail_whenRecordHasDualPrecondition() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(DualPrecondition.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record:", "failed to run constructor", "[1, 1]");
     }
 
     @Test
-    public void fail_whenRecordHasDualPrecondition_givenPrefabValuesForOnlyOneField() {
+    void fail_whenRecordHasDualPrecondition_givenPrefabValuesForOnlyOneField() {
         ExpectedException
                 .when(
                     () -> EqualsVerifier
@@ -40,7 +40,7 @@ public void fail_whenRecordHasDualPrecondition_givenPrefabValuesForOnlyOneField(
     }
 
     @Test
-    public void succeed_whenRecordHasDualPrecondition_givenPrefabValueForBothFields() {
+    void succeed_whenRecordHasDualPrecondition_givenPrefabValueForBothFields() {
         EqualsVerifier
                 .forClass(DualPrecondition.class)
                 .withPrefabValuesForField("x", 111, 142)

diff --git a/...er-16/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/RecordsTest.java b/...er-16/src/test/java/nl/jqno/equalsverifier/integration/extended_contract/RecordsTest.java
@@ -1,8 +1,7 @@
 package nl.jqno.equalsverifier.integration.extended_contract;
 
 import static nl.jqno.equalsverifier.internal.testhelpers.Util.defaultEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.Serializable;
 import java.util.Objects;
@@ -13,129 +12,129 @@
 import nl.jqno.equalsverifier.internal.versionspecific.RecordsHelper;
 import org.junit.jupiter.api.Test;
 
-public class RecordsTest {
+class RecordsTest {
 
     @Test
-    public void sanityCheckForRecordsHelper() {
-        assertTrue(RecordsHelper.isRecord(SimpleRecord.class));
-        assertFalse(RecordsHelper.isRecord(String.class));
+    void sanityCheckForRecordsHelper() {
+        assertThat(RecordsHelper.isRecord(SimpleRecord.class)).isTrue();
+        assertThat(RecordsHelper.isRecord(String.class)).isFalse();
     }
 
     @Test
-    public void succeed_whenClassIsARecord() {
+    void succeed_whenClassIsARecord() {
         EqualsVerifier.forClass(SimpleRecord.class).verify();
     }
 
     @Test
-    public void succeed_whenClassIsAPrivateRecord() {
+    void succeed_whenClassIsAPrivateRecord() {
         EqualsVerifier.forClass(PrivateSimpleRecord.class).verify();
     }
 
     @Test
-    public void fail_whenConstructorChecksNull() {
+    void fail_whenConstructorChecksNull() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(NullCheckingRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record:", "failed to run constructor", "Warning.NULL_FIELDS");
     }
 
     @Test
-    public void succeed_whenConstructorChecksNull_givenSuppressedWarning() {
+    void succeed_whenConstructorChecksNull_givenSuppressedWarning() {
         EqualsVerifier.forClass(NullCheckingRecord.class).suppress(Warning.NULL_FIELDS).verify();
     }
 
     @Test
-    public void fail_whenConstructorChecksValue() {
+    void fail_whenConstructorChecksValue() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(ValueCheckingRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record:", "failed to run constructor", "prefab values");
     }
 
     @Test
-    public void fail_whenRecordInvariantIsViolated_givenIntFieldIsModifiedInConstructor() {
+    void fail_whenRecordInvariantIsViolated_givenIntFieldIsModifiedInConstructor() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(BrokenInvariantIntFieldRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record invariant", "intField");
     }
 
     @Test
-    public void fail_whenRecordInvariantIsViolated_givenStringFieldIsModifiedInConstructor() {
+    void fail_whenRecordInvariantIsViolated_givenStringFieldIsModifiedInConstructor() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(BrokenInvariantStringFieldRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record invariant", "stringField");
     }
 
     @Test
-    public void fail_whenRecordInvariantIsViolated_givenBothFieldsAreModifiedInConstructor() {
+    void fail_whenRecordInvariantIsViolated_givenBothFieldsAreModifiedInConstructor() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(BrokenInvariantBothRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record invariant", "intField", "stringField");
     }
 
     @Test
-    public void succeed_whenRecordImplementsItsOwnEquals() {
+    void succeed_whenRecordImplementsItsOwnEquals() {
         EqualsVerifier.forClass(EqualsRecord.class).verify();
     }
 
     @Test
-    public void fail_whenRecordImplementsItsOwnEquals_givenNotAllFieldsAreUsed() {
+    void fail_whenRecordImplementsItsOwnEquals_givenNotAllFieldsAreUsed() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(NotAllFieldsRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Significant fields");
     }
 
     @Test
-    public void fail_whenRecordConstructorThrows() {
+    void fail_whenRecordConstructorThrows() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(ThrowingConstructorRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record", "failed to run constructor");
     }
 
     @Test
-    public void fail_whenRecordConstructorThrowsNpe() {
+    void fail_whenRecordConstructorThrowsNpe() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(NullFieldRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record", "failed to run constructor");
     }
 
     @Test
-    public void fail_whenRecordAccessorThrows() {
+    void fail_whenRecordAccessorThrows() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(ThrowingAccessorRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record", "failed to run accessor method");
     }
 
     @Test
-    public void fail_whenRecordAccessorThrowsNpe() {
+    void fail_whenRecordAccessorThrowsNpe() {
         ExpectedException
                 .when(() -> EqualsVerifier.forClass(NullAccessorRecord.class).verify())
                 .assertFailure()
                 .assertMessageContains("Record", "failed to run accessor method", "s()");
     }
 
     @Test
-    public void succeed_whenRecordContainsStaticField() {
+    void succeed_whenRecordContainsStaticField() {
         EqualsVerifier.forClass(StaticFieldRecord.class).verify();
     }
 
     @Test
-    public void succeed_whenRecordValidatesInput_givenValidPrefabValues() {
+    void succeed_whenRecordValidatesInput_givenValidPrefabValues() {
         EqualsVerifier
                 .forClass(ValidatingConstructorRecord.class)
                 .withPrefabValues(String.class, "valid-1", "valid-2")
                 .verify();
     }
 
     @Test
-    public void succeed_whenRecordHasBoundedWildcardGeneric() {
+    void succeed_whenRecordHasBoundedWildcardGeneric() {
         EqualsVerifier.forClass(WildcardGenericRecordContainer.class).verify();
     }
 

diff --git a/...rc/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java b/...rc/test/java/nl/jqno/equalsverifier/internal/instantiation/RecordInstanceCreatorTest.java
@@ -1,6 +1,6 @@
 package nl.jqno.equalsverifier.internal.instantiation;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;
@@ -10,10 +10,10 @@
 import org.junit.jupiter.api.Test;
 import org.objenesis.ObjenesisStd;
 
-public class RecordInstanceCreatorTest {
+class RecordInstanceCreatorTest {
 
     @Test
-    public void instanceCreator() throws NoSuchFieldException {
+    void instanceCreator() throws NoSuchFieldException {
         ClassProbe<SomeRecord> probe = ClassProbe.of(SomeRecord.class);
         InstanceCreator<SomeRecord> sut = new InstanceCreator<>(probe, new ObjenesisStd());
 
@@ -25,9 +25,9 @@ public void instanceCreator() throws NoSuchFieldException {
 
         SomeRecord actual = sut.instantiate(values);
 
-        assertEquals(42, actual.x);
-        assertEquals(0, actual.y);
-        assertEquals("42", actual.z);
+        assertThat(actual.x).isEqualTo(42);
+        assertThat(actual.y).isEqualTo(0);
+        assertThat(actual.z).isEqualTo("42");
     }
 
     record SomeRecord(int x, int y, String z) {}

diff --git a/...fier/internal/instantiation/vintage/prefabvalues/factories/RecordFallbackFactoryTest.java b/...fier/internal/instantiation/vintage/prefabvalues/factories/RecordFallbackFactoryTest.java
@@ -1,8 +1,7 @@
 package nl.jqno.equalsverifier.internal.instantiation.vintage.prefabvalues.factories;
 
 import static nl.jqno.equalsverifier.internal.instantiation.vintage.prefabvalues.factories.Factories.values;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.LinkedHashSet;
 
@@ -15,14 +14,14 @@
 import org.objenesis.Objenesis;
 import org.objenesis.ObjenesisStd;
 
-public class RecordFallbackFactoryTest {
+class RecordFallbackFactoryTest {
 
     private FallbackFactory<?> factory;
     private VintageValueProvider valueProvider;
     private LinkedHashSet<TypeTag> typeStack;
 
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         Objenesis objenesis = new ObjenesisStd();
         factory = new FallbackFactory<>(objenesis);
         FactoryCache factoryCache = new FactoryCache();
@@ -32,11 +31,11 @@ public void setUp() {
     }
 
     @Test
-    public void redCopyHasTheSameValuesAsRed_whenSutContainsGenericValueThatNeedsToBeIdenticalInRedAndRedCopy() {
+    void redCopyHasTheSameValuesAsRed_whenSutContainsGenericValueThatNeedsToBeIdenticalInRedAndRedCopy() {
         Tuple<?> tuple = factory.createValues(new TypeTag(GenericRecordContainer.class), valueProvider, typeStack);
 
-        assertEquals(tuple.getRed(), tuple.getRedCopy());
-        assertNotSame(tuple.getRed(), tuple.getRedCopy());
+        assertThat(tuple.getRedCopy()).isEqualTo(tuple.getRed());
+        assertThat(tuple.getRedCopy()).isNotSameAs(tuple.getRed());
     }
 
     record GenericRecord<T>(T t) {}