From 7aa0319d4d9a8667a39075e2247db8c802dc23ca Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 20:38:53 -0700 Subject: [PATCH] Read parameters from resource file --- cliargs.sh | 5 ++-- .../extension/CheckstyleOperationTest.java | 25 +++++-------------- src/test/resources/checkstyle-args.txt | 16 ++++++++++++ 3 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 src/test/resources/checkstyle-args.txt diff --git a/cliargs.sh b/cliargs.sh index cb32bde..3c9bc28 100755 --- a/cliargs.sh +++ b/cliargs.sh @@ -2,6 +2,5 @@ java -cp "lib/test/*" com.puppycrawl.tools.checkstyle.Main --help |\ grep "^ -.*" |\ -sed -e "s/ -/-/" -e "s/[,=].*//" -e "s/-/\"-/" -e "s/$/\",/" |\ -sed -e '$s/,//' -e '/-V/d' -e '/-h/d' |\ -sort +sed -e "s/ -/-/" -e "s/[,=].*//" -e '/-V/d' -e '/-h/d' |\ +sort > "src/test/resources/checkstyle-args.txt" diff --git a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java index f844153..f41077a 100644 --- a/src/test/java/rife/bld/extension/CheckstyleOperationTest.java +++ b/src/test/java/rife/bld/extension/CheckstyleOperationTest.java @@ -24,6 +24,8 @@ import rife.bld.operations.exceptions.ExitStatusException; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -43,25 +45,10 @@ class CheckstyleOperationTest { } @Test - void checkAllParameters() { - var params = List.of( - "-b", - "-c", - "-d", - "-e", - "-E", - "-f", - "-g", - "-j", - "-J", - "-o", - "-p", - "-s", - "-t", - "-T", - "-w", - "-x" - ); + void checkAllParameters() throws IOException { + var params = Files.readAllLines(Paths.get("src", "test", "resources", "checkstyle-args.txt")); + + assertThat(params).isNotEmpty(); var args = new CheckstyleOperation() .fromProject(new Project()) diff --git a/src/test/resources/checkstyle-args.txt b/src/test/resources/checkstyle-args.txt new file mode 100644 index 0000000..fa76eaf --- /dev/null +++ b/src/test/resources/checkstyle-args.txt @@ -0,0 +1,16 @@ +-b +-c +-d +-e +-E +-f +-g +-j +-J +-o +-p +-s +-t +-T +-w +-x