Define assertExactEquals in a single place.

sjrd · sjrd · commit 22874572f68c · 2025-06-30T21:57:35.000+02:00
diff --git a/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/DoubleTest.scala b/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/DoubleTest.scala
@@ -16,13 +16,9 @@ import org.junit.Test
 import org.junit.Assert._
 import org.junit.Assume._
 
-class DoubleTest {
-  final def assertExactEquals(expected: Double, actual: Double): Unit =
-    assertTrue(s"expected: $expected; actual: $actual", expected.equals(actual))
-
-  final def assertExactEquals(msg: String, expected: Float, actual: Float): Unit =
-    assertTrue(s"$msg; expected: $expected; actual: $actual", expected.equals(actual))
+import org.scalajs.testsuite.utils.AssertExtensions.assertExactEquals
 
+class DoubleTest {
   @Test
   def `toInt`(): Unit = {
     @inline
diff --git a/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/FloatTest.scala b/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/FloatTest.scala
@@ -15,13 +15,9 @@ package org.scalajs.testsuite.compiler
 import org.junit.Test
 import org.junit.Assert._
 
-class FloatTest {
-  final def assertExactEquals(expected: Float, actual: Float): Unit =
-    assertTrue(s"expected: $expected; actual: $actual", expected.equals(actual))
-
-  final def assertExactEquals(expected: Double, actual: Double): Unit =
-    assertTrue(s"expected: $expected; actual: $actual", expected.equals(actual))
+import org.scalajs.testsuite.utils.AssertExtensions.assertExactEquals
 
+class FloatTest {
   @noinline def froundNotInlined(x: Double): Float =
     x.toFloat
 
diff --git a/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/LongTest.scala b/test-suite/shared/src/test/scala/org/scalajs/testsuite/compiler/LongTest.scala
@@ -16,6 +16,7 @@ import org.junit.Test
 import org.junit.Assert._
 import org.junit.Assume._
 
+import org.scalajs.testsuite.utils.AssertExtensions.assertExactEquals
 import org.scalajs.testsuite.utils.AssertThrows.assertThrows
 import org.scalajs.testsuite.utils.Platform._
 
@@ -36,12 +37,6 @@ class LongTest {
 
   // Helpers
 
-  final def assertExactEquals(expected: Float, actual: Float): Unit =
-    assertTrue(s"expected: $expected; actual: $actual", expected.equals(actual))
-
-  final def assertExactEquals(expected: Double, actual: Double): Unit =
-    assertTrue(s"expected: $expected; actual: $actual", expected.equals(actual))
-
   @noinline def hideFromOptimizer(x: Long): Long = x
 
   @noinline def hideDoubleFromOptimizer(x: Double): Double = x
diff --git a/test-suite/shared/src/test/scala/org/scalajs/testsuite/javalib/lang/MathTest.scala b/test-suite/shared/src/test/scala/org/scalajs/testsuite/javalib/lang/MathTest.scala
@@ -18,35 +18,15 @@ import org.junit.Assume._
 
 import java.lang.Math
 
+// Imported under different names for historical reasons
+import org.scalajs.testsuite.utils.AssertExtensions.{assertExactEquals => assertSameDouble}
+import org.scalajs.testsuite.utils.AssertExtensions.{assertExactEquals => assertSameFloat}
+
 import org.scalajs.testsuite.utils.AssertThrows.assertThrows
 import org.scalajs.testsuite.utils.Platform._
 
 class MathTest {
 
-  /** Like `assertEquals` with `delta = 0.0`, but positive and negative zeros
-   *  compare not equal.
-   */
-  private def assertSameDouble(expected: Double, actual: Double): Unit =
-    assertTrue(s"expected: $expected but was: $actual", expected.equals(actual))
-
-  /** Like `assertEquals` with `delta = 0.0`, but positive and negative zeros
-   *  compare not equal.
-   */
-  private def assertSameDouble(msg: String, expected: Double, actual: Double): Unit =
-    assertTrue(s"$msg; expected: $expected but was: $actual", expected.equals(actual))
-
-  /** Like `assertEquals` with `delta = 0.0f`, but positive and negative zeros
-   *  compare not equal.
-   */
-  private def assertSameFloat(expected: Float, actual: Float): Unit =
-    assertTrue(s"expected: $expected but was: $actual", expected.equals(actual))
-
-  /** Like `assertEquals` with `delta = 0.0f`, but positive and negative zeros
-   *  compare not equal.
-   */
-  private def assertSameFloat(msg: String, expected: Float, actual: Float): Unit =
-    assertTrue(s"$msg; expected: $expected but was: $actual", expected.equals(actual))
-
   @Test def absInt(): Unit = {
     assertEquals(0, Math.abs(0))
     assertEquals(156, Math.abs(156))
diff --git a/test-suite/shared/src/test/scala/org/scalajs/testsuite/utils/AssertExtensions.scala b/test-suite/shared/src/test/scala/org/scalajs/testsuite/utils/AssertExtensions.scala
@@ -0,0 +1,55 @@
+/*
+ * Scala.js (https://www.scala-js.org/)
+ *
+ * Copyright EPFL.
+ *
+ * Licensed under Apache License 2.0
+ * (https://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package org.scalajs.testsuite.utils
+
+import org.junit.Assert._
+
+object AssertExtensions {
+
+  /** Asserts that two Double values are exactly equal.
+   *
+   *  Positive and negative zeros compare as *not* equal. `NaN` compares
+   *  *equal* to itself.
+   */
+  @noinline
+  def assertExactEquals(expected: Double, actual: Double): Unit =
+    assertTrue(s"expected: $expected but was: $actual", expected.equals(actual))
+
+  /** Asserts that two Double values are exactly equal.
+   *
+   *  Positive and negative zeros compare as *not* equal. `NaN` compares
+   *  *equal* to itself.
+   */
+  @noinline
+  def assertExactEquals(msg: String, expected: Double, actual: Double): Unit =
+    assertTrue(s"$msg; expected: $expected but was: $actual", expected.equals(actual))
+
+  /** Asserts that two Float values are exactly equal.
+   *
+   *  Positive and negative zeros compare as *not* equal. `NaN` compares
+   *  *equal* to itself.
+   */
+  @noinline
+  def assertExactEquals(expected: Float, actual: Float): Unit =
+    assertTrue(s"expected: $expected but was: $actual", expected.equals(actual))
+
+  /** Asserts that two Float values are exactly equal.
+   *
+   *  Positive and negative zeros compare as *not* equal. `NaN` compares
+   *  *equal* to itself.
+   */
+  @noinline
+  def assertExactEquals(msg: String, expected: Float, actual: Float): Unit =
+    assertTrue(s"$msg; expected: $expected but was: $actual", expected.equals(actual))
+
+}
