Remove oldtest function

Author: ayato-p

playtest-core/src/main/kotlin/com/uzabase/playtest2/core/AssertionSteps.kt

@@ -6,9 +6,6 @@ import com.thoughtworks.gauge.datastore.ScenarioDataStore
 import com.uzabase.playtest2.core.assertion.*
 import com.uzabase.playtest2.core.zoom.ToTable
 
-internal fun oldtest(message: String, assertExp: () -> Boolean) {
-    if (!assertExp()) throw PlaytestAssertionError(message)
-}
 
 class AssertionSteps {
     @Step("小数値の<value>である")
@@ -112,7 +109,7 @@ class AssertionSteps {
                 is ShouldBeEqualTable -> target
                 else -> throw PlaytestAssertionError("AssertionTarget is not assertable type: ${target.javaClass}")
             }
-            oldtest("should be equal to $table") {
+            test {
                 sut.shouldBeEqual(table)
             }
         }

playtest-core/src/main/kotlin/com/uzabase/playtest2/core/assertion/ForTable.kt

@@ -3,5 +3,5 @@ package com.uzabase.playtest2.core.assertion
 import com.thoughtworks.gauge.Table
 
 fun interface ShouldBeEqualTable {
-    fun shouldBeEqual(expected: Table): Boolean
+    fun shouldBeEqual(expected: Table): TestResult
 }

playtest-core/src/main/kotlin/com/uzabase/playtest2/core/zoom/Table.kt

@@ -1,7 +1,7 @@
 package com.uzabase.playtest2.core.zoom
 
 import com.thoughtworks.gauge.Table
-import com.uzabase.playtest2.core.assertion.ShouldBeEqualTable
+import com.uzabase.playtest2.core.assertion.*
 
 fun interface ToTable {
     fun toTable(): TableProxy
@@ -10,7 +10,7 @@ fun interface ToTable {
 data class TableProxy(
     val table: Table
 ): ShouldBeEqualTable {
-    override fun shouldBeEqual(expected: Table): Boolean {
+    override fun shouldBeEqual(expected: Table): TestResult {
         val failed = mutableListOf<Triple<Int, String, String>>()
         expected.tableRows.forEachIndexed { index, expectedRow ->
             val actualRow = table.tableRows[index]
@@ -20,7 +20,7 @@ data class TableProxy(
                 }
             }
         }
-        return failed.isEmpty()
+        return if (failed.isEmpty()) Ok else Failed { "Table comparison failed: $failed" }
     }
 }
 

playtest-core/src/test/kotlin/com/uzabase/playtest2/core/AssertionStepsTest.kt

@@ -181,13 +181,13 @@ class AssertionStepsTest : FunSpec({
 
     context("table") {
         test("should be equal") {
-            ScenarioDataStore.put(K.AssertionTarget, ShouldBeEqualTable { true })
+            ScenarioDataStore.put(K.AssertionTarget, ShouldBeEqualTable { Ok })
             sut.shouldBeEqualTable(
                 Table(listOf("ans")).apply { addRow(listOf("42")) })
         }
 
         test("should be fail") {
-            ScenarioDataStore.put(K.AssertionTarget, ShouldBeEqualTable { false })
+            ScenarioDataStore.put(K.AssertionTarget, ShouldBeEqualTable { Failed { "should be equal to $it" } })
             shouldThrow<PlaytestAssertionError> {
                 sut.shouldBeEqualTable(
                     Table(listOf("ans"))

playtest-core/src/test/kotlin/com/uzabase/playtest2/core/zoom/TableTest.kt

@@ -1,8 +1,9 @@
 package com.uzabase.playtest2.core.zoom
 
 import com.thoughtworks.gauge.Table
+import com.uzabase.playtest2.core.assertion.Ok
 import io.kotest.core.spec.style.FunSpec
-import io.kotest.matchers.booleans.shouldBeTrue
+import io.kotest.matchers.shouldBe
 
 class TableTest : FunSpec({
     test("should true when two tables are equal") {
@@ -14,7 +15,7 @@ class TableTest : FunSpec({
             addRow(listOf("1", "x", "a"))
             addRow(listOf("2", "y", "b"))
             addRow(listOf("3", "z", "c"))
-        }).shouldBeTrue()
+        }).shouldBe(Ok)
     }
 
     test("should true when two tables are logically equal") {
@@ -26,6 +27,6 @@ class TableTest : FunSpec({
             addRow(listOf("1", "a", "x"))
             addRow(listOf("2", "b", "y"))
             addRow(listOf("3", "c", "z"))
-        }).shouldBeTrue()
+        }).shouldBe(Ok)
     }
 })