Extract common code for loading sample scene

Lipen · Lipen · commit d023b91a372f · 2025-02-24T17:19:02.000+03:00
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/And.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/And.kt
@@ -32,12 +32,10 @@ import org.jacodb.ets.model.EtsMethodParameter
 import org.jacodb.ets.model.EtsMethodSignature
 import org.jacodb.ets.model.EtsScene
 import org.jacodb.ets.utils.getLocals
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import org.usvm.util.isTruthy
 
 private fun EtsMethodParameter.toRef(): EtsParameterRef {
@@ -48,12 +46,7 @@ class And : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     private val classSignature: EtsClassSignature =
         scene.projectFiles[0].classes.single { it.name != DEFAULT_ARK_CLASS_NAME }.signature
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Arrays.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Arrays.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Arrays : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testCreateConstantArrayOfNumbers() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Call.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Call.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Call : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun `test simpleCall`() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Equality.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Equality.kt
@@ -1,23 +1,16 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Equality : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testEqBoolWithBool() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/InstanceFields.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/InstanceFields.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import kotlin.test.Test
 
 class InstanceFields : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testReturnSingleField() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/InstanceMethods.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/InstanceMethods.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import kotlin.test.Test
 
 class InstanceMethods : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testNoArgsStaticMethod() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/MinValue.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/MinValue.kt
@@ -1,23 +1,16 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Disabled
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import kotlin.test.Test
 
 class MinValue : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     @Disabled
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Neg.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Neg.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Neg : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun `test negateNumber`() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Null.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Null.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.RepeatedTest
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Null : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @RepeatedTest(20)
     fun testIsNull() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Numeric.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Numeric.kt
@@ -1,23 +1,16 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Numeric : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun `test numberToNumber`() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Or.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Or.kt
@@ -20,23 +20,16 @@ import org.jacodb.ets.model.EtsMethodParameter
 import org.jacodb.ets.model.EtsMethodSignature
 import org.jacodb.ets.model.EtsScene
 import org.jacodb.ets.utils.getLocals
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import org.usvm.util.isTruthy
 
 class Or : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     private val classSignature: EtsClassSignature =
         scene.projectFiles[0].classes.single { it.name != DEFAULT_ARK_CLASS_NAME }.signature
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/StaticMethods.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/StaticMethods.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import kotlin.test.Test
 
 class StaticMethods : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testNoArgsStaticMethod() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Truthy.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Truthy.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import kotlin.test.Test
 
 class Truthy : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun `test arrayTruthy`() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/TypeCoercion.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/TypeCoercion.kt
@@ -1,12 +1,10 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 import org.usvm.util.isTruthy
 
 private val TsValue.TsBoolean.number: Double
@@ -16,12 +14,7 @@ class TypeCoercion : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun testArgWithConst() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/samples/Undefined.kt b/usvm-ts/src/test/kotlin/org/usvm/samples/Undefined.kt
@@ -1,22 +1,15 @@
 package org.usvm.samples
 
 import org.jacodb.ets.model.EtsScene
-import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.Test
 import org.usvm.api.TsValue
 import org.usvm.util.TsMethodTestRunner
-import org.usvm.util.getResourcePath
 
 class Undefined : TsMethodTestRunner() {
 
     private val className = this::class.simpleName!!
 
-    override val scene: EtsScene = run {
-        val name = "$className.ts"
-        val path = getResourcePath("/samples/$name")
-        val file = loadEtsFileAutoConvert(path)
-        EtsScene(listOf(file))
-    }
+    override val scene: EtsScene = loadSampleScene(className)
 
     @Test
     fun `test isUndefined`() {
diff --git a/usvm-ts/src/test/kotlin/org/usvm/util/TsMethodTestRunner.kt b/usvm-ts/src/test/kotlin/org/usvm/util/TsMethodTestRunner.kt
@@ -14,6 +14,7 @@ import org.jacodb.ets.model.EtsClassSignature
 import org.jacodb.ets.model.EtsFileSignature
 import org.jacodb.ets.model.EtsMethod
 import org.jacodb.ets.model.EtsScene
+import org.jacodb.ets.utils.loadEtsFileAutoConvert
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS
 import org.usvm.PathSelectionStrategy
@@ -35,6 +36,19 @@ abstract class TsMethodTestRunner : TestRunner<TsTest, EtsMethod, EtsType?, TsMe
 
     protected abstract val scene: EtsScene
 
+    protected fun loadSampleScene(
+        className: String,
+        useArkAnalyzerTypeInference: Boolean = true,
+    ): EtsScene {
+        val name = "$className.ts"
+        val path = getResourcePath("/samples/$name")
+        val file = loadEtsFileAutoConvert(
+            path,
+            useArkAnalyzerTypeInference = if (useArkAnalyzerTypeInference) 1 else null
+        )
+        return EtsScene(listOf(file))
+    }
+
     protected fun getMethod(className: String, methodName: String): EtsMethod {
         return scene
             .projectAndSdkClasses.single { it.name == className }
