Code Cleanup (#837)

Fraunhofer-AISEC · Jul 12, 2022 · f950a92 · f950a92
1 parent 602852a
commit f950a92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/cpg-core/src/test/kotlin/de/fraunhofer/aisec/cpg/enhancements/variable_resolution/VRUtil.kt b/cpg-core/src/test/kotlin/de/fraunhofer/aisec/cpg/enhancements/variable_resolution/VRUtil.kt
@@ -70,8 +70,8 @@ object VRUtil {
             assertSame(usedNode, usingNode)
         } else {
             assertTrue(usingNode is DeclaredReferenceExpression)
-            val reference = usingNode as DeclaredReferenceExpression?
-            assertEquals(reference!!.refersTo, usedNode)
+            val reference = usingNode as? DeclaredReferenceExpression
+            assertEquals(reference?.refersTo, usedNode)
         }
     }
 

diff --git a/cpg-core/src/test/kotlin/de/fraunhofer/aisec/cpg/passes/scopes/ScopeManagerTest.kt b/cpg-core/src/test/kotlin/de/fraunhofer/aisec/cpg/passes/scopes/ScopeManagerTest.kt
@@ -37,13 +37,8 @@ import de.fraunhofer.aisec.cpg.graph.declarations.ConstructorDeclaration
 import de.fraunhofer.aisec.cpg.graph.declarations.MethodDeclaration
 import java.io.File
 import kotlin.test.*
-<<<<<<< HEAD
 import kotlin.test.BeforeTest
 import kotlin.test.Test
-=======
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
->>>>>>> 0efe0c1a (Fixing templates)
 
 internal class ScopeManagerTest : BaseTest() {
     private lateinit var config: TranslationConfiguration