diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 9bad144..10702a4 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.1 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.7-SNAPSHOT bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.version=2.0.0-SNAPSHOT diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index fbb1154..b0891ed 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,7 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true bld.downloadLocation= +bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.1 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.1.2 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.version=2.0.0-SNAPSHOT diff --git a/scripts/cliargs.sh b/scripts/cliargs.sh new file mode 100755 index 0000000..a1b7900 --- /dev/null +++ b/scripts/cliargs.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +java -jar lib/compile/org.jacoco.cli-*-nodeps.jar report 2> >(grep "^ [<-]") | + cut -d' ' -f 2 | + sed -e "/help/d" >"src/test/resources/jacoco-args.txt" diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java index b520bf7..5d3cc01 100644 --- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java +++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java @@ -26,7 +26,8 @@ import rife.bld.publish.PublishScm; import java.util.List; import static rife.bld.dependencies.Repository.*; -import static rife.bld.dependencies.Scope.*; +import static rife.bld.dependencies.Scope.compile; +import static rife.bld.dependencies.Scope.test; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; public class JacocoReportOperationBuild extends Project { @@ -97,4 +98,13 @@ public class JacocoReportOperationBuild 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/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java index b055eab..fbcad47 100644 --- a/src/main/java/rife/bld/extension/JacocoReportOperation.java +++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java @@ -151,22 +151,22 @@ public class JacocoReportOperation extends AbstractOperation", + "--classfiles", + "--csv", + "--encoding", + "--html", + "--name", + "--quiet", + "--sourcefiles", + "--tabwith", + "--xml"); + var args = Files.readAllLines(Paths.get("src", "test", "resources", "jacoco-args.txt")); + + assertThat(args).isNotEmpty(); + assertThat(supported).containsAll(args); + + } + @Test void executeFailureTest() { var op = new JacocoReportOperation().fromProject(new Project()); diff --git a/src/test/resources/jacoco-args.txt b/src/test/resources/jacoco-args.txt new file mode 100644 index 0000000..e883975 --- /dev/null +++ b/src/test/resources/jacoco-args.txt @@ -0,0 +1,10 @@ + +--classfiles +--csv +--encoding +--html +--name +--quiet +--sourcefiles +--tabwith +--xml