[instrumentation-rd]

1. switched from Protocol.Command to rd generated model
2. added utbot-rd project featuring LifetimedProcess, ProcessWithRdServer and minor rd-related utility classes
3. Switched from message-driven ConcreteExecutor to callback rd model, featuring UtInstrumentationProcess

Author: Domonion

gradle.properties

@@ -51,4 +51,5 @@ org.gradle.parallel=false
 org.gradle.jvmargs="-XX:MaxHeapSize=3072m"
 kotlin.compiler.execution.strategy=in-process
 
-org.gradle.jvmargs=-Xmx6144m
+org.gradle.jvmargs=-Xmx6144m
+#kotlin.stdlib.default.dependency=false

settings.gradle

@@ -1,3 +1,13 @@
+pluginManagement {
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.name == "rdgen") {
+                useModule("com.jetbrains.rd:rd-gen:${requested.version}")
+            }
+        }
+    }
+}
+
 rootProject.name = 'utbot'
 
 include 'utbot-core'
@@ -17,4 +27,5 @@ include 'utbot-summary'
 include 'utbot-gradle'
 //include 'utbot-maven'
 include 'utbot-summary-tests'
+include 'utbot-rd'
 

utbot-analytics/build.gradle

@@ -82,4 +82,5 @@ jar {
     }
 
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    zip64 = true
 }

utbot-framework-api/src/main/kotlin/org/utbot/framework/plugin/api/UtExecutionResult.kt

@@ -48,13 +48,13 @@ class ConcreteExecutionFailureException(cause: Throwable, errorFile: File, val p
             appendLine("----------------------------------------")
             appendLine("The child process is dead")
             appendLine("Cause:\n${cause.message}")
-            appendLine("Last 20 lines of the error log ${errorFile.absolutePath}:")
+            appendLine("Last 100 lines of the error log ${errorFile.absolutePath}:")
             appendLine("----------------------------------------")
             errorFile.useLines { lines ->
                 val lastLines = LinkedList<String>()
                 for (line in lines) {
                     lastLines.add(line)
-                    if (lastLines.size > 20) {
+                    if (lastLines.size > 100) {
                         lastLines.removeFirst()
                     }
                 }

utbot-framework/build.gradle

@@ -34,6 +34,10 @@ dependencies {
     //implementation 'junit:junit:4.13.1'
     api project(':utbot-framework-api')
 
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-gen', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+
     implementation "com.github.UnitTestBot:soot:${soot_commit_hash}"
 
     implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-kotlin', version: jackson_version

utbot-framework/src/main/kotlin/org/utbot/framework/plugin/api/TestCaseGenerator.kt

@@ -5,7 +5,6 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -39,6 +38,7 @@ import org.utbot.framework.util.jimpleBody
 import org.utbot.framework.util.runSoot
 import org.utbot.framework.util.toModel
 import org.utbot.instrumentation.ConcreteExecutor
+import org.utbot.instrumentation.warmup
 import org.utbot.instrumentation.warmup.Warmup
 import java.io.File
 import java.nio.file.Path

utbot-instrumentation-tests/build.gradle

@@ -16,6 +16,9 @@ dependencies {
     testImplementation configurations.fetchInstrumentationJar
     testImplementation project(':utbot-sample')
     testImplementation group: 'org.jacoco', name: 'org.jacoco.report', version: jacoco_version
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-gen', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
 }
 
 processResources {

utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestCoverageInstrumentation.kt

@@ -1,5 +1,6 @@
 package org.utbot.examples
 
+import com.jetbrains.rd.util.reactive.RdFault
 import org.utbot.examples.samples.ExampleClass
 import org.utbot.examples.statics.substitution.StaticSubstitution
 import org.utbot.examples.statics.substitution.StaticSubstitutionExamples
@@ -74,9 +75,10 @@ class TestCoverageInstrumentation {
             }
 
             assertInstanceOf(
-                IllegalArgumentException::class.java,
+                RdFault::class.java,
                 exc.cause!!
             )
+            assertTrue((exc.cause as RdFault).reasonTypeFqn == "IllegalArgumentException")
         }
     }
 
@@ -96,9 +98,10 @@ class TestCoverageInstrumentation {
             }
 
             assertInstanceOf(
-                IllegalArgumentException::class.java,
+                RdFault::class.java,
                 exc.cause!!
             )
+            assertTrue((exc.cause as RdFault).reasonTypeFqn == "IllegalArgumentException")
 
             it.execute(ExampleClass::bar, arrayOf(testObject, 2))
             val coverageInfo1 = it.collectCoverage(ExampleClass::class.java)

utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestInvokeInstrumentation.kt

@@ -1,5 +1,6 @@
 package org.utbot.examples
 
+import com.jetbrains.rd.util.reactive.RdFault
 import org.utbot.examples.samples.ClassWithSameMethodNames
 import org.utbot.examples.samples.ExampleClass
 import org.utbot.examples.samples.staticenvironment.StaticExampleClass
@@ -46,9 +47,10 @@ class TestInvokeInstrumentation {
                 )
             }
             assertInstanceOf(
-                IllegalArgumentException::class.java,
+                RdFault::class.java,
                 exc.cause!!
             )
+            assertTrue((exc.cause as RdFault).reasonTypeFqn == "IllegalArgumentException")
         }
     }
 

