Fix after review

Author: Nikita Stroganov

gradle.properties

@@ -35,6 +35,9 @@ eclipse_aether_version=1.1.0
 maven_wagon_version=3.5.1
 maven_plugin_api_version=3.8.5
 maven_plugin_tools_version=3.6.4
+maven_plugin_testing_version=3.3.0
+maven_resolver_api_version=1.8.0
+sisu_plexus_version=0.3.5
 javacpp_version=1.5.3
 jsoup_version=1.7.2
 djl_api_version=0.17.0

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

@@ -214,10 +214,11 @@ object UtExecutionInstrumentation : Instrumentation<UtConcreteExecutionResult> {
             return UtTimeoutException(exception)
         }
         val instrs = traceHandler.computeInstructionList()
-        val isNested = if (instrs.isEmpty())
+        val isNested = if (instrs.isEmpty()) {
             false
-        else
+        } else {
             instrs.first().callId != instrs.last().callId
+        }
         return if (instrs.isNotEmpty() && instrs.last().instructionData is ExplicitThrowInstruction) {
             UtExplicitlyThrownException(exception, isNested)
         } else {

utbot-maven/build.gradle

@@ -13,24 +13,23 @@ dependencies {
     // `compile` because `api` dependencies are not included in pom.xml by `install` task
     compile project(':utbot-framework')
 
-    implementation "org.apache.maven:maven-core:${maven_plugin_api_version}"
-    implementation "org.apache.maven:maven-plugin-api:${maven_plugin_api_version}"
-    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${maven_plugin_tools_version}"
-    implementation "io.github.microutils:kotlin-logging:${kotlin_logging_version}"
-
-    implementation 'org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5'
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation "org.apache.maven.plugin-testing:maven-plugin-testing-harness:3.3.0"
-    testImplementation 'org.apache.maven:maven-compat:3.8.5'
-    testImplementation 'org.apache.maven.resolver:maven-resolver-api:1.8.0'
-
-    mavenEmbedder "org.apache.maven:maven-embedder:${maven_plugin_api_version}"
-    mavenEmbedder "org.apache.maven:maven-compat:${maven_plugin_api_version}"
-    mavenEmbedder "org.slf4j:slf4j-simple:${slf4j_version}"
-    mavenEmbedder "org.eclipse.aether:aether-connector-basic:${eclipse_aether_version}"
-    mavenEmbedder "org.eclipse.aether:aether-transport-wagon:${eclipse_aether_version}"
-    mavenEmbedder "org.apache.maven.wagon:wagon-http:${maven_wagon_version}"
-    mavenEmbedder "org.apache.maven.wagon:wagon-provider-api:${maven_wagon_version}"
+    implementation "org.apache.maven:maven-core:$maven_plugin_api_version"
+    implementation "org.apache.maven:maven-plugin-api:$maven_plugin_api_version"
+    compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:$maven_plugin_tools_version"
+    implementation "io.github.microutils:kotlin-logging:$kotlin_logging_version"
+
+    implementation "org.eclipse.sisu:org.eclipse.sisu.plexus:$sisu_plexus_version"
+    testImplementation "org.apache.maven.plugin-testing:maven-plugin-testing-harness:$maven_plugin_testing_version"
+    testImplementation "org.apache.maven:maven-compat:$maven_plugin_api_version"
+    testImplementation "org.apache.maven.resolver:maven-resolver-api:$maven_resolver_api_version"
+
+    mavenEmbedder "org.apache.maven:maven-embedder:$maven_plugin_api_version"
+    mavenEmbedder "org.apache.maven:maven-compat:$maven_plugin_api_version"
+    mavenEmbedder "org.slf4j:slf4j-simple:$slf4j_version"
+    mavenEmbedder "org.eclipse.aether:aether-connector-basic:$eclipse_aether_version"
+    mavenEmbedder "org.eclipse.aether:aether-transport-wagon:$eclipse_aether_version"
+    mavenEmbedder "org.apache.maven.wagon:wagon-http:$maven_wagon_version"
+    mavenEmbedder "org.apache.maven.wagon:wagon-provider-api:$maven_wagon_version"
 }
 
 /**

utbot-maven/src/main/kotlin/org/utbot/maven/plugin/GenerateTestsAndSarifReportMojo.kt

@@ -34,6 +34,9 @@ internal val logger = KotlinLogging.logger {}
 )
 class GenerateTestsAndSarifReportMojo : AbstractMojo() {
 
+    /**
+     * The maven project for which we are creating a SARIF report.
+     */
     @Parameter(defaultValue = "\${project}", readonly = true)
     lateinit var mavenProject: MavenProject
 

utbot-maven/src/test/kotlin/org/utbot/maven/plugin/GenerateTestsAndSarifReportMojoTest.kt

@@ -51,9 +51,8 @@ class GenerateTestsAndSarifReportMojoTest : AbstractMojoTestCase() {
 
     // internal
 
-    private val testMavenProject by lazy {
+    private val testMavenProject: TestMavenProject =
         TestMavenProject("src/test/resources/project-to-test".toPath())
-    }
 
     private val sarifReportMojo by lazy {
         configureSarifReportMojo(testMavenProject.mavenProject).apply {

utbot-maven/src/test/kotlin/org/utbot/maven/plugin/TestMavenProject.kt

@@ -25,7 +25,7 @@ class TestMavenProject(pathToProject: Path) {
         FileUtils.copyDirectoryStructure(pathToProject.toFile(), projectBaseDir)
     }
 
-    val mavenProject: MavenProject by lazy {
+    val mavenProject: MavenProject = run {
         val pomFile = File(projectBaseDir, "pom.xml")
         val model = MavenXpp3Reader().read(FileReader(pomFile))
         val mavenProject = MavenProject(model)

utbot-maven/src/test/kotlin/org/utbot/maven/plugin/extension/SarifMavenConfigurationProviderTest.kt

@@ -98,9 +98,8 @@ class SarifMavenConfigurationProviderTest : AbstractMojoTestCase() {
 
     // internal
 
-    private val testMavenProject by lazy {
+    private val testMavenProject: TestMavenProject =
         TestMavenProject("src/test/resources/project-to-test".toPath())
-    }
 
     private val sarifReportMojo by lazy {
         configureSarifReportMojo(testMavenProject.mavenProject)