fix stuff

vorpal-research · Oct 14, 2024 · 459dd8c · 459dd8c
1 parent 9ba1122
commit 459dd8c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
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
@@ -53,7 +53,6 @@ import kotlin.io.path.readBytes
 import kotlin.io.path.relativeTo
 import kotlin.io.path.writeBytes
 import kotlin.io.path.writeText
-import kotlin.streams.toList
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -160,7 +159,7 @@ open class CoverageReporter(
         is PackageLevel -> Files.walk(jacocoInstrumentedDir)
             .filter { it.isClass }
             .filter { analysisLevel.pkg.isParent(it.fullyQualifiedName(jacocoInstrumentedDir).asmString) }
-            .toList()
+            .collect(Collectors.toList())
 
         is ClassLevel -> {
             val targetKlass = analysisLevel.klass.fullName.replace(Package.SEPARATOR, File.separatorChar)
@@ -172,7 +171,7 @@ open class CoverageReporter(
             val additionalFiles = Files.walk(jacocoInstrumentedDir)
                 .filter { it.isClass }
                 .filter { additionalValues.any { value -> value.isParent(it.fullyQualifiedName(jacocoInstrumentedDir).asmString) } }
-                .toList()
+                .collect(Collectors.toList())
 
             targetFiles + additionalFiles
         }
@@ -251,6 +250,7 @@ open class CoverageReporter(
         return coverageBuilder
     }
 
+    @Suppress("DEPRECATION")
     protected fun computeExecutionData(
         context: CoverageContext,
         testClasses: Set<Path>,
@@ -264,7 +264,12 @@ open class CoverageReporter(
         val classLoader = PathClassLoader(listOf(jacocoInstrumentedDir, compileDir))
         for (testPath in testClasses) {
             val testClassName = testPath.fullyQualifiedName(compileDir)
-            val testClass = classLoader.loadClass(testClassName)
+            val testClass = try {
+                classLoader.loadClass(testClassName)
+            } catch (e: Throwable) {
+                log.warn("Warning: could not load test class $testClassName, exception:\n", e)
+                continue
+            }
             if (logProgress) log.debug("Running test $testClassName")
 
             val jcClass = classLoader.loadClass("org.junit.runner.JUnitCore")

diff --git a/pom.xml b/pom.xml
@@ -24,9 +24,9 @@
         <maven.compiler.source>${jvm.version}</maven.compiler.source>
         <maven.compiler.target>${jvm.version}</maven.compiler.target>
 
-        <kotlin.version>2.0.0</kotlin.version>
+        <kotlin.version>2.0.20</kotlin.version>
         <kotlin.code.style>official</kotlin.code.style>
-        <serialization.version>1.7.0-RC</serialization.version>
+        <serialization.version>1.7.3</serialization.version>
         <coroutines.version>1.8.1</coroutines.version>
         <collections.version>0.3.5</collections.version>
         <compiler-plugin.version>3.5.1</compiler-plugin.version>