fix day 5 kotlin

advent-of-craft · Jan 3, 2024 · b4bd87b · b4bd87b
1 parent 0d38a94
commit b4bd87b
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/exercise/kotlin/day05/src/test/kotlin/PopulationTests.kt b/exercise/kotlin/day05/src/test/kotlin/PopulationTests.kt
@@ -25,8 +25,29 @@ class PopulationTests : FunSpec({
         Person("Glenn", "Quagmire")
     )
 
+    fun formatPopulation(): String {
+        var response = ""
+
+        for (person in population) {
+            response += "${person.firstName} ${person.lastName}"
+
+            if (person.pets.isNotEmpty()) {
+                response += " who owns : "
+            }
+            for (pet in person.pets) {
+                response += "${pet.name} "
+            }
+            if (population.last() != person) {
+                response += lineSeparator()
+            }
+        }
+        return response
+    }
+
     test("people with their pets") {
-        formatPopulation(population) shouldBe """Peter Griffin who owns : Tabby 
+        val response = formatPopulation()
+
+        response shouldBe """Peter Griffin who owns : Tabby 
             |Stewie Griffin who owns : Dolly Brian 
             |Joe Swanson who owns : Spike 
             |Lois Griffin who owns : Serpy 
@@ -36,15 +57,3 @@ class PopulationTests : FunSpec({
             |Glenn Quagmire""".trimMargin()
     }
 })
-
-fun formatPopulation(population: List<Person>): String =
-    population.joinToString(lineSeparator()) { formatPerson(it) }
-
-fun Person.formatPets(): String {
-    return when {
-        pets.isNotEmpty() -> return pets.joinToString(" ", " who owns : ", " ") { it.name }
-        else -> ""
-    }
-}
-
-fun formatPerson(person: Person): String = "${person.firstName} ${person.lastName}" + person.formatPets()
diff --git a/solution/kotlin/day05/src/test/kotlin/PopulationTests.kt b/solution/kotlin/day05/src/test/kotlin/PopulationTests.kt
@@ -25,29 +25,8 @@ class PopulationTests : FunSpec({
         Person("Glenn", "Quagmire")
     )
 
-    fun formatPopulation(): String {
-        var response = ""
-
-        for (person in population) {
-            response += "${person.firstName} ${person.lastName}"
-
-            if (person.pets.isNotEmpty()) {
-                response += " who owns : "
-            }
-            for (pet in person.pets) {
-                response += "${pet.name} "
-            }
-            if (population.last() != person) {
-                response += lineSeparator()
-            }
-        }
-        return response
-    }
-
     test("people with their pets") {
-        val response = formatPopulation()
-
-        response shouldBe """Peter Griffin who owns : Tabby 
+        formatPopulation(population) shouldBe """Peter Griffin who owns : Tabby 
             |Stewie Griffin who owns : Dolly Brian 
             |Joe Swanson who owns : Spike 
             |Lois Griffin who owns : Serpy 
@@ -57,3 +36,15 @@ class PopulationTests : FunSpec({
             |Glenn Quagmire""".trimMargin()
     }
 })
+
+fun formatPopulation(population: List<Person>): String =
+    population.joinToString(lineSeparator()) { formatPerson(it) }
+
+fun Person.formatPets(): String {
+    return when {
+        pets.isNotEmpty() -> return pets.joinToString(" ", " who owns : ", " ") { it.name }
+        else -> ""
+    }
+}
+
+fun formatPerson(person: Person): String = "${person.firstName} ${person.lastName}" + person.formatPets()