utbot-instrumentation-tests/src/test/kotlin/org/utbot/examples/TestIsolated.kt

@@ -1,5 +1,6 @@
 package org.utbot.examples
 
+import com.jetbrains.rd.util.reactive.RdFault
 import org.utbot.examples.samples.ExampleClass
 import org.utbot.examples.samples.staticenvironment.StaticExampleClass
 import org.utbot.instrumentation.ConcreteExecutor
@@ -52,9 +53,10 @@ class TestIsolated {
             }
 
             assertInstanceOf(
-                IllegalArgumentException::class.java,
+                RdFault::class.java,
                 exc.cause!!
             )
+            assertTrue((exc.cause as RdFault).reasonTypeFqn == "IllegalArgumentException")
         }
     }
 

utbot-instrumentation/build.gradle

@@ -1,7 +1,14 @@
+import com.jetbrains.rd.generator.gradle.RdGenExtension
+import com.jetbrains.rd.generator.gradle.RdGenTask
+
+plugins {
+    id 'com.jetbrains.rdgen' version "2022.3.1"
+}
 apply from: "${parent.projectDir}/gradle/include/jvm-project.gradle"
 
 dependencies {
     api project(':utbot-framework-api')
+    implementation project(':utbot-rd')
 
     implementation group: 'org.ow2.asm', name: 'asm', version: asm_version
     implementation group: 'org.ow2.asm', name: 'asm-commons', version: asm_version
@@ -10,6 +17,13 @@ dependencies {
     implementation group: 'de.javakaffee', name: 'kryo-serializers', version: kryo_serializers_version
     implementation group: 'io.github.microutils', name: 'kotlin-logging', version: kotlin_logging_version
 
+    implementation group: 'com.jetbrains.rd', name: 'rd-framework', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-gen', version: '2022.3.1'
+    implementation group: 'com.jetbrains.rd', name: 'rd-core', version: '2022.3.1'
+
+    implementation group: 'net.java.dev.jna', name: 'jna-platform', version: '5.5.0'
+
+
     // TODO: this is necessary for inline classes mocking in UtExecutionInstrumentation
     implementation group: 'org.mockito', name: 'mockito-core', version: '4.2.0'
     implementation group: 'org.mockito', name: 'mockito-inline', version: '4.2.0'
@@ -55,3 +69,28 @@ configurations {
 artifacts {
     instrumentationArchive jar
 }
+
+def repoRoot = project.projectDir
+def hashBaseDir = new File(repoRoot, "build/rdgen")
+def rdBaseDir = new File(repoRoot, "src/main/kotlin/org/utbot/instrumentation/rd")
+def rdOutputDir = new File(rdBaseDir, "generated")
+
+task generateProtocolModels(type: RdGenTask) {
+    group = "rdgen"
+    // todo which extensions
+    def rdParams = extensions.getByName("params") as RdGenExtension
+    rdParams.verbose = true
+
+    rdParams.sources(new File(rdBaseDir, "models"))
+    rdParams.hashFolder = new File(hashBaseDir, "models").canonicalPath
+    rdParams.packages = "org.utbot.instrumentation.rd.models"
+
+    rdParams.generator {
+        language = "kotlin"
+        transform = "symmetric"
+        root = "org.utbot.instrumentation.rd.models.ProtocolRoot"
+
+        directory = rdOutputDir.canonicalPath
+        namespace = "org.utbot.instrumentation.rd.generated"
+    }
+}