Merge branch 'main' into ideaseeker/timeout_tests_in_sarif

Author: mmvpm

docs/OverallArchitecture.md

@@ -129,9 +129,17 @@ TODO (Nikita Stroganov)
 TODO (Nikita Stroganov)
 
 ### Contest estimator
+Contest estimator runs UnitTestBot on the provided projects and returns the generation statistics such as instruction coverage.
 
-TODO (Rustam Sadykov)
+Contest estimator is placed in the [utbot-junit-contest][contest estimator 1] module and has two entry points:
+- [ContestEstimator.kt][contest estimator 2] is the main entry point. It runs UnitTestBot on the specified projects, calculates statistics for the target classes and projects, and outputs them to a console.
+- [StatisticsMonitoring.kt][contest estimator 3] is an additional entry point, which does the same as the previous one but can be configured from a file and dumps the resulting statistics to a file.
+It is used to [monitor and chart][contest estimator 4] statistics nightly.
 
+[contest estimator 1]: ../utbot-junit-contest
+[contest estimator 2]: ../utbot-junit-contest/src/main/kotlin/org/utbot/contest/ContestEstimator.kt
+[contest estimator 3]: ../utbot-junit-contest/src/main/kotlin/org/utbot/monitoring/StatisticsMonitoring.kt
+[contest estimator 4]: NightStatisticsMonitoring.md
 
 # Components
 

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/UtExecutionInstrumentation.kt

@@ -169,7 +169,7 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
                     val executionResult = convertToExecutionResult(concreteResult, returnClassId)
 
                     val stateAfterParametersWithThis = constructParameters(params)
