From 0a869da1d520358837f3ad8135b30228c749bf9f Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 27 May 2024 20:27:15 -0700 Subject: [PATCH] Read parameters from resource file --- cliargs.sh | 7 ++- .../bld/extension/TestNgOperationTest.java | 52 +++---------------- src/test/resources/testng-args.txt | 38 ++++++++++++++ 3 files changed, 52 insertions(+), 45 deletions(-) create mode 100644 src/test/resources/testng-args.txt diff --git a/cliargs.sh b/cliargs.sh index 15d8673..054377b 100755 --- a/cliargs.sh +++ b/cliargs.sh @@ -5,6 +5,11 @@ TMP=/tmp/cliargs java -cp "lib/test/*" $MAIN >$TMP 2>/dev/null -cat $TMP | grep "^ -.*" | sed -e "s/ -/-/" -e "s/^-/\"-/" -e "s/$/\",/" -e "s/, -/\",\n\"-/" | sed "/testRunFactory/d" | sort | sed '$s/,//' +cat $TMP |\ +grep "^ -.*" |\ +sed -e "s/ -/-/" -e "s/, -/\n-/" |\ +sed "/testRunFactory/d" |\ +sort |\ +sed '$s/,//' > "src/test/resources/testng-args.txt" rm -rf $TMP diff --git a/src/test/java/rife/bld/extension/TestNgOperationTest.java b/src/test/java/rife/bld/extension/TestNgOperationTest.java index 9dfc4f2..440be3e 100644 --- a/src/test/java/rife/bld/extension/TestNgOperationTest.java +++ b/src/test/java/rife/bld/extension/TestNgOperationTest.java @@ -22,6 +22,9 @@ import rife.bld.blueprints.BaseProjectBlueprint; 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.*; @@ -47,49 +50,10 @@ class TestNgOperationTest { } @Test - void testCheckAllParameters() { - var params = List.of( - "-alwaysrunlisteners", - "-configfailurepolicy", - "-d", - "-dataproviderthreadcount", - "-dependencyinjectorfactory", - "-excludegroups", - "-failwheneverythingskipped", - "-generateResultsPerSuite", - "-groups", - "-ignoreMissedTestNames", - "-includeAllDataDrivenTestsWhenSkipping", - "-listener", - "-listenercomparator", - "-listenerfactory", - "-log", - "-methods", - "-methodselectors", - "-mixed", - "-objectfactory", - "-overrideincludedmethods", - "-parallel", - "-propagateDataProviderFailureAsTestFailure", - "-reporter", - "-shareThreadPoolForDataProviders", - "-spilistenerstoskip", - "-suitename", - "-suitethreadpoolsize", - "-testclass", - "-testjar", - "-testname", - "-testnames", - "-testrunfactory", - "-threadcount", - "-threadpoolfactoryclass", - "-usedefaultlisteners", - "-useGlobalThreadPool", - "-verbose", - "-xmlpathinjar" - ); + void testCheckAllParameters() throws IOException { + var args = Files.readAllLines(Paths.get("src", "test", "resources", "testng-args.txt")); - var args = new TestNgOperation() + var params = new TestNgOperation() .fromProject(new BaseProjectBlueprint(new File("examples"), "com.example", "Examples")) .alwaysRunListeners(true) .dataProviderThreadCount(1) @@ -131,9 +95,9 @@ class TestNgOperationTest { .xmlPathInJar("jarPath") .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; diff --git a/src/test/resources/testng-args.txt b/src/test/resources/testng-args.txt new file mode 100644 index 0000000..8eec8d5 --- /dev/null +++ b/src/test/resources/testng-args.txt @@ -0,0 +1,38 @@ +-alwaysrunlisteners +-configfailurepolicy +-d +-dataproviderthreadcount +-dependencyinjectorfactory +-excludegroups +-failwheneverythingskipped +-generateResultsPerSuite +-groups +-ignoreMissedTestNames +-includeAllDataDrivenTestsWhenSkipping +-listener +-listenercomparator +-listenerfactory +-log +-methods +-methodselectors +-mixed +-objectfactory +-overrideincludedmethods +-parallel +-propagateDataProviderFailureAsTestFailure +-reporter +-shareThreadPoolForDataProviders +-spilistenerstoskip +-suitename +-suitethreadpoolsize +-testclass +-testjar +-testname +-testnames +-testrunfactory +-threadcount +-threadpoolfactoryclass +-usedefaultlisteners +-useGlobalThreadPool +-verbose +-xmlpathinjar