fix detekt issues

Fraunhofer-AISEC · Apr 29, 2024 · afdc925 · afdc925
1 parent 92e603a
commit afdc925
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/.../main/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/coko/evaluators/PrecedesEvaluator.kt b/.../main/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/coko/evaluators/PrecedesEvaluator.kt
@@ -61,13 +61,6 @@ class PrecedesEvaluator(val prevOp: Op, val thisOp: Op) : Evaluator {
         val passMessage = ruleAnnotation?.passMessage?.takeIf { it.isNotEmpty() } ?: defaultPassMessage
 
         for (target in thisNodes) {
-            /*
-            val paths = prevNodes
-                .map { start -> start.followNextEOGEdgesUntilHit { target == it } }
-                .fold(FulfilledAndFailedPaths(listOf(), listOf())) { acc, next ->
-                    FulfilledAndFailedPaths(acc.fulfilled + next.fulfilled, acc.failed + next.failed)
-                }
-            */
             val paths = target.followPrevEOGEdgesUntilHit { prevNodes.contains(it) }
 
             val newFindings =
@@ -77,11 +70,11 @@ class PrecedesEvaluator(val prevOp: Op, val thisOp: Op) : Evaluator {
                     listOf(
                         CpgFinding(
                             message = "Complies with rule: ${availablePrevNodes.joinToString(
-                                    prefix = "\"",
-                                    separator = "\", \"",
-                                    postfix = "\"",
-                                    transform = { node -> node.code ?: node.toString() }
-                                )} precedes ${target.code}. $passMessage",
+                                prefix = "\"",
+                                separator = "\", \"",
+                                postfix = "\"",
+                                transform = { node -> node.code ?: node.toString() }
+                            )} precedes ${target.code}. $passMessage",
                             kind = Finding.Kind.Pass,
                             node = target,
                             relatedNodes = availablePrevNodes

diff --git a/...nds/cpg/src/test/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/PrecedesEvaluationTest.kt b/...nds/cpg/src/test/kotlin/de/fraunhofer/aisec/codyze/backends/cpg/PrecedesEvaluationTest.kt
@@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test
 import java.nio.file.Path
 import kotlin.io.path.*
 import kotlin.reflect.full.valueParameters
-import kotlin.test.Ignore
 import kotlin.test.assertFalse
 import kotlin.test.assertNotNull
 import kotlin.test.assertTrue