From a5b611b11c669a7038a5f0ebc2da660eb40cef98 Mon Sep 17 00:00:00 2001 From: lbressler13 Date: Tue, 23 Jan 2024 03:40:22 -0500 Subject: [PATCH] test: finish test cleanup --- .../xyz/lbres/exactnumbers/irrationals/sqrt/SqrtTest.kt | 8 ++++---- .../lbres/exactnumbers/irrationals/sqrt/binaryOpTests.kt | 3 +++ .../exactnumbers/irrationals/sqrt/extractWholeOfTests.kt | 2 +- .../lbres/exactnumbers/irrationals/sqrt/simplifyTests.kt | 7 ++++--- .../kotlin/xyz/lbres/exactnumbers/testutils/helpers.kt | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/SqrtTest.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/SqrtTest.kt index a172eba..8e83b51 100644 --- a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/SqrtTest.kt +++ b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/SqrtTest.kt @@ -91,8 +91,8 @@ class SqrtTest { expected = "[√(1/2)]" assertEquals(expected, sqrt.toString()) - sqrt = Sqrt(ExactFraction(12, 35)) - expected = "[√(12/35)]" + sqrt = Sqrt(ExactFraction(35, 12)) + expected = "[√(35/12)]" assertEquals(expected, sqrt.toString()) } @@ -116,8 +116,8 @@ class SqrtTest { expected = "[sqrt(1/2)]" assertEquals(expected, sqrt.toPlainString()) - sqrt = Sqrt(ExactFraction(12, 35)) - expected = "[sqrt(12/35)]" + sqrt = Sqrt(ExactFraction(35, 12)) + expected = "[sqrt(35/12)]" assertEquals(expected, sqrt.toPlainString()) } diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/binaryOpTests.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/binaryOpTests.kt index 8d6f978..9ef6756 100644 --- a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/binaryOpTests.kt +++ b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/binaryOpTests.kt @@ -164,6 +164,9 @@ fun runEqualsTests() { sqrt1 = Sqrt(ExactFraction(9, 400)) assertEquals(sqrt1, sqrt1) + sqrt1 = Sqrt(ExactFraction(400, 9)) + assertEquals(sqrt1, sqrt1) + // not equal sqrt1 = Sqrt.ZERO var sqrt2 = Sqrt.ONE diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/extractWholeOfTests.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/extractWholeOfTests.kt index bed2609..b4912e6 100644 --- a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/extractWholeOfTests.kt +++ b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/extractWholeOfTests.kt @@ -221,7 +221,7 @@ fun runExtractWholeOfTests() { ) ) - // incorrect value + // incorrect memoization num = BigInteger("100") expected = BigInteger("95") runSingleExtractWholeOfTest(num, expected, mapOf(BigInteger("100") to BigInteger("95")), emptyList()) diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/simplifyTests.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/simplifyTests.kt index e9ee02e..2f784b8 100644 --- a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/simplifyTests.kt +++ b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/irrationals/sqrt/simplifyTests.kt @@ -31,8 +31,8 @@ fun runGetSimplifiedTests() { expected = Pair(ExactFraction.FIVE, Sqrt(ExactFraction.TWO)) assertEquals(expected, sqrt.getSimplified()) - sqrt = Sqrt(3000) - expected = Pair(ExactFraction.TEN, Sqrt(ExactFraction(30))) + sqrt = Sqrt(ExactFraction(1, 3000)) + expected = Pair(ExactFraction(1, 10), Sqrt(ExactFraction(1, 30))) assertEquals(expected, sqrt.getSimplified()) sqrt = Sqrt(ExactFraction(50, 27)) @@ -92,7 +92,7 @@ fun runSimplifySetTests() { assertEquals(expected, Sqrt.simplifySet(numbers)) // partial whole - numbers = constMultiSetOf(Sqrt(2), Sqrt(6)) + numbers = constMultiSetOf(Sqrt(2), Sqrt(6), Sqrt(1)) expected = Pair(ExactFraction.TWO, constMultiSetOf(Sqrt(3))) assertEquals(expected, Sqrt.simplifySet(numbers)) @@ -119,6 +119,7 @@ fun runSimplifySetTests() { Sqrt(ExactFraction(15, 2)), Sqrt(ExactFraction(2, 27)), Sqrt(ExactFraction(1, 17)), + Sqrt.ONE, Sqrt(4) ) expected = Pair( diff --git a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/testutils/helpers.kt b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/testutils/helpers.kt index cf6df3e..0944e2c 100644 --- a/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/testutils/helpers.kt +++ b/exact-numbers/src/test/kotlin/xyz/lbres/exactnumbers/testutils/helpers.kt @@ -18,7 +18,7 @@ fun assertDivByZero(test: () -> Unit) { * * @param message [String]: expected error message * @param test () -> Unit: test to run - * @return [Exception] the exception that was thrown + * @return T: the exception that was thrown */ inline fun assertFailsWithMessage(message: String, test: () -> Unit): T { val error = assertFailsWith { test() } @@ -27,7 +27,7 @@ inline fun assertFailsWithMessage(message: String, test: } /** - * Validate that a test succeeds, and throw error if it fails + * Validate that an operation succeeds, and throw an AssertionError if it fails * * @param errorMessage [String]: error message to throw if test fails * @param test () -> Unit: test to run