Add more overloaded variants of assertEquals-methods

#1710

Author: Matthias Merdes

junit-jupiter-api/src/main/java/org/junit/jupiter/api/Assertions.java

@@ -287,14 +287,21 @@ public static void assertEquals(short expected, short actual) {
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 */
 	public static void assertEquals(short expected, Short actual) {
-		assertEquals((Short) expected, actual);
+		AssertEquals.assertEquals((Short) expected, actual);
 	}
 
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 */
 	public static void assertEquals(Short expected, short actual) {
-		assertEquals(expected, (Short) actual);
+		AssertEquals.assertEquals(expected, (Short) actual);
+	}
+
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 */
+	public static void assertEquals(Short expected, Short actual) {
+		AssertEquals.assertEquals(expected, actual);
 	}
 
 	/**
@@ -321,6 +328,14 @@ public static void assertEquals(Short expected, short actual, String message) {
 		AssertEquals.assertEquals(expected, (Short) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Short expected, Short actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
@@ -345,6 +360,14 @@ public static void assertEquals(Short expected, short actual, Supplier<String> m
 		AssertEquals.assertEquals(expected, (Short) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Short expected, Short actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 */
@@ -366,6 +389,13 @@ public static void assertEquals(Byte expected, byte actual) {
 		AssertEquals.assertEquals(expected, (Byte) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 */
+	public static void assertEquals(Byte expected, Byte actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Fails with the supplied failure {@code message}.
@@ -390,6 +420,14 @@ public static void assertEquals(Byte expected, byte actual, String message) {
 		AssertEquals.assertEquals(expected, (Byte) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Byte expected, Byte actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
@@ -414,6 +452,14 @@ public static void assertEquals(Byte expected, byte actual, Supplier<String> mes
 		AssertEquals.assertEquals(expected, (Byte) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Byte expected, Byte actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 */
@@ -435,6 +481,13 @@ public static void assertEquals(Integer expected, int actual) {
 		AssertEquals.assertEquals(expected, (Integer) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 */
+	public static void assertEquals(Integer expected, Integer actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Fails with the supplied failure {@code message}.
@@ -459,6 +512,14 @@ public static void assertEquals(Integer expected, int actual, String message) {
 		AssertEquals.assertEquals(expected, (Integer) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Integer expected, Integer actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
@@ -483,6 +544,14 @@ public static void assertEquals(Integer expected, int actual, Supplier<String> m
 		AssertEquals.assertEquals(expected, (Integer) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Integer expected, Integer actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 */
@@ -504,6 +573,13 @@ public static void assertEquals(Long expected, long actual) {
 		AssertEquals.assertEquals(expected, (Long) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 */
+	public static void assertEquals(Long expected, Long actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Fails with the supplied failure {@code message}.
@@ -528,6 +604,14 @@ public static void assertEquals(Long expected, long actual, String message) {
 		AssertEquals.assertEquals(expected, (Long) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Long expected, Long actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
@@ -552,6 +636,14 @@ public static void assertEquals(Long expected, long actual, Supplier<String> mes
 		AssertEquals.assertEquals(expected, (Long) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Long expected, Long actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
@@ -579,6 +671,15 @@ public static void assertEquals(Float expected, float actual) {
 		AssertEquals.assertEquals(expected, (Float) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
+	 * {@link Float#compare(float, float)}.
+	 */
+	public static void assertEquals(Float expected, Float actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
@@ -609,6 +710,16 @@ public static void assertEquals(Float expected, float actual, String message) {
 		AssertEquals.assertEquals(expected, (Float) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
+	 * {@link Float#compare(float, float)}.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Float expected, Float actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
@@ -639,6 +750,16 @@ public static void assertEquals(Float expected, float actual, Supplier<String> m
 		AssertEquals.assertEquals(expected, (Float) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
+	 * {@link Float#compare(float, float)}.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Float expected, Float actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal within the given non-negative {@code delta}.
 	 * <p>Equality imposed by this method is consistent with {@link Float#equals(Object)} and
@@ -695,6 +816,15 @@ public static void assertEquals(Double expected, double actual) {
 		AssertEquals.assertEquals(expected, (Double) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
+	 * {@link Double#compare(double, double)}.
+	 */
+	public static void assertEquals(Double expected, Double actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
@@ -725,6 +855,16 @@ public static void assertEquals(Double expected, double actual, String message)
 		AssertEquals.assertEquals(expected, (Double) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
+	 * {@link Double#compare(double, double)}.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Double expected, Double actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
@@ -755,6 +895,16 @@ public static void assertEquals(Double expected, double actual, Supplier<String>
 		AssertEquals.assertEquals(expected, (Double) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
+	 * {@link Double#compare(double, double)}.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Double expected, Double actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal within the given non-negative {@code delta}.
 	 * <p>Equality imposed by this method is consistent with {@link Double#equals(Object)} and
@@ -805,6 +955,13 @@ public static void assertEquals(Character expected, char actual) {
 		AssertEquals.assertEquals(expected, (Character) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 */
+	public static void assertEquals(Character expected, Character actual) {
+		AssertEquals.assertEquals(expected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>Fails with the supplied failure {@code message}.
@@ -829,6 +986,14 @@ public static void assertEquals(Character expected, char actual, String message)
 		AssertEquals.assertEquals(expected, (Character) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>Fails with the supplied failure {@code message}.
+	 */
+	public static void assertEquals(Character expected, Character actual, String message) {
+		AssertEquals.assertEquals(expected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
@@ -853,6 +1018,14 @@ public static void assertEquals(Character expected, char actual, Supplier<String
 		AssertEquals.assertEquals(expected, (Character) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
+	 * <p>If necessary, the failure message will be retrieved lazily from the supplied {@code messageSupplier}.
+	 */
+	public static void assertEquals(Character expected, Character actual, Supplier<String> messageSupplier) {
+		AssertEquals.assertEquals(expected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are equal.
 	 * <p>If both are {@code null}, they are considered equal.
@@ -1562,6 +1735,16 @@ public static void assertNotEquals(Integer unexpected, int actual) {
 		AssertNotEquals.assertNotEquals(unexpected, (Integer) actual);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
+	 *
+	 * @since 5.4
+	 */
+	@API(status = STABLE, since = "5.4")
+	public static void assertNotEquals(Integer unexpected, Integer actual) {
+		AssertNotEquals.assertNotEquals(unexpected, actual);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
 	 *
@@ -1598,6 +1781,18 @@ public static void assertNotEquals(Integer unexpected, int actual, String messag
 		AssertNotEquals.assertNotEquals(unexpected, (Integer) actual, message);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
+	 *
+	 * <p>Fails with the supplied failure {@code message}.
+	 *
+	 * @since 5.4
+	 */
+	@API(status = STABLE, since = "5.4")
+	public static void assertNotEquals(Integer unexpected, Integer actual, String message) {
+		AssertNotEquals.assertNotEquals(unexpected, actual, message);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
 	 *
@@ -1637,6 +1832,19 @@ public static void assertNotEquals(Integer unexpected, int actual, Supplier<Stri
 		AssertNotEquals.assertNotEquals(unexpected, (Integer) actual, messageSupplier);
 	}
 
+	/**
+	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
+	 *
+	 * <p>If necessary, the failure message will be retrieved lazily from the
+	 * supplied {@code messageSupplier}.
+	 *
+	 * @since 5.4
+	 */
+	@API(status = STABLE, since = "5.4")
+	public static void assertNotEquals(Integer unexpected, Integer actual, Supplier<String> messageSupplier) {
+		AssertNotEquals.assertNotEquals(unexpected, actual, messageSupplier);
+	}
+
 	/**
 	 * <em>Assert</em> that {@code expected} and {@code actual} are not equal.
 	 *