self review pt. 1

vorpal-research · Apr 8, 2024 · 0dced80 · 0dced80
1 parent 9cd6a2d
commit 0dced80
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 24 deletions.
diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/asserter/ExecutionFinalInfo.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/asserter/ExecutionFinalInfo.kt
@@ -28,16 +28,7 @@ class ExecutionSuccessFinalInfo<T>(
     override val instance: T?,
     override val args: List<T>,
     val retValue: T?
-) : ExecutionFinalInfo<T>() {
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is ExecutionSuccessFinalInfo<*>) return false
-        return instance == other.instance && args == other.args && retValue == other.retValue
-    }
-
-    override fun hashCode(): Int = (instance?.hashCode() ?: 0) * 239 + args.hashCode() * 101 + (retValue?.hashCode() ?: 0)
-
-}
+) : ExecutionFinalInfo<T>()
 
 class ExecutionExceptionFinalInfo<T>(
     override val instance: T?,

diff --git a/kex-core/src/main/kotlin/org/vorpal/research/kex/trace/symbolic/SymbolicTraceBuilder.kt b/kex-core/src/main/kotlin/org/vorpal/research/kex/trace/symbolic/SymbolicTraceBuilder.kt
@@ -424,6 +424,7 @@ class SymbolicTraceBuilder(
     }
 
     override fun track(value: String, concreteValue: Any?) {
+        // clear cache - some earlier versions of values may be loaded
         (converter as? Object2DescriptorConverter)?.objectToDescriptor = IdentityHashMap<Any, Descriptor>()
         val kfgValue = parseValue(value)
         val termValue = mkValue(kfgValue)

diff --git a/...c/main/kotlin/org/vorpal/research/kex/asm/analysis/concolic/InstructionConcolicChecker.kt b/...c/main/kotlin/org/vorpal/research/kex/asm/analysis/concolic/InstructionConcolicChecker.kt
@@ -84,9 +84,6 @@ class InstructionConcolicChecker(
             val timeLimit = kexConfig.getIntValue("concolic", "timeLimit", 100)
             val searchStrategy = kexConfig.getStringValue("concolic", "searchStrategy", "bfs")
 
-            log.debug("Running on: ${targets.joinToString("\n", prefix = "\n")}")
-            log.debug("Time budget: $timeLimit")
-
             val actualNumberOfExecutors = maxOf(1, minOf(executors, targets.size))
             val coroutineContext = newFixedThreadPoolContextWithMDC(actualNumberOfExecutors, "concolic-dispatcher")
 

diff --git a/kex-runner/src/main/kotlin/org/vorpal/research/kex/jacoco/CoverageReporter.kt b/kex-runner/src/main/kotlin/org/vorpal/research/kex/jacoco/CoverageReporter.kt
@@ -256,14 +256,6 @@ open class CoverageReporter(
 
             val jcClass = classLoader.loadClass("org.junit.runner.JUnitCore")
             val jc = jcClass.newInstance()
-            // TODO: addListener via reflection
-//            if (kexConfig.getBooleanValue("testGen", "logJUnit", false)) {
-//                jcClass.getMethod("addListener", classLoader.loadClass("org.junit.runner.notification.RunListener"))
-//                    .invoke(jc, classLoader.loadClass("org.vorpal.research.kex."))
-//
-//                jc.addListener(TestLogger())
-//            }
-
 
             val computerClass = classLoader.loadClass("org.junit.runner.Computer")
             val returnValue = jcClass.getMethod("run", computerClass, Class::class.java.asArray())
@@ -273,14 +265,11 @@ open class CoverageReporter(
             (returnValue as? Result)?.failures?.forEach {
                 log.debug(it.trace)
             }
-//            jc.run(Computer(), testClass)
-
 
             val executionData = ExecutionDataStore()
             data.collect(executionData, SessionInfoStore(), false)
             datum[testPath] = executionData.deepCopy()
             data.reset()
-
         }
 
         context.runtime.shutdown()