Polish EqualsAndHashCodeAssertions

Author: sbrannen

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

@@ -25,22 +25,27 @@ private EqualsAndHashCodeAssertions() {
 
 	@SuppressWarnings("EqualsWithItself")
 	public static <T> void assertEqualsAndHashCode(T equal1, T equal2, T different) {
+		// Prerequisites
 		assertThat(equal1).isNotNull();
 		assertThat(equal2).isNotNull();
 		assertThat(different).isNotNull();
-
 		assertThat(equal1).isNotSameAs(equal2);
-		assertThat(equal1).isNotNull();
+
+		// Are equal
+		assertThat(equal1).isEqualTo(equal1);
+		assertThat(equal1).isEqualTo(equal2);
+		assertThat(equal2).isEqualTo(equal1);
+
+		// Are not equal
+		assertThat(equal1).isNotEqualTo(null);
 		assertThat(equal1).isNotEqualTo(new Object());
 		assertThat(equal1).isNotEqualTo(different);
 		assertThat(different).isNotEqualTo(equal1);
 		assertThat(different).isNotEqualTo(equal2);
-		assertThat(equal1.hashCode()).isNotEqualTo(different.hashCode());
 
-		assertThat(equal1).isEqualTo(equal1);
-		assertThat(equal1).isEqualTo(equal2);
-		assertThat(equal2).isEqualTo(equal1);
-		assertThat(equal1.hashCode()).isEqualTo(equal2.hashCode());
+		// Hash codes
+		assertThat(equal1).hasSameHashCodeAs(equal2);
+		assertThat(equal1).doesNotHaveSameHashCodeAs(different);
 	}
 
 }