diff --git a/.idea/misc.xml b/.idea/misc.xml index 22c7683..cf8a3be 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,20 +3,6 @@ - - - diff --git a/src/bld/java/rife/bld/extension/DetektOperationBuild.java b/src/bld/java/rife/bld/extension/DetektOperationBuild.java index 1c830e1..15bf2ff 100644 --- a/src/bld/java/rife/bld/extension/DetektOperationBuild.java +++ b/src/bld/java/rife/bld/extension/DetektOperationBuild.java @@ -34,7 +34,7 @@ public class DetektOperationBuild extends Project { public DetektOperationBuild() { pkg = "rife.bld.extension"; name = "DetektOperation"; - version = version(0, 9, 4); + version = version(0, 9, 5, "SNAPSHOT"); javaRelease = 17; downloadSources = true; diff --git a/src/main/java/rife/bld/extension/DetektOperation.java b/src/main/java/rife/bld/extension/DetektOperation.java index 6104037..6db96db 100644 --- a/src/main/java/rife/bld/extension/DetektOperation.java +++ b/src/main/java/rife/bld/extension/DetektOperation.java @@ -402,7 +402,7 @@ public class DetektOperation extends AbstractProcessOperation { // report if (!report_.isEmpty()) { report_.forEach(it -> { - args.add("-r"); + args.add("--report"); args.add(it.id().name().toLowerCase() + ":" + it.path()); }); } diff --git a/src/test/java/rife/bld/extension/DetektOperationTest.java b/src/test/java/rife/bld/extension/DetektOperationTest.java index dd3e4f4..26e42e6 100644 --- a/src/test/java/rife/bld/extension/DetektOperationTest.java +++ b/src/test/java/rife/bld/extension/DetektOperationTest.java @@ -18,6 +18,7 @@ package rife.bld.extension; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import rife.bld.BaseProject; import rife.bld.blueprints.BaseProjectBlueprint; import rife.bld.operations.exceptions.ExitStatusException; @@ -57,6 +58,74 @@ class DetektOperationTest { } } + @Test + void testCheckAllParameters() { + var params = List.of( + "--all-rules", + "--auto-correct", + "--base-path", + "--baseline", + "--build-upon-default-config", + "--classpath", + "--config", + "--config-resource", + "--create-baseline", + "--debug", + "--disable-default-rulesets", + "--excludes", + "--generate-config", + "--includes", + "--input", + "--jdk-home", + "--jvm-target", + "--language-version", + "--max-issues", + "--parallel", + "--plugins", + "--report" + ); + + var args = new DetektOperation() + .fromProject(new BaseProject()) + .allRules(true) + .autoCorrect(true) + .basePath("basePath") + .baseline("baseline") + .buildUponDefaultConfig(true) + .classPath("classpath") + .classPath(List.of("path2", "path3")) + .config("config") + .config(List.of("config2", "config4")) + .configResource("configResource") + .createBaseline(true) + .debug(true) + .disableDefaultRuleSets(true) + .excludes("excludes") + .generateConfig(true) + .includes("patterns") + .input("input") + .jdkHome("jdkHome") + .jvmTarget("jvmTarget") + .languageVersion("languageVersion") + .maxIssues(10) + .parallel(true) + .plugins("jars") + .plugins(List.of("jars2", "jar3")) + .report(new DetektReport(DetektReportId.HTML, "reports")) + .executeConstructProcessCommandList(); + + for (var p : params) { + var found = false; + for (var a : args) { + if (a.startsWith(p)) { + found = true; + break; + } + } + assertThat(found).as(p + " not found.").isTrue(); + } + } + @Test void testExampleBaseline() throws IOException, ExitStatusException, InterruptedException { var tmpDir = Files.createTempDirectory("bld-detekt-").toFile();