From 9706e0a20d82b3655e471d5498221cb0bedf9d3a Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Fri, 4 Sep 2020 14:01:16 +0200 Subject: [PATCH 1/9] Add assertEquals for Floats and Doubles --- .../src/main/scala/munit/Assertions.scala | 20 +++ .../scala/munit/DoubleAssertionsSuite.scala | 126 ++++++++++++++++++ 2 files changed, 146 insertions(+) create mode 100644 tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala diff --git a/munit/shared/src/main/scala/munit/Assertions.scala b/munit/shared/src/main/scala/munit/Assertions.scala index 72dee803..688b8e0c 100644 --- a/munit/shared/src/main/scala/munit/Assertions.scala +++ b/munit/shared/src/main/scala/munit/Assertions.scala @@ -120,6 +120,26 @@ trait Assertions extends MacroCompat.CompileErrorMacro { } } + /** + * Asserts that two doubles or floats are equal to within a positive delta. + * If the expected value is infinity then the delta value is ignored. + * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *) passes + */ + def assertEquals( + obtained: Double, + expected: Double, + delta: Double, + clue: => Any = "values are not the same" + )(implicit loc: Location): Unit = { + StackTraces.dropInside { + val exactlyTheSame = java.lang.Double.compare(expected, obtained) == 0 + val almostTheSame = Math.abs(expected - obtained) <= delta + if (!exactlyTheSame && !almostTheSame) { + fail(munitPrint(clue)) + } + } + } + def intercept[T <: Throwable]( body: => Any )(implicit T: ClassTag[T], loc: Location): T = { diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala new file mode 100644 index 00000000..3be94f28 --- /dev/null +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala @@ -0,0 +1,126 @@ +package munit + +class DoubleAssertionsSuite extends BaseSuite { + test("Assert Equals NaN Fails") { + try { + assertEquals(1.234, Double.NaN, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert NaN Equals Fails") { + try { + assertEquals(Double.NaN, 1.234, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert NaN Equals NaN") { + assertEquals(Double.NaN, Double.NaN, 0.0) + } + + test("Assert Pos Infinity Not Equals Neg Infinity") { + try { + assertEquals(Double.PositiveInfinity, Double.NegativeInfinity, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert Pos Infinity Not Equals") { + try { + assertEquals(Double.PositiveInfinity, 1.23, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert Pos Infinity Equals Infinity") { + assertEquals(Double.PositiveInfinity, Double.PositiveInfinity, 0.0) + } + + test("Assert Neg Infinity Equals Infinity") { + assertEquals(Double.NegativeInfinity, Double.NegativeInfinity, 0.0) + } + + test("All Infinities") { + try { + assertEquals( + Double.PositiveInfinity, + Double.NegativeInfinity, + Double.PositiveInfinity + ) + fail("unexpected") + } catch { + case _: FailException => + } + } + + // And now, the same with floats... + test("Assert Equals NaN Fails") { + try { + assertEquals(1.234f, Float.NaN, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert NaN Equals Fails") { + try { + assertEquals(Float.NaN, 1.234f, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert NaN Equals NaN") { + assertEquals(Float.NaN, Float.NaN, 0.0) + } + + test("Assert Pos Infinity Not Equals Neg Infinity") { + try { + assertEquals(Float.PositiveInfinity, Float.NegativeInfinity, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert Pos Infinity Not Equals") { + try { + assertEquals(Float.PositiveInfinity, 1.23f, 0.0) + fail("unexpected") + } catch { + case _: FailException => + } + } + + test("Assert Pos Infinity Equals Infinity") { + assertEquals(Float.PositiveInfinity, Float.PositiveInfinity, 0.0) + } + + test("Assert Neg Infinity Equals Infinity") { + assertEquals(Float.NegativeInfinity, Float.NegativeInfinity, 0.0) + } + + test("All Infinities") { + try { + assertEquals( + Float.PositiveInfinity, + Float.NegativeInfinity, + Float.PositiveInfinity + ) + fail("unexpected") + } catch { + case _: FailException => + } + } +} From bdf16b8f2f85015f9ba006fd61c0b489f51ebed7 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Fri, 4 Sep 2020 14:14:41 +0200 Subject: [PATCH 2/9] scalac doesn't like overloaded methods w/ defaults So we have to do the default by hand. If some scaladocs guru knows how to use @see with full method signature to deduplicate the documentation in this case... Good for him! --- .../src/main/scala/munit/Assertions.scala | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/munit/shared/src/main/scala/munit/Assertions.scala b/munit/shared/src/main/scala/munit/Assertions.scala index 688b8e0c..82017701 100644 --- a/munit/shared/src/main/scala/munit/Assertions.scala +++ b/munit/shared/src/main/scala/munit/Assertions.scala @@ -123,13 +123,27 @@ trait Assertions extends MacroCompat.CompileErrorMacro { /** * Asserts that two doubles or floats are equal to within a positive delta. * If the expected value is infinity then the delta value is ignored. - * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *) passes + * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *) passes. + */ + def assertEquals( + obtained: Double, + expected: Double, + delta: Double + )(implicit loc: Location): Unit = { + val defaultClue = "values are not the same" + assertEquals(obtained, expected, delta, defaultClue) + } + + /** + * Asserts that two doubles or floats are equal to within a positive delta. + * If the expected value is infinity then the delta value is ignored. + * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *, *) passes. */ def assertEquals( obtained: Double, expected: Double, delta: Double, - clue: => Any = "values are not the same" + clue: => Any )(implicit loc: Location): Unit = { StackTraces.dropInside { val exactlyTheSame = java.lang.Double.compare(expected, obtained) == 0 From 3a91f2208f0d8f7b5955448d54872592c7176b15 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 5 Sep 2020 11:55:18 +0200 Subject: [PATCH 3/9] Print expected and obtained value in error message --- munit/shared/src/main/scala/munit/Assertions.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/munit/shared/src/main/scala/munit/Assertions.scala b/munit/shared/src/main/scala/munit/Assertions.scala index 82017701..49978f5e 100644 --- a/munit/shared/src/main/scala/munit/Assertions.scala +++ b/munit/shared/src/main/scala/munit/Assertions.scala @@ -67,7 +67,7 @@ trait Assertions extends MacroCompat.CompileErrorMacro { )(implicit loc: Location, ev: A =:= B): Unit = { StackTraces.dropInside { if (obtained == expected) { - fail(munitPrint(clue)) + fail(s"${munitPrint(clue)} expected same: $expected was not: $obtained") } } } @@ -149,7 +149,7 @@ trait Assertions extends MacroCompat.CompileErrorMacro { val exactlyTheSame = java.lang.Double.compare(expected, obtained) == 0 val almostTheSame = Math.abs(expected - obtained) <= delta if (!exactlyTheSame && !almostTheSame) { - fail(munitPrint(clue)) + fail(s"${munitPrint(clue)} expected: $expected but was: $obtained") } } } From cfe13d2e8fe81be8c9db0262b6269e12733ee4b4 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 5 Sep 2020 11:56:12 +0200 Subject: [PATCH 4/9] Use .fail --- .../scala/munit/DoubleAssertionsSuite.scala | 108 +++++------------- 1 file changed, 29 insertions(+), 79 deletions(-) diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala index 3be94f28..719968b9 100644 --- a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala @@ -1,44 +1,24 @@ package munit -class DoubleAssertionsSuite extends BaseSuite { - test("Assert Equals NaN Fails") { - try { - assertEquals(1.234, Double.NaN, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } +class DoubleAssertionsFrameworkSuite extends BaseSuite { + test("Assert Equals NaN Fails".fail) { + assertEquals(1.234, Double.NaN, 0.0) } - test("Assert NaN Equals Fails") { - try { - assertEquals(Double.NaN, 1.234, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert NaN Equals Fails".fail) { + assertEquals(Double.NaN, 1.234, 0.0) } test("Assert NaN Equals NaN") { assertEquals(Double.NaN, Double.NaN, 0.0) } - test("Assert Pos Infinity Not Equals Neg Infinity") { - try { - assertEquals(Double.PositiveInfinity, Double.NegativeInfinity, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert Pos Infinity Not Equals Neg Infinity".fail) { + assertEquals(Double.PositiveInfinity, Double.NegativeInfinity, 0.0) } - test("Assert Pos Infinity Not Equals") { - try { - assertEquals(Double.PositiveInfinity, 1.23, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert Pos Infinity Not Equals".fail) { + assertEquals(Double.PositiveInfinity, 1.23, 0.0) } test("Assert Pos Infinity Equals Infinity") { @@ -49,58 +29,33 @@ class DoubleAssertionsSuite extends BaseSuite { assertEquals(Double.NegativeInfinity, Double.NegativeInfinity, 0.0) } - test("All Infinities") { - try { - assertEquals( - Double.PositiveInfinity, - Double.NegativeInfinity, - Double.PositiveInfinity - ) - fail("unexpected") - } catch { - case _: FailException => - } + test("All Infinities".fail) { + assertEquals( + Double.PositiveInfinity, + Double.NegativeInfinity, + Double.PositiveInfinity + ) } // And now, the same with floats... - test("Assert Equals NaN Fails") { - try { - assertEquals(1.234f, Float.NaN, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert Equals NaN Fails".fail) { + assertEquals(1.234f, Float.NaN, 0.0) } - test("Assert NaN Equals Fails") { - try { - assertEquals(Float.NaN, 1.234f, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert NaN Equals Fails".fail) { + assertEquals(Float.NaN, 1.234f, 0.0) } test("Assert NaN Equals NaN") { assertEquals(Float.NaN, Float.NaN, 0.0) } - test("Assert Pos Infinity Not Equals Neg Infinity") { - try { - assertEquals(Float.PositiveInfinity, Float.NegativeInfinity, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert Pos Infinity Not Equals Neg Infinity".fail) { + assertEquals(Float.PositiveInfinity, Float.NegativeInfinity, 0.0) } - test("Assert Pos Infinity Not Equals") { - try { - assertEquals(Float.PositiveInfinity, 1.23f, 0.0) - fail("unexpected") - } catch { - case _: FailException => - } + test("Assert Pos Infinity Not Equals".fail) { + assertEquals(Float.PositiveInfinity, 1.23f, 0.0) } test("Assert Pos Infinity Equals Infinity") { @@ -111,16 +66,11 @@ class DoubleAssertionsSuite extends BaseSuite { assertEquals(Float.NegativeInfinity, Float.NegativeInfinity, 0.0) } - test("All Infinities") { - try { - assertEquals( - Float.PositiveInfinity, - Float.NegativeInfinity, - Float.PositiveInfinity - ) - fail("unexpected") - } catch { - case _: FailException => - } + test("All Infinities".fail) { + assertEquals( + Float.PositiveInfinity, + Float.NegativeInfinity, + Float.PositiveInfinity + ) } } From 06b941efb579fe8a945fa07d301d581dcf89d665 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 5 Sep 2020 11:58:01 +0200 Subject: [PATCH 5/9] Fix broken tests --- tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala index 719968b9..5d00660d 100644 --- a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala @@ -29,7 +29,7 @@ class DoubleAssertionsFrameworkSuite extends BaseSuite { assertEquals(Double.NegativeInfinity, Double.NegativeInfinity, 0.0) } - test("All Infinities".fail) { + test("All Infinities") { assertEquals( Double.PositiveInfinity, Double.NegativeInfinity, @@ -66,7 +66,7 @@ class DoubleAssertionsFrameworkSuite extends BaseSuite { assertEquals(Float.NegativeInfinity, Float.NegativeInfinity, 0.0) } - test("All Infinities".fail) { + test("All Infinities") { assertEquals( Float.PositiveInfinity, Float.NegativeInfinity, From f09cfae54e64f6eee64adf3ff576a66254be1662 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Sat, 5 Sep 2020 12:03:47 +0200 Subject: [PATCH 6/9] Use a FrameworkSuite instead --- ...a => DoubleAssertionsFrameworkSuite.scala} | 22 +++++++++++++++++++ .../src/test/scala/munit/FrameworkSuite.scala | 1 + 2 files changed, 23 insertions(+) rename tests/shared/src/test/scala/munit/{DoubleAssertionsSuite.scala => DoubleAssertionsFrameworkSuite.scala} (54%) diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala similarity index 54% rename from tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala rename to tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala index 5d00660d..915f3889 100644 --- a/tests/shared/src/test/scala/munit/DoubleAssertionsSuite.scala +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala @@ -74,3 +74,25 @@ class DoubleAssertionsFrameworkSuite extends BaseSuite { ) } } + +object DoubleAssertionsFrameworkSuite + extends FrameworkTest( + classOf[DoubleAssertionsFrameworkSuite], + """|==> success munit.DoubleAssertionsFrameworkSuite.Assert Equals NaN Fails + |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals Fails + |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals NaN + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals Neg Infinity + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Equals Infinity + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Neg Infinity Equals Infinity + |==> success munit.DoubleAssertionsFrameworkSuite.All Infinities + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Equals NaN Fails-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals Fails-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals NaN-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals Neg Infinity-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Equals Infinity-1 + |==> success munit.DoubleAssertionsFrameworkSuite.Assert Neg Infinity Equals Infinity-1 + |==> success munit.DoubleAssertionsFrameworkSuite.All Infinities-1 + |""".stripMargin + ) diff --git a/tests/shared/src/test/scala/munit/FrameworkSuite.scala b/tests/shared/src/test/scala/munit/FrameworkSuite.scala index 05bfe249..6fc6cdfa 100644 --- a/tests/shared/src/test/scala/munit/FrameworkSuite.scala +++ b/tests/shared/src/test/scala/munit/FrameworkSuite.scala @@ -27,6 +27,7 @@ class FrameworkSuite extends BaseFrameworkSuite { FullStackTraceFrameworkSuite, SmallStackTraceFrameworkSuite, AssertionsFrameworkSuite, + DoubleAssertionsFrameworkSuite, ScalaCheckExceptionFrameworkSuite ) tests.foreach { t => check(t) } From f4d12f790b7f9882e39a20d14e06c69690eed14c Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Tue, 15 Sep 2020 13:27:51 +0200 Subject: [PATCH 7/9] Rename to assertEquals{Float,Double} --- .../src/main/scala/munit/Assertions.scala | 32 +++++++++++-------- .../DoubleAssertionsFrameworkSuite.scala | 32 +++++++++---------- 2 files changed, 35 insertions(+), 29 deletions(-) diff --git a/munit/shared/src/main/scala/munit/Assertions.scala b/munit/shared/src/main/scala/munit/Assertions.scala index 49978f5e..d6810c21 100644 --- a/munit/shared/src/main/scala/munit/Assertions.scala +++ b/munit/shared/src/main/scala/munit/Assertions.scala @@ -121,32 +121,38 @@ trait Assertions extends MacroCompat.CompileErrorMacro { } /** - * Asserts that two doubles or floats are equal to within a positive delta. + * Asserts that two doubles are equal to within a positive delta. * If the expected value is infinity then the delta value is ignored. * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *) passes. */ - def assertEquals( + def assertEqualsDouble( obtained: Double, expected: Double, - delta: Double + delta: Double, + clue: => Any = "values are not the same" )(implicit loc: Location): Unit = { - val defaultClue = "values are not the same" - assertEquals(obtained, expected, delta, defaultClue) + StackTraces.dropInside { + val exactlyTheSame = java.lang.Double.compare(expected, obtained) == 0 + val almostTheSame = Math.abs(expected - obtained) <= delta + if (!exactlyTheSame && !almostTheSame) { + fail(s"${munitPrint(clue)} expected: $expected but was: $obtained") + } + } } /** - * Asserts that two doubles or floats are equal to within a positive delta. + * Asserts that two floats are equal to within a positive delta. * If the expected value is infinity then the delta value is ignored. - * NaNs are considered equal: assertEquals(Double.NaN, Double.NaN, *, *) passes. + * NaNs are considered equal: assertEquals(Float.NaN, Float.NaN, *) passes. */ - def assertEquals( - obtained: Double, - expected: Double, - delta: Double, - clue: => Any + def assertEqualsFloat( + obtained: Float, + expected: Float, + delta: Float, + clue: => Any = "values are not the same" )(implicit loc: Location): Unit = { StackTraces.dropInside { - val exactlyTheSame = java.lang.Double.compare(expected, obtained) == 0 + val exactlyTheSame = java.lang.Float.compare(expected, obtained) == 0 val almostTheSame = Math.abs(expected - obtained) <= delta if (!exactlyTheSame && !almostTheSame) { fail(s"${munitPrint(clue)} expected: $expected but was: $obtained") diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala index 915f3889..912e446e 100644 --- a/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala @@ -2,35 +2,35 @@ package munit class DoubleAssertionsFrameworkSuite extends BaseSuite { test("Assert Equals NaN Fails".fail) { - assertEquals(1.234, Double.NaN, 0.0) + assertEqualsDouble(1.234, Double.NaN, 0.0) } test("Assert NaN Equals Fails".fail) { - assertEquals(Double.NaN, 1.234, 0.0) + assertEqualsDouble(Double.NaN, 1.234, 0.0) } test("Assert NaN Equals NaN") { - assertEquals(Double.NaN, Double.NaN, 0.0) + assertEqualsDouble(Double.NaN, Double.NaN, 0.0) } test("Assert Pos Infinity Not Equals Neg Infinity".fail) { - assertEquals(Double.PositiveInfinity, Double.NegativeInfinity, 0.0) + assertEqualsDouble(Double.PositiveInfinity, Double.NegativeInfinity, 0.0) } test("Assert Pos Infinity Not Equals".fail) { - assertEquals(Double.PositiveInfinity, 1.23, 0.0) + assertEqualsDouble(Double.PositiveInfinity, 1.23, 0.0) } test("Assert Pos Infinity Equals Infinity") { - assertEquals(Double.PositiveInfinity, Double.PositiveInfinity, 0.0) + assertEqualsDouble(Double.PositiveInfinity, Double.PositiveInfinity, 0.0) } test("Assert Neg Infinity Equals Infinity") { - assertEquals(Double.NegativeInfinity, Double.NegativeInfinity, 0.0) + assertEqualsDouble(Double.NegativeInfinity, Double.NegativeInfinity, 0.0) } test("All Infinities") { - assertEquals( + assertEqualsDouble( Double.PositiveInfinity, Double.NegativeInfinity, Double.PositiveInfinity @@ -39,35 +39,35 @@ class DoubleAssertionsFrameworkSuite extends BaseSuite { // And now, the same with floats... test("Assert Equals NaN Fails".fail) { - assertEquals(1.234f, Float.NaN, 0.0) + assertEqualsFloat(1.234f, Float.NaN, 0.0f) } test("Assert NaN Equals Fails".fail) { - assertEquals(Float.NaN, 1.234f, 0.0) + assertEqualsFloat(Float.NaN, 1.234f, 0.0f) } test("Assert NaN Equals NaN") { - assertEquals(Float.NaN, Float.NaN, 0.0) + assertEqualsFloat(Float.NaN, Float.NaN, 0.0f) } test("Assert Pos Infinity Not Equals Neg Infinity".fail) { - assertEquals(Float.PositiveInfinity, Float.NegativeInfinity, 0.0) + assertEqualsFloat(Float.PositiveInfinity, Float.NegativeInfinity, 0.0f) } test("Assert Pos Infinity Not Equals".fail) { - assertEquals(Float.PositiveInfinity, 1.23f, 0.0) + assertEqualsFloat(Float.PositiveInfinity, 1.23f, 0.0f) } test("Assert Pos Infinity Equals Infinity") { - assertEquals(Float.PositiveInfinity, Float.PositiveInfinity, 0.0) + assertEqualsFloat(Float.PositiveInfinity, Float.PositiveInfinity, 0.0f) } test("Assert Neg Infinity Equals Infinity") { - assertEquals(Float.NegativeInfinity, Float.NegativeInfinity, 0.0) + assertEqualsFloat(Float.NegativeInfinity, Float.NegativeInfinity, 0.0f) } test("All Infinities") { - assertEquals( + assertEqualsFloat( Float.PositiveInfinity, Float.NegativeInfinity, Float.PositiveInfinity From 9c93c5d5bc8c84d01379bafc8fe5e5a1a87cbfe7 Mon Sep 17 00:00:00 2001 From: Olafur Pall Geirsson Date: Wed, 16 Sep 2020 12:09:33 +0200 Subject: [PATCH 8/9] Remove FrameworkSuite, it's not necessary if all tests pass --- .../DoubleAssertionsFrameworkSuite.scala | 22 ------------------- .../src/test/scala/munit/FrameworkSuite.scala | 1 - 2 files changed, 23 deletions(-) diff --git a/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala index 912e446e..c564c3ed 100644 --- a/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala +++ b/tests/shared/src/test/scala/munit/DoubleAssertionsFrameworkSuite.scala @@ -74,25 +74,3 @@ class DoubleAssertionsFrameworkSuite extends BaseSuite { ) } } - -object DoubleAssertionsFrameworkSuite - extends FrameworkTest( - classOf[DoubleAssertionsFrameworkSuite], - """|==> success munit.DoubleAssertionsFrameworkSuite.Assert Equals NaN Fails - |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals Fails - |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals NaN - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals Neg Infinity - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Equals Infinity - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Neg Infinity Equals Infinity - |==> success munit.DoubleAssertionsFrameworkSuite.All Infinities - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Equals NaN Fails-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals Fails-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert NaN Equals NaN-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals Neg Infinity-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Not Equals-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Pos Infinity Equals Infinity-1 - |==> success munit.DoubleAssertionsFrameworkSuite.Assert Neg Infinity Equals Infinity-1 - |==> success munit.DoubleAssertionsFrameworkSuite.All Infinities-1 - |""".stripMargin - ) diff --git a/tests/shared/src/test/scala/munit/FrameworkSuite.scala b/tests/shared/src/test/scala/munit/FrameworkSuite.scala index 6fc6cdfa..05bfe249 100644 --- a/tests/shared/src/test/scala/munit/FrameworkSuite.scala +++ b/tests/shared/src/test/scala/munit/FrameworkSuite.scala @@ -27,7 +27,6 @@ class FrameworkSuite extends BaseFrameworkSuite { FullStackTraceFrameworkSuite, SmallStackTraceFrameworkSuite, AssertionsFrameworkSuite, - DoubleAssertionsFrameworkSuite, ScalaCheckExceptionFrameworkSuite ) tests.foreach { t => check(t) } From 7ab39196eda6dae9f4ea9e19d99bcf3166cef6c7 Mon Sep 17 00:00:00 2001 From: Olafur Pall Geirsson Date: Wed, 16 Sep 2020 12:09:33 +0200 Subject: [PATCH 9/9] Remove FrameworkSuite, it's not necessary if all tests pass --- munit-docs/src/main/scala/docs/MUnitModifier.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/munit-docs/src/main/scala/docs/MUnitModifier.scala b/munit-docs/src/main/scala/docs/MUnitModifier.scala index 20621b98..3e2dc547 100644 --- a/munit-docs/src/main/scala/docs/MUnitModifier.scala +++ b/munit-docs/src/main/scala/docs/MUnitModifier.scala @@ -11,7 +11,6 @@ import scala.collection.mutable import scala.collection.JavaConverters._ import com.google.cloud.storage.Blob import java.io.ByteArrayOutputStream -import munit.sbtmunit.MUnitTestReport import com.google.gson.Gson import java.nio.charset.StandardCharsets import munit.sbtmunit.MUnitTestReport