optimize and cleanup tests

Author: lehvolk

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/BaseInstructionsTest.kt

@@ -43,7 +43,7 @@ abstract class BaseInstructionsTest : BaseTest() {
 
     val ext = runBlocking { cp.hierarchyExt() }
 
-    fun runKotlinTest(className: String, muteGraphChecker: Boolean = false) {
+    fun runTest(className: String, muteGraphChecker: Boolean = false) {
         val clazz = cp.findClassOrNull(className)
         Assertions.assertNotNull(clazz)
 

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/IincTest.kt

@@ -17,15 +17,12 @@
 package org.jacodb.testing.cfg
 
 import org.jacodb.api.ext.findClass
-import org.jacodb.testing.WithDB
 import org.junit.jupiter.api.Assertions.assertArrayEquals
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class IincTest : BaseInstructionsTest() {
 
-    companion object : WithDB()
-
     @Test
     fun `iinc should work`() {
         val clazz = cp.findClass<Incrementation>()
@@ -105,15 +102,15 @@ class IincTest : BaseInstructionsTest() {
     }
 
     @Test
-    fun `kotlin iinc`() = runKotlinTest(Iinc::class.java.name)
+    fun `kotlin iinc`() = runTest(Iinc::class.java.name)
 
     @Test
-    fun `kotlin iinc2`() = runKotlinTest(Iinc2::class.java.name)
+    fun `kotlin iinc2`() = runTest(Iinc2::class.java.name)
 
     @Test
-    fun `kotlin iinc3`() = runKotlinTest(Iinc3::class.java.name)
+    fun `kotlin iinc3`() = runTest(Iinc3::class.java.name)
 
     @Test
-    fun `kotlin iinc4`() = runKotlinTest(Iinc4::class.java.name)
+    fun `kotlin iinc4`() = runTest(Iinc4::class.java.name)
 
 }

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/InvokeDynamicTest.kt

@@ -17,13 +17,13 @@
 package org.jacodb.testing.cfg
 
 import org.jacodb.api.ext.findClass
-import org.jacodb.testing.WithDB
+import org.jacodb.testing.WithGlobalDB
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class InvokeDynamicTest : BaseInstructionsTest() {
 
-    companion object : WithDB()
+    companion object : WithGlobalDB()
 
     @Test
     fun `test unary function`() = runStaticMethod<InvokeDynamicExamples>("testUnaryFunction")

jacodb-core/src/test/kotlin/org/jacodb/testing/cfg/KotlinInstructionsTest.kt

@@ -16,63 +16,60 @@
 
 package org.jacodb.testing.cfg
 
-import org.jacodb.testing.WithDB
 import org.junit.jupiter.api.Test
 
 class KotlinInstructionsTest: BaseInstructionsTest() {
 
-    companion object : WithDB()
-
     @Test
-    fun `simple test`() = runKotlinTest(SimpleTest::class.java.name)
+    fun `simple test`() = runTest(SimpleTest::class.java.name)
 
     @Test
-    fun `kotlin vararg test`() = runKotlinTest(Varargs::class.java.name)
+    fun `kotlin vararg test`() = runTest(Varargs::class.java.name)
 
     @Test
-    fun `kotlin equals test`() = runKotlinTest(Equals::class.java.name)
+    fun `kotlin equals test`() = runTest(Equals::class.java.name)
 
     @Test
-    fun `kotlin different receivers test`() = runKotlinTest(DifferentReceivers::class.java.name)
+    fun `kotlin different receivers test`() = runTest(DifferentReceivers::class.java.name)
 
     @Test
-    fun `kotlin sequence test`() = runKotlinTest(KotlinSequence::class.java.name)
+    fun `kotlin sequence test`() = runTest(KotlinSequence::class.java.name)
 
     @Test
-    fun `kotlin range test`() = runKotlinTest(Ranges::class.java.name)
+    fun `kotlin range test`() = runTest(Ranges::class.java.name)
 
     @Test
-    fun `kotlin range test 2`() = runKotlinTest(Ranges2::class.java.name)
+    fun `kotlin range test 2`() = runTest(Ranges2::class.java.name)
 
 //    @Test
 //    fun `kotlin overloading test`() = runKotlinTest(Overloading::class.java.name)
 
     //We have to mute graph checker because of empty catch-es in try/catch blocks
     @Test
-    fun `kotlin try catch finally`() = runKotlinTest(TryCatchFinally::class.java.name, muteGraphChecker = true)
+    fun `kotlin try catch finally`() = runTest(TryCatchFinally::class.java.name, muteGraphChecker = true)
 
     @Test
-    fun `kotlin try catch finally 2`() = runKotlinTest(TryCatchFinally2::class.java.name, muteGraphChecker = true)
+    fun `kotlin try catch finally 2`() = runTest(TryCatchFinally2::class.java.name, muteGraphChecker = true)
 
     @Test
-    fun `kotlin try catch finally 3`() = runKotlinTest(TryCatchFinally3::class.java.name, muteGraphChecker = true)
+    fun `kotlin try catch finally 3`() = runTest(TryCatchFinally3::class.java.name, muteGraphChecker = true)
 
     @Test
-    fun `kotlin try catch finally 4`() = runKotlinTest(TryCatchFinally4::class.java.name, muteGraphChecker = true)
+    fun `kotlin try catch finally 4`() = runTest(TryCatchFinally4::class.java.name, muteGraphChecker = true)
 
     @Test
-    fun `kotlin method with exception`() = runKotlinTest(InvokeMethodWithException::class.java.name)
+    fun `kotlin method with exception`() = runTest(InvokeMethodWithException::class.java.name)
 
     @Test
-    fun `kotlin typecast`() = runKotlinTest(DoubleComparison::class.java.name)
+    fun `kotlin typecast`() = runTest(DoubleComparison::class.java.name)
 
     @Test
-    fun `kotlin when expr`() = runKotlinTest(WhenExpr::class.java.name)
+    fun `kotlin when expr`() = runTest(WhenExpr::class.java.name)
 
     @Test
-    fun `kotlin default args`() = runKotlinTest(DefaultArgs::class.java.name)
+    fun `kotlin default args`() = runTest(DefaultArgs::class.java.name)
 
     @Test
-    fun `kotlin arrays`() = runKotlinTest(Arrays::class.java.name)
+    fun `kotlin arrays`() = runTest(Arrays::class.java.name)
 
 }