From f756389037a8abd02c37bde4d2479325741c48e6 Mon Sep 17 00:00:00 2001
From: Paul Holt <pcholt@gmail.com>
Date: Sat, 29 Jan 2022 23:48:53 +1100
Subject: [PATCH] Createa a build_00_utilities project containing testing
 helpers, including the ConsoleTest abstract class.

---
 .../jvmTestUtils/kotlin}/test/ConsoleTest.kt  |  2 ++
 03_Animal/java/test/AnimalJavaTest.kt         |  1 +
 03_Animal/kotlin/test/AnimalKtTest.kt         |  1 +
 03_Animal/kotlin/test/ConsoleTest.kt          | 35 -------------------
 4 files changed, 4 insertions(+), 35 deletions(-)
 rename {03_Animal/java => 00_Utilities/jvmTestUtils/kotlin}/test/ConsoleTest.kt (96%)
 delete mode 100644 03_Animal/kotlin/test/ConsoleTest.kt

diff --git a/03_Animal/java/test/ConsoleTest.kt b/00_Utilities/jvmTestUtils/kotlin/test/ConsoleTest.kt
similarity index 96%
rename from 03_Animal/java/test/ConsoleTest.kt
rename to 00_Utilities/jvmTestUtils/kotlin/test/ConsoleTest.kt
index 3eebdcbb..d58af170 100644
--- a/03_Animal/java/test/ConsoleTest.kt
+++ b/00_Utilities/jvmTestUtils/kotlin/test/ConsoleTest.kt
@@ -1,3 +1,5 @@
+package com.pcholt.console.testutils
+
 import com.google.common.truth.Truth
 import org.junit.Rule
 import org.junit.contrib.java.lang.system.SystemOutRule
diff --git a/03_Animal/java/test/AnimalJavaTest.kt b/03_Animal/java/test/AnimalJavaTest.kt
index 06513481..013655a3 100644
--- a/03_Animal/java/test/AnimalJavaTest.kt
+++ b/03_Animal/java/test/AnimalJavaTest.kt
@@ -1,3 +1,4 @@
+import com.pcholt.console.testutils.ConsoleTest
 import org.junit.Test
 
 class AnimalJavaTest : ConsoleTest() {
diff --git a/03_Animal/kotlin/test/AnimalKtTest.kt b/03_Animal/kotlin/test/AnimalKtTest.kt
index 38fae815..e93857ea 100644
--- a/03_Animal/kotlin/test/AnimalKtTest.kt
+++ b/03_Animal/kotlin/test/AnimalKtTest.kt
@@ -1,3 +1,4 @@
+import com.pcholt.console.testutils.ConsoleTest
 import org.junit.Test
 
 class AnimalKtTest : ConsoleTest() {
diff --git a/03_Animal/kotlin/test/ConsoleTest.kt b/03_Animal/kotlin/test/ConsoleTest.kt
deleted file mode 100644
index 3eebdcbb..00000000
--- a/03_Animal/kotlin/test/ConsoleTest.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-import com.google.common.truth.Truth
-import org.junit.Rule
-import org.junit.contrib.java.lang.system.SystemOutRule
-import org.junit.contrib.java.lang.system.TextFromStandardInputStream
-
-abstract class ConsoleTest {
-    @get:Rule
-    val inputRule = TextFromStandardInputStream.emptyStandardInputStream()
-
-    @get:Rule
-    val systemOutRule = SystemOutRule().enableLog()
-
-    val regexInputCommand = "\\{(.*)}".toRegex()
-
-    fun assertConversation(conversation: String, runMain: () -> Unit) {
-
-        inputRule.provideLines(*regexInputCommand
-            .findAll(conversation)
-            .map { it.groupValues[1] }
-            .toList().toTypedArray())
-
-        runMain()
-
-        Truth.assertThat(
-            systemOutRule.log.trimWhiteSpace()
-        )
-            .isEqualTo(
-                regexInputCommand
-                    .replace(conversation, "").trimWhiteSpace()
-            )
-    }
-
-    private fun String.trimWhiteSpace() =
-        replace("[\\s]+".toRegex(), " ")
-}
\ No newline at end of file