tweak

Author: ayato-p

playtest-http/src/main/kotlin/com/uzabase/playtest2/http/ZoomJsonSteps.kt

@@ -3,13 +3,19 @@ package com.uzabase.playtest2.http
 import com.thoughtworks.gauge.Step
 import com.thoughtworks.gauge.datastore.ScenarioDataStore
 import com.uzabase.playtest2.core.K
-import com.uzabase.playtest2.core.ScenarioDataStoreExt.ensureGet
 import com.uzabase.playtest2.http.proxy.JsonPathProxy
+import java.nio.file.Path
 
 class ZoomJsonSteps {
     @Step("JSONのパス<jsonPath>に対応する値が")
     fun zoomJson(jsonPath: String): Any =
-        ensureGet<String>(K.AssertionTarget)
-            .let { JsonPathProxy.of(it, jsonPath) }
+        ScenarioDataStore.get(K.AssertionTarget)
+            .let {
+                when (it) {
+                    is Path -> JsonPathProxy.of(it, jsonPath);
+                    is String -> JsonPathProxy.of(it, jsonPath);
+                    else -> throw IllegalArgumentException("AssertionTarget is not a Path or a String")
+                }
+            }
             .let { ScenarioDataStore.put(K.AssertionTarget, it) }
 }

playtest-http/src/main/kotlin/com/uzabase/playtest2/http/proxy/JsonPathProxy.kt

@@ -2,12 +2,16 @@ package com.uzabase.playtest2.http.proxy
 
 import com.jayway.jsonpath.JsonPath
 import com.uzabase.playtest2.core.assertion.Assertable
+import java.nio.file.Path
 
 class JsonPathProxy private constructor(val json: String, val path: String) : Assertable<Any> {
     companion object {
         fun of(json: String, path: String): JsonPathProxy {
             return JsonPathProxy(json, path)
         }
+        fun of(jsonFilePath: Path, path: String): JsonPathProxy {
+            return JsonPathProxy.of(jsonFilePath.toFile().readText(Charsets.UTF_8), path)
+        }
     }
 
     override fun shouldBe(expected: Long): Boolean = JsonPath.read<Long>(json, path) == expected