From be15297cc55a540b0616ea0a37919ab83c1fb6ea Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 28 May 2024 13:54:33 -0700
Subject: [PATCH] Execute cliargs script before running tests

---
 checkcliargs.sh                                      | 12 ------------
 lib/bld/bld-wrapper.properties                       |  1 +
 scripts/checkcliargs.sh                              | 12 ++++++++++++
 cliargs.sh => scripts/cliargs.sh                     |  0
 .../rife/bld/extension/DetektOperationBuild.java     | 11 +++++++++++
 .../java/rife/bld/extension/DetektOperationTest.java | 10 +++++-----
 6 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100755 checkcliargs.sh
 create mode 100755 scripts/checkcliargs.sh
 rename cliargs.sh => scripts/cliargs.sh (100%)

diff --git a/checkcliargs.sh b/checkcliargs.sh
deleted file mode 100755
index 9f49d61..0000000
--- a/checkcliargs.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-MAIN="io.gitlab.arturbosch.detekt.cli.Main"
-TMPNEW=/tmp/checkcliargs-new
-TMPOLD=/tmp/checkcliargs-old
-
-java -cp "lib/compile/*:examples/lib/bld/*" $MAIN --help >$TMPNEW
-java -cp "examples/lib/bld/*" $MAIN --help >$TMPOLD
-
-diff $TMPOLD $TMPNEW
-
-rm -rf $TMPNEW $TMPOLD
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index 56cd8a5..eb5f238 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -1,6 +1,7 @@
 bld.downloadExtensionJavadoc=false
 bld.downloadExtensionSources=true
 bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9
+bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.0
 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
 bld.downloadLocation=
 bld.sourceDirectories=
diff --git a/scripts/checkcliargs.sh b/scripts/checkcliargs.sh
new file mode 100755
index 0000000..44517ee
--- /dev/null
+++ b/scripts/checkcliargs.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+main=io.gitlab.arturbosch.detekt.cli.Main
+new=/tmp/checkcliargs-new
+old=/tmp/checkcliargs-old
+
+java -cp "lib/compile/*:examples/lib/bld/*" $main --help >$new
+java -cp "examples/lib/bld/*" $main --help >$old
+
+diff $old $new
+
+rm -rf $new $old
diff --git a/cliargs.sh b/scripts/cliargs.sh
similarity index 100%
rename from cliargs.sh
rename to scripts/cliargs.sh
diff --git a/src/bld/java/rife/bld/extension/DetektOperationBuild.java b/src/bld/java/rife/bld/extension/DetektOperationBuild.java
index 15bf2ff..5e687e0 100644
--- a/src/bld/java/rife/bld/extension/DetektOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/DetektOperationBuild.java
@@ -95,4 +95,15 @@ public class DetektOperationBuild extends Project {
                 .ruleSets("config/pmd.xml")
                 .execute();
     }
+
+    @Override
+    public void test() throws Exception {
+        new ExecOperation()
+                .fromProject(this)
+                .command("scripts/cliargs.sh")
+                .execute();
+        super.test();
+    }
+
+
 }
diff --git a/src/test/java/rife/bld/extension/DetektOperationTest.java b/src/test/java/rife/bld/extension/DetektOperationTest.java
index c368d19..9112adc 100644
--- a/src/test/java/rife/bld/extension/DetektOperationTest.java
+++ b/src/test/java/rife/bld/extension/DetektOperationTest.java
@@ -61,11 +61,11 @@ class DetektOperationTest {
 
     @Test
     void testCheckAllParameters() throws IOException {
-        var params = Files.readAllLines(Paths.get("src", "test", "resources", "detekt-args.txt"));
+        var args = Files.readAllLines(Paths.get("src", "test", "resources", "detekt-args.txt"));
 
-        assertThat(params).isNotEmpty();
+        assertThat(args).isNotEmpty();
 
-        var args = new DetektOperation()
+        var params = new DetektOperation()
                 .fromProject(new BaseProject())
                 .allRules(true)
                 .autoCorrect(true)
@@ -94,9 +94,9 @@ class DetektOperationTest {
                 .report(new DetektReport(DetektReportId.HTML, "reports"))
                 .executeConstructProcessCommandList();
 
-        for (var p : params) {
+        for (var p : args) {
             var found = false;
-            for (var a : args) {
+            for (var a : params) {
                 if (a.startsWith(p)) {
                     found = true;
                     break;