From 8efb09cea871c62b3b142407ccc09396370fcf64 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Fri, 12 Nov 2021 09:19:58 -0800
Subject: [PATCH] Cleaned up tests.

---
 .../kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt     | 2 +-
 src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt     | 8 ++++++--
 .../kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt   | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
index dadf542..738a658 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/FeedReaderTest.kt
@@ -51,7 +51,7 @@ class FeedReaderTest {
     fun readFeedTest() {
         var messages = readFeed("https://feeds.thauvin.net/ethauvin")
         assertThat(messages.size, "size = 10").isEqualTo(10)
-        assertThat(messages[1].msg, "feed entry url").contains("ethauvin")
+        assertThat(messages[1].msg, "feed entry url").contains("erik.thauvin.net")
 
         messages = readFeed("https://lorem-rss.herokuapp.com/feed?length=0")
         assertThat(messages[0].msg, "nothing to view").contains("nothing")
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
index fc8f117..876bea0 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/UtilsTest.kt
@@ -31,8 +31,10 @@
  */
 package net.thauvin.erik.mobibot
 
+import assertk.all
 import assertk.assertThat
 import assertk.assertions.isEqualTo
+import assertk.assertions.length
 import net.thauvin.erik.mobibot.Utils.appendIfMissing
 import net.thauvin.erik.mobibot.Utils.bold
 import net.thauvin.erik.mobibot.Utils.buildCmdSyntax
@@ -187,8 +189,10 @@ class UtilsTest {
 
     @Test
     fun testObfuscate() {
-        assertThat(ascii.obfuscate().length, "obfuscate is right length").isEqualTo(ascii.length)
-        assertThat(ascii.obfuscate(), "obfuscate()").isEqualTo("x".repeat(ascii.length))
+        assertThat(ascii.obfuscate(), "obfuscate()").all {
+            length().isEqualTo(ascii.length)
+            isEqualTo(("x".repeat(ascii.length)))
+        }
         assertThat(" ".obfuscate(), "obfuscate(blank)").isEqualTo(" ")
     }
 
diff --git a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
index c1b9a4d..80a49b5 100644
--- a/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
+++ b/src/test/kotlin/net/thauvin/erik/mobibot/modules/CalcTest.kt
@@ -48,9 +48,7 @@ class CalcTest {
     fun testCalculate() {
         assertThat(calculate("1 + 1"), "calculate(1+1)").isEqualTo("1+1 = ${bold(2)}")
         assertThat(calculate("1 -3"), "calculate(1 -3)").isEqualTo("1-3 = ${bold(-2)}")
-        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)")
-            .isEqualTo("pi+π+e+φ = ${bold("10.62")}")
-        assertThat { calculate("one + one") }
-            .isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
+        assertThat(calculate("pi+π+e+φ"), "calculate(pi+π+e+φ)").isEqualTo("pi+π+e+φ = ${bold("10.62")}")
+        assertThat { calculate("one + one") }.isFailure().isInstanceOf(UnknownFunctionOrVariableException::class.java)
     }
 }