diff --git a/usvm-dataflow-ts/src/main/resources/logback.xml b/usvm-dataflow-ts/src/main/resources/logback.xml
index 978c97078..656c39317 100644
--- a/usvm-dataflow-ts/src/main/resources/logback.xml
+++ b/usvm-dataflow-ts/src/main/resources/logback.xml
@@ -1,5 +1,4 @@
-
%highlight([%level]) %replace(%c{0}){'(\$Companion)?\$logger\$1',''} - %msg%n
@@ -8,18 +7,13 @@
logs/app.log
-
-
- logs/app.%d{yyyy-MM-dd_HH}.log
- 30
-
-
%highlight([%level]) %replace(%c{0}){'(\$Companion)?\$logger\$1',''} - %msg%n
-
+
+
diff --git a/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsProjectAnalysisTest.kt b/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsProjectAnalysisTest.kt
index eb98f41b0..2074ea6a5 100644
--- a/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsProjectAnalysisTest.kt
+++ b/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsProjectAnalysisTest.kt
@@ -69,7 +69,7 @@ class EtsProjectAnalysisTest {
}
}
- val rules = loadRules("config1.json")
+ val rules by lazy { loadRules("config1.json") }
}
private fun projectAvailable(): Boolean {
diff --git a/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsTypeInferenceTest.kt b/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsTypeInferenceTest.kt
index aab8b7684..a063850c1 100644
--- a/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsTypeInferenceTest.kt
+++ b/usvm-dataflow-ts/src/test/kotlin/org/usvm/dataflow/ts/test/EtsTypeInferenceTest.kt
@@ -326,6 +326,14 @@ class EtsTypeInferenceTest {
}
}
+ // TODO: support these complex tests
+ private val disabledTests = setOf(
+ "CaseAssignFieldToSelf",
+ "CaseLoop",
+ "CaseNew",
+ "CaseRecursion",
+ )
+
@TestFactory
fun `type inference on testcases`() = testFactory {
val file = load("/ts/testcases.ts")
@@ -335,6 +343,7 @@ class EtsTypeInferenceTest {
val allCases = project.projectClasses.filter { it.name.startsWith("Case") }
for (cls in allCases) {
+ if (cls.name in disabledTests) continue
test(name = cls.name) {
logger.info { "Analyzing testcase: ${cls.name}" }
@@ -369,7 +378,7 @@ class EtsTypeInferenceTest {
logger.info { "Found entrypoint: ${entrypoint.signature}" }
val manager = TypeInferenceManager(EtsTraits(), graph)
- val result = manager.analyze(listOf(entrypoint))
+ val result = manager.analyze(listOf(entrypoint), doAddKnownTypes = false)
val inferredTypes = result.inferredTypes[inferMethod]
?: error("No inferred types for method ${inferMethod.enclosingClass.name}::${inferMethod.name}")
diff --git a/usvm-dataflow-ts/src/test/resources/logback.xml b/usvm-dataflow-ts/src/test/resources/logback.xml
index 06f188e9d..a9f1e0252 100644
--- a/usvm-dataflow-ts/src/test/resources/logback.xml
+++ b/usvm-dataflow-ts/src/test/resources/logback.xml
@@ -5,21 +5,15 @@
-
-
- ${LOG_DIR}/${LOG_FILE}
-
- ${LOG_DIR}/${LOG_FILE}_%d{yyyy-MM-dd_HH-mm-ss}.log
- 30
-
+ logs/app.log
[%level] %replace(%c{0}){'(\$Companion)?\$logger\$1',''} - %msg%n
-
+