Merge branch 'main' into renovate/io.github.detekt.sarif4k-sarif4k-0.x

Fraunhofer-AISEC · Apr 3, 2024 · f7a24af · f7a24af
2 parents 653daef + 7079558
commit f7a24af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 874 deletions.
diff --git a/buildSrc/src/main/kotlin/code-quality.gradle.kts b/buildSrc/src/main/kotlin/code-quality.gradle.kts
@@ -28,7 +28,8 @@ tasks.jacocoTestReport {
 // a merged report
 tasks.withType<Detekt>().configureEach {
     basePath = "${rootProject.projectDir.absolutePath}"
-    config.setFrom(files("$rootDir/detekt.yml"))
+    buildUponDefaultConfig = true
+    config.setFrom(rootDir.resolve("detekt.yml"))
 }
 
 // custom task for fixing formatting issues

diff --git a/...tlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/CokoCpgIntegrationTest.kt b/...tlin/de/fraunhofer/aisec/codyze/specificationLanguages/coko/dsl/CokoCpgIntegrationTest.kt
@@ -131,6 +131,7 @@ class CokoCpgIntegrationTest {
     @MethodSource("threeFiles")
     fun `test coko with cpg backend and permutation of three dependent spec files`(
         specFiles: List<Path>,
+        @Suppress("detekt:style:UnusedParameter") // used for parameterized test names
         fileNames: List<String>
     ) {
         assertEquals(3, specFiles.size)
@@ -160,6 +161,7 @@ class CokoCpgIntegrationTest {
     @MethodSource("fourFiles")
     fun `test coko with cpg backend and permutation of four dependent spec files`(
         specFiles: List<Path>,
+        @Suppress("detekt:style:UnusedParameter") // used for parameterized test names
         fileNames: List<String>
     ) {
         assertEquals(4, specFiles.size)
@@ -191,6 +193,7 @@ class CokoCpgIntegrationTest {
     @MethodSource("fiveFiles")
     fun `test coko with cpg backend and permutation of five dependent spec files`(
         specFiles: List<Path>,
+        @Suppress("detekt:style:UnusedParameter") // used for parameterized test names
         fileNames: List<String>
     ) {
         assertEquals(5, specFiles.size)