package renaming

UnitTestBot · Aug 24, 2023 · 0432bcd · 0432bcd
1 parent 7571dbd
commit 0432bcd
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 48 deletions.
diff --git a/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt b/...ntation/src/main/kotlin/org/usvm/instrumentation/executor/InstrumentationProcessRunner.kt
@@ -11,7 +11,8 @@ import org.usvm.instrumentation.rd.InstrumentedProcess
 import org.usvm.instrumentation.testcase.UTest
 import org.usvm.instrumentation.testcase.api.UTestExecutionResult
 import org.usvm.instrumentation.util.InstrumentationModuleConstants
-import osSpecificJavaExecutable
+import org.usvm.instrumentation.util.OpenModulesContainer
+import org.usvm.instrumentation.util.osSpecificJavaExecutable
 import java.io.File
 import java.nio.file.Paths
 import kotlin.reflect.KClass

diff --git a/...on/src/main/kotlin/org/usvm/instrumentation/instrumentation/JcRuntimeTraceInstrumenter.kt b/...on/src/main/kotlin/org/usvm/instrumentation/instrumentation/JcRuntimeTraceInstrumenter.kt
@@ -9,7 +9,6 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.usvm.instrumentation.collector.trace.TraceCollector
 import org.usvm.instrumentation.instrumentation.JcInstructionTracer.StaticFieldAccessType
-import org.usvm.instrumentation.org.usvm.instrumentation.instrumentation.TraceHelper
 import org.usvm.instrumentation.util.isSameSignature
 import org.usvm.instrumentation.util.replace
 

diff --git a/...m-instrumentation/src/main/kotlin/org/usvm/instrumentation/instrumentation/TraceHelper.kt b/...m-instrumentation/src/main/kotlin/org/usvm/instrumentation/instrumentation/TraceHelper.kt
@@ -1,4 +1,4 @@
-package org.usvm.instrumentation.org.usvm.instrumentation.instrumentation
+package org.usvm.instrumentation.instrumentation
 
 import org.jacodb.api.JcClasspath
 import org.jacodb.api.cfg.JcRawCallInst

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/mock/MockClassRebuilder.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/mock/MockClassRebuilder.kt
@@ -1,4 +1,4 @@
-package org.usvm.instrumentation.org.usvm.instrumentation.mock
+package org.usvm.instrumentation.mock
 
 import org.jacodb.api.JcClassOrInterface
 import org.jacodb.api.JcMethod

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/mock/MockHelper.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/mock/MockHelper.kt
@@ -1,4 +1,4 @@
-package org.usvm.instrumentation.org.usvm.instrumentation.mock
+package org.usvm.instrumentation.mock
 
 import org.jacodb.api.*
 import org.jacodb.api.cfg.*
@@ -9,7 +9,7 @@ import org.objectweb.asm.tree.ClassNode
 import org.objectweb.asm.tree.MethodNode
 import org.usvm.instrumentation.classloader.WorkerClassLoader
 import org.usvm.instrumentation.instrumentation.JcInstructionTracer
-import org.usvm.instrumentation.org.usvm.instrumentation.instrumentation.TraceHelper
+import org.usvm.instrumentation.instrumentation.TraceHelper
 import org.usvm.instrumentation.collector.trace.MockCollector
 import org.jacodb.impl.cfg.*
 import org.usvm.instrumentation.util.*

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/rd/UTestExecutor.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/rd/UTestExecutor.kt
@@ -8,7 +8,7 @@ import org.usvm.instrumentation.classloader.WorkerClassLoader
 import org.usvm.instrumentation.collector.trace.MockCollector
 import org.usvm.instrumentation.collector.trace.TraceCollector
 import org.usvm.instrumentation.instrumentation.JcInstructionTracer
-import org.usvm.instrumentation.org.usvm.instrumentation.mock.MockHelper
+import org.usvm.instrumentation.mock.MockHelper
 import org.usvm.instrumentation.testcase.UTest
 import org.usvm.instrumentation.testcase.api.*
 import org.usvm.instrumentation.testcase.descriptor.StaticDescriptorsBuilder

diff --git a/...ion/src/main/kotlin/org/usvm/instrumentation/testcase/executor/UTestExpressionExecutor.kt b/...ion/src/main/kotlin/org/usvm/instrumentation/testcase/executor/UTestExpressionExecutor.kt
@@ -6,7 +6,7 @@ import org.jacodb.api.JcField
 import org.jacodb.api.ext.*
 import org.usvm.instrumentation.classloader.WorkerClassLoader
 import org.usvm.instrumentation.instrumentation.JcInstructionTracer.StaticFieldAccessType
-import org.usvm.instrumentation.org.usvm.instrumentation.mock.MockHelper
+import org.usvm.instrumentation.mock.MockHelper
 import org.usvm.instrumentation.testcase.api.*
 import org.usvm.instrumentation.collector.trace.MockCollector
 import org.usvm.instrumentation.collector.trace.MockCollector.MockValueArrayWrapper

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/instrumentation.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/instrumentation.kt
@@ -1,3 +1,4 @@
+package  org.usvm.instrumentation.util
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*

diff --git a/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/sandbox.kt b/usvm-jvm-instrumentation/src/main/kotlin/org/usvm/instrumentation/util/sandbox.kt
diff --git a/...entation/src/test/kotlin/org/usvm/instrumentation/executor/SimpleUTestConcreteExecutor.kt b/...entation/src/test/kotlin/org/usvm/instrumentation/executor/SimpleUTestConcreteExecutor.kt
@@ -36,14 +36,14 @@ class SimpleUTestConcreteExecutor: UTestConcreteExecutorTest() {
     fun `simple test`() = executeTest {
         val uTest = UTestCreator.C.lol(jcClasspath)
         val res = uTestConcreteExecutor.executeAsync(uTest)
-        check(res is UTestExecutionSuccessResult)
+        assertIs<UTestExecutionSuccessResult>(res)
     }
 
     @Test
     fun `arithmetic operation`() = executeTest {
         val uTest = UTestCreator.A.arithmeticOperation(jcClasspath)
         val res = uTestConcreteExecutor.executeAsync(uTest)
-        check(res is UTestExecutionSuccessResult)
+        assertIs<UTestExecutionSuccessResult>(res)
         val result = res.result
         assertIs<UTestConstantDescriptor.Int>(result)
         assertEquals(239, result.value)
@@ -53,8 +53,7 @@ class SimpleUTestConcreteExecutor: UTestConcreteExecutorTest() {
     fun `exception`() = executeTest {
         val uTest = UTestCreator.A.exception(jcClasspath)
         val res = uTestConcreteExecutor.executeAsync(uTest)
-        assert(res is UTestExecutionExceptionResult)
-        res as UTestExecutionExceptionResult
+        assertIs<UTestExecutionExceptionResult>(res)
         check(res.cause.stackTrace.isNotEmpty())
         assertEquals(res.cause.type, jcClasspath.findTypeOrNull<IllegalArgumentException>())
     }
@@ -63,7 +62,7 @@ class SimpleUTestConcreteExecutor: UTestConcreteExecutorTest() {
     fun `java reflection test`() = executeTest {
         val uTest = UTestCreator.A.getNumberOfClassConstructors(jcClasspath)
         val res = uTestConcreteExecutor.executeAsync(uTest)
-        check(res is UTestExecutionSuccessResult)
+        assertIs<UTestExecutionSuccessResult>(res)
         val result = res.result
         assertNotNull(result)
         assertIs<UTestConstantDescriptor.Int>(result)