update of usvm-python-runner

tochilinak · tochilinak · commit f889bd62f40d · 2024-02-29T13:58:27.000+03:00
diff --git a/gradle.properties b/gradle.properties
@@ -135,3 +135,5 @@ org.gradle.parallel=true
 org.gradle.caching=true
 # there is no need to override the option below because parallel execution is disabled by --no-parallel
 org.gradle.workers.max=8
+
+usvmPythonRunnerHash=0b8aff0
diff --git a/utbot-cli-python/build.gradle b/utbot-cli-python/build.gradle
@@ -24,6 +24,8 @@ dependencies {
     implementation group: 'com.github.ajalt.clikt', name: 'clikt', version: cliktVersion
     implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j2Version
+
+    implementation group: 'org.usvm', name: 'usvm-python-commons', version: usvmPythonRunnerHash
 }
 
 processResources {
diff --git a/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/sbft/SbftGenerateTestsCommand.kt b/utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/sbft/SbftGenerateTestsCommand.kt
@@ -12,6 +12,7 @@ import com.github.ajalt.clikt.parameters.types.enum
 import com.github.ajalt.clikt.parameters.types.long
 import mu.KotlinLogging
 import org.parsers.python.PythonParser
+import org.usvm.python.ps.PyPathSelectorType
 import org.utbot.cli.language.python.CliRequirementsInstaller
 import org.utbot.cli.language.python.findCurrentPythonModule
 import org.utbot.cli.language.python.toAbsolutePath
@@ -115,6 +116,10 @@ class SbftGenerateTestsCommand : CliktCommand(
         .enum<InputSearchMode> { it.name }
         .default(InputSearchMode.BOTH)
 
+    private val pathSelector by option("--path-selector")
+        .enum<PyPathSelectorType> { it.name }
+        .default(PyPathSelectorType.BaselinePriorityDfs)
+
     private val javaCmd by option(
         "--java-cmd",
         help = "(required) Path to Java command (ONLY FOR USVM)."
diff --git a/utbot-intellij-main/src/main/resources/settings.properties b/utbot-intellij-main/src/main/resources/settings.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 utbot.org
+# Copyright (c) 2024 utbot.org
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/utbot-junit-contest/build.gradle b/utbot-junit-contest/build.gradle
@@ -3,19 +3,6 @@ plugins {
 }
 apply plugin: 'jacoco'
 
-repositories {
-    mavenLocal()
-    mavenCentral()
-    maven { url 'https://jitpack.io' }
-    maven {
-        url = uri('https://maven.pkg.github.com/UnitTestBot/usvm')
-        credentials {
-            username = System.getenv("GITHUB_ACTOR")
-            password = System.getenv("GITHUB_TOKEN")
-        }
-    }
-}
-
 configurations {
     fetchInstrumentationJar
     approximations
diff --git a/utbot-python/build.gradle.kts b/utbot-python/build.gradle.kts
@@ -3,14 +3,16 @@ val kotlinLoggingVersion: String? by rootProject
 val apacheCommonsTextVersion: String? by rootProject
 val jacksonVersion: String? by rootProject
 val log4j2Version: String? by rootProject
+val usvmPythonRunnerHash: String by rootProject
 
 dependencies {
     api(project(":utbot-fuzzing"))
     api(project(":utbot-framework"))
     api(project(":utbot-python-parser"))
     api(project(":utbot-python-types"))
     api(project(":utbot-python-executor"))
-    api("org.usvm:usvm-python-runner:b087c5c")
+    api("org.usvm:usvm-python-runner:${usvmPythonRunnerHash}")
+    api("org.usvm:usvm-python-commons:${usvmPythonRunnerHash}")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationConfig.kt b/utbot-python/src/main/kotlin/org/utbot/python/PythonTestGenerationConfig.kt
@@ -1,5 +1,6 @@
 package org.utbot.python
 
+import org.usvm.python.ps.PyPathSelectorType
 import org.utbot.framework.codegen.domain.RuntimeExceptionTestsBehaviour
 import org.utbot.framework.codegen.domain.TestFramework
 import org.utbot.python.coverage.CoverageOutputFormat
@@ -34,7 +35,8 @@ class PythonTestGenerationConfig(
     val prohibitedExceptions: List<String> = defaultProhibitedExceptions,
     val checkUsvm: Boolean = false,
     val doNotGenerateStateAssertions: Boolean = false,
-    val inputSearchMode: InputSearchMode = InputSearchMode.BOTH
+    val inputSearchMode: InputSearchMode = InputSearchMode.BOTH,
+    val pathSelector: PyPathSelectorType = PyPathSelectorType.BaselinePriorityDfs
 ) {
     companion object {
         val defaultProhibitedExceptions = listOf(
diff --git a/utbot-python/src/main/kotlin/org/utbot/python/engine/GlobalPythonEngine.kt b/utbot-python/src/main/kotlin/org/utbot/python/engine/GlobalPythonEngine.kt
@@ -65,7 +65,8 @@ class GlobalPythonEngine(
             configuration.usvmConfig.javaCmd,
             mypyConfig.mypyBuildDirectory.root.canonicalPath,
             configuration.sysPathDirectories,
-            extractVenvConfig(configuration.pythonPath)
+            extractVenvConfig(configuration.pythonPath),
+            configuration.pathSelector
         )
         val runner = SymbolicExecutionEvaluator(
             method,

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ dependencies {`
`24`	`24`	`implementation group: 'com.github.ajalt.clikt', name: 'clikt', version: cliktVersion`
`25`	`25`	`implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: log4j2Version`
`26`	`26`	`implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: log4j2Version`
	`27`	`+`
	`28`	`+ implementation group: 'org.usvm', name: 'usvm-python-commons', version: usvmPythonRunnerHash`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`processResources {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2023 utbot.org`
	`1`	`+# Copyright (c) 2024 utbot.org`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`