-                    val stateAfterStatics = constructStatics(statics.keys/* + traceHandler.computePutStatics()*/)
+                    val stateAfterStatics = constructStatics(stateBefore, statics)
                     val (stateAfterThis, stateAfterParameters) = if (stateBefore.thisInstance == null) {
                         null to stateAfterParametersWithThis
                     } else {

utbot-framework/src/main/kotlin/org/utbot/framework/concrete/phases/ModelConstructionContext.kt

@@ -6,6 +6,7 @@ import org.utbot.common.withAccessibility
 import org.utbot.framework.concrete.constructors.UtCompositeModelStrategy
 import org.utbot.framework.concrete.constructors.UtModelConstructor
 import org.utbot.framework.plugin.api.ClassId
+import org.utbot.framework.plugin.api.EnvironmentModels
 import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.TimeoutException
 import org.utbot.framework.plugin.api.UtConcreteValue
@@ -58,11 +59,20 @@ class ModelConstructionContext(
             constructor.construct(it.value, it.clazz.id)
         }
 
-    fun constructStatics(staticFields: Set<FieldId>): Map<FieldId, UtModel> =
-        staticFields.associateWith { fieldId ->
+    fun constructStatics(
+        stateBefore: EnvironmentModels,
+        staticFields: Map<FieldId, UtConcreteValue<*>>
+    ): Map<FieldId, UtModel> =
+        staticFields.keys.associateWith { fieldId ->
             fieldId.jField.run {
                 val computedValue = withAccessibility { get(null) }
-                constructor.construct(computedValue, fieldId.type)
+                val knownModel = stateBefore.statics[fieldId]
+                val knownValue = staticFields[fieldId]?.value
+                if (knownModel != null && knownValue != null && knownValue == computedValue) {
+                    knownModel
+                } else {
+                    constructor.construct(computedValue, fieldId.type)
+                }
             }
         }
 

utbot-intellij-python/src/main/kotlin/org/utbot/intellij/plugin/language/python/PythonLanguageAssistant.kt

@@ -44,13 +44,18 @@ object PythonLanguageAssistant : LanguageAssistant() {
     }
 
     private fun getPsiTargets(e: AnActionEvent): Targets? {
-        val editor = e.getData(CommonDataKeys.EDITOR) ?: return null
+        val editor = e.getData(CommonDataKeys.EDITOR)
         val file = e.getData(CommonDataKeys.PSI_FILE) as? PyFile ?: return null
-        val element = findPsiElement(file, editor) ?: return null
 
         if (file.module?.sdk?.sdkType !is PythonSdkType)
             return null
 
+        val element = if (editor != null) {
+            findPsiElement(file, editor) ?: return null
+        } else {
+            e.getData(CommonDataKeys.PSI_ELEMENT) ?: return null
+        }
+
         val containingFunction = getContainingElement<PyFunction>(element)
         val containingClass = getContainingElement<PyClass>(element)
 
@@ -67,7 +72,8 @@ object PythonLanguageAssistant : LanguageAssistant() {
         if (functions.isEmpty())
             return null
 
-        val focusedFunction = if (functions.any { it.name == containingFunction?.name }) containingFunction else null
+        val focusedFunction =
+            if (functions.any { it.name == containingFunction?.name }) containingFunction else null
         return Targets(functions.toSet(), containingClass, focusedFunction, file)
     }
 

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/ui/actions/GenerateTestsAction.kt

@@ -10,6 +10,11 @@ class GenerateTestsAction : AnAction() {
     }
 
     override fun update(e: AnActionEvent) {
-        LanguageAssistant.get(e)?.update(e)
+        val languageAssistant = LanguageAssistant.get(e)
+        if (languageAssistant == null) {
+            e.presentation.isEnabled = false
+        } else {
+            languageAssistant.update(e)
+        }
     }
 }

utbot-junit-contest/README.md

@@ -0,0 +1,44 @@
+# Contest estimator
+
+Contest estimator runs UnitTestBot on the provided projects and returns the generation statistics such as instruction coverage.
+
+There are two entry points:
+- [ContestEstimator.kt][ep 1] is the main entry point. It runs UnitTestBot on the specified projects, calculates statistics for the target classes and projects, and outputs them to a console.
+- [StatisticsMonitoring.kt][ep 2] is an additional entry point, which does the same as the previous one but can be configured from a file and dumps the resulting statistics to a file.
+It is used to [monitor and chart][monitoring] statistics nightly.
+
+
+[ep 1]: src/main/kotlin/org/utbot/contest/ContestEstimator.kt
+[ep 2]: src/main/kotlin/org/utbot/monitoring/StatisticsMonitoring.kt
+[monitoring]: ../docs/NightStatisticsMonitoring.md
+
+## Key functions
+
+| Function name | File name           | Description                                                                            |
+|---------------|---------------------|----------------------------------------------------------------------------------------|
+| runGeneration | Contest.kt          | Runs UnitTestBot and manages its work                                                  |
+| runEstimator  | ContestEstimator.kt | Configures a project classpath, runs the main generation loop, and collects statistics |
+
+
+## Projects
+
+The projects are provided to Contest estimator in advance.
+
+### Structure
+All available projects are placed in the [resources][resources] folder, which contains:
+- [projects][projects] consisting of the folders with the project JAR files in them.
+- [classes][classes] consisting of the folders — each named after the project and containing the `list` file with the fully qualified class names.
+
+### How to add a new project
+You should add both the JAR files to the `projects` folder and the file with a list of classes to the `classes` folder.
+
+[resources]: src/main/resources
+[projects]: src/main/resources/projects
+[classes]: src/main/resources/classes
+
+## Statistics
+Statistics are collected and memorized by the corresponding classes placed in [Statistics.kt][statistics].
+Then [monitoring][ep 2] dumps them using auxiliary classes that are defined in [MonitoringReport.kt][report] — they describe the format of output data. 
+
+[statistics]: src/main/kotlin/org/utbot/contest/Statistics.kt
+[report]: src/main/kotlin/org/utbot/monitoring/MonitoringReport.kt

utbot-rider/build.gradle.kts

@@ -39,7 +39,7 @@ tasks {
 
     patchPluginXml {
         sinceBuild.set("222")
-        untilBuild.set("222.*")
+        untilBuild.set("232.*")
         version.set(semVer)
     }