Convert test base class to custom assertion to promote best practices

junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/AbstractEqualsAndHashCodeTests.java → junit-jupiter-api/src/testFixtures/java/org/junit/jupiter/api/EqualsAndHashCodeAssertions.java

@@ -13,14 +13,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Abstract base class for unit tests that wish to test
+ * Assertions for unit tests that wish to test
  * {@link Object#equals(Object)} and {@link Object#hashCode()}.
  *
  * @since 1.3
  */
-public abstract class AbstractEqualsAndHashCodeTests {
+public class EqualsAndHashCodeAssertions {
 
-	protected final <T> void assertEqualsAndHashCode(T equal1, T equal2, T different) {
+	private EqualsAndHashCodeAssertions() {
+	}
+
+	@SuppressWarnings("EqualsWithItself")
+	public static <T> void assertEqualsAndHashCode(T equal1, T equal2, T different) {
 		assertThat(equal1).isNotNull();
 		assertThat(equal2).isNotNull();
 		assertThat(different).isNotNull();

jupiter-tests/src/test/java/org/junit/jupiter/api/parallel/LockTests.java

@@ -11,19 +11,19 @@
 package org.junit.jupiter.api.parallel;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ;
 import static org.junit.jupiter.api.parallel.ResourceAccessMode.READ_WRITE;
 import static org.junit.jupiter.api.parallel.ResourceLocksProvider.Lock;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link Lock}.
  *
  * @since 5.12
  */
-class LockTests extends AbstractEqualsAndHashCodeTests {
+class LockTests {
 
 	@Test
 	void readWriteModeSetByDefault() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/ClassSelectorTests.java

@@ -12,8 +12,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -23,7 +23,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class ClassSelectorTests extends AbstractEqualsAndHashCodeTests {
+class ClassSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathResourceSelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -19,7 +20,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class ClasspathResourceSelectorTests extends AbstractEqualsAndHashCodeTests {
+class ClasspathResourceSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/ClasspathRootSelectorTests.java

@@ -10,9 +10,10 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import java.net.URI;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -21,7 +22,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class ClasspathRootSelectorTests extends AbstractEqualsAndHashCodeTests {
+class ClasspathRootSelectorTests {
 
 	@Test
 	void equalsAndHashCode() throws Exception {

platform-tests/src/test/java/org/junit/platform/engine/discovery/DirectorySelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -19,7 +20,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class DirectorySelectorTests extends AbstractEqualsAndHashCodeTests {
+class DirectorySelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/FilePositionTests.java

@@ -13,11 +13,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -31,7 +31,7 @@
  * @since 1.7
  */
 @DisplayName("FilePosition unit tests")
-class FilePositionTests extends AbstractEqualsAndHashCodeTests {
+class FilePositionTests {
 
 	@Test
 	@DisplayName("factory method preconditions")

platform-tests/src/test/java/org/junit/platform/engine/discovery/FileSelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -19,7 +20,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class FileSelectorTests extends AbstractEqualsAndHashCodeTests {
+class FileSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/MethodSelectorTests.java

@@ -12,10 +12,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.JUnitException;
 import org.junit.platform.commons.PreconditionViolationException;
@@ -26,7 +26,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class MethodSelectorTests extends AbstractEqualsAndHashCodeTests {
+class MethodSelectorTests {
 
 	private static final String TEST_CASE_NAME = TestCase.class.getName();
 

platform-tests/src/test/java/org/junit/platform/engine/discovery/ModuleSelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -19,7 +20,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class ModuleSelectorTests extends AbstractEqualsAndHashCodeTests {
+class ModuleSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedClassSelectorTests.java

@@ -12,10 +12,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.util.List;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -25,7 +25,7 @@
  * @since 1.6
  * @see DiscoverySelectorsTests
  */
-class NestedClassSelectorTests extends AbstractEqualsAndHashCodeTests {
+class NestedClassSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/NestedMethodSelectorTests.java

@@ -12,10 +12,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.util.List;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.commons.PreconditionViolationException;
 
@@ -25,7 +25,7 @@
  * @since 1.6
  * @see DiscoverySelectorsTests
  */
-class NestedMethodSelectorTests extends AbstractEqualsAndHashCodeTests {
+class NestedMethodSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/PackageSelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 
 /**
@@ -19,7 +20,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class PackageSelectorTests extends AbstractEqualsAndHashCodeTests {
+class PackageSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/UniqueIdSelectorTests.java

@@ -10,7 +10,8 @@
 
 package org.junit.platform.engine.discovery;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import org.junit.jupiter.api.Test;
 import org.junit.platform.engine.UniqueId;
 
@@ -20,7 +21,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class UniqueIdSelectorTests extends AbstractEqualsAndHashCodeTests {
+class UniqueIdSelectorTests {
 
 	@Test
 	void equalsAndHashCode() {

platform-tests/src/test/java/org/junit/platform/engine/discovery/UriSelectorTests.java

@@ -10,9 +10,10 @@
 
 package org.junit.platform.engine.discovery;
 
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
+
 import java.net.URI;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -21,7 +22,7 @@
  * @since 1.3
  * @see DiscoverySelectorsTests
  */
-class UriSelectorTests extends AbstractEqualsAndHashCodeTests {
+class UriSelectorTests {
 
 	@Test
 	void equalsAndHashCode() throws Exception {

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/AbstractTestSourceTests.java

@@ -23,7 +23,6 @@
 import java.io.Serializable;
 import java.util.stream.Stream;
 
-import org.junit.jupiter.api.AbstractEqualsAndHashCodeTests;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
 import org.junit.platform.engine.TestSource;
@@ -34,7 +33,7 @@
  *
  * @since 1.0
  */
-abstract class AbstractTestSourceTests extends AbstractEqualsAndHashCodeTests {
+abstract class AbstractTestSourceTests {
 
 	abstract Stream<? extends Serializable> createSerializableInstances() throws Exception;
 

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClassSourceTests.java

@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.io.Serializable;
 import java.net.URI;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSourceTests.java

@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 import static org.junit.platform.engine.support.descriptor.ClasspathResourceSource.CLASSPATH_SCHEME;
 
 import java.net.URI;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/CompositeTestSourceTests.java

@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.io.File;
 import java.util.ArrayList;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/DefaultUriSourceTests.java

@@ -13,6 +13,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.net.URI;
 import java.util.stream.Stream;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FilePositionTests.java

@@ -13,6 +13,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
 import java.util.stream.Stream;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/FileSystemSourceTests.java

@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.io.File;
 import java.util.stream.Stream;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/MethodSourceTests.java

@@ -14,6 +14,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;

platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java

@@ -12,6 +12,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.EqualsAndHashCodeAssertions.assertEqualsAndHashCode;
 
 import java.io.Serializable;
 import java.util.stream.Stream;