Merge pull request scala-js#4476 from sjrd/junit-assertequals-int

sjrd · web-flow · commit 87d9d38c63d9 · 2021-05-04T14:14:31.000+02:00
JUnit: Add Int overloads to assertEquals and assertNotEquals.
diff --git a/junit-runtime/src/main/scala/org/junit/Assert.scala b/junit-runtime/src/main/scala/org/junit/Assert.scala
@@ -74,6 +74,18 @@ object Assert {
     fail(s"$checkedMessage. Actual: $actual")
   }
 
+  // Not part of the JVM API: make sure to keep Ints instead of Longs
+  @noinline
+  def assertNotEquals(message: String, unexpected: Int, actual: Int): Unit = {
+    if (unexpected == actual)
+      failEquals(message, actual)
+  }
+
+  // Not part of the JVM API: make sure to keep Ints instead of Longs
+  @noinline
+  def assertNotEquals(unexpected: Int, actual: Int): Unit =
+    assertNotEquals(null, unexpected, actual)
+
   @noinline
   def assertNotEquals(message: String, unexpected: Long, actual: Long): Unit = {
     if (unexpected == actual)
@@ -115,6 +127,16 @@ object Assert {
         "floating-point numbers")
   }
 
+  // Not part of the JVM API: make sure to keep Ints instead of Longs
+  @noinline
+  def assertEquals(expected: Int, actual: Int): Unit =
+    assertEquals(null, expected, actual)
+
+  // Not part of the JVM API: make sure to keep Ints instead of Longs
+  @noinline
+  def assertEquals(message: String, expected: Int, actual: Int): Unit =
+    assertEquals(message, expected: Any, actual: Any)
+
   @noinline
   def assertEquals(expected: Long, actual: Long): Unit =
     assertEquals(null, expected, actual)
