diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml
index ee59c37..6dc0235 100644
--- a/.github/workflows/bld.yml
+++ b/.github/workflows/bld.yml
@@ -7,6 +7,7 @@ jobs:
strategy:
matrix:
java-version: [ 17, 21, 24 ]
+ kotlin-version: [ 1.9.25, 2.0.21, 2.1.20 ]
os: [ ubuntu-latest, windows-latest, macos-latest ]
runs-on: ${{ matrix.os }}
@@ -35,4 +36,4 @@ jobs:
run: ./bld download
- name: Run tests
- run: ./bld compile test
+ run: ./bld compile test
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7592f20..b646895 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -45,7 +45,7 @@
-
+
\ No newline at end of file
diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java
index cbcbd5a..4dd3a0b 100644
--- a/examples/src/bld/java/com/example/ExamplesBuild.java
+++ b/examples/src/bld/java/com/example/ExamplesBuild.java
@@ -25,8 +25,8 @@ public class ExamplesBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
scope(test)
- .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2)))
- .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2)));
+ .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+ .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
}
public static void main(String[] args) {
diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties
index e6f9660..b8fd71b 100644
--- a/lib/bld/bld-wrapper.properties
+++ b/lib/bld/bld-wrapper.properties
@@ -2,6 +2,6 @@ bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true
bld.downloadLocation=
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5
-bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.3
+bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.version=2.2.1
diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
index e8e7246..54a64c4 100644
--- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
+++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java
@@ -23,9 +23,6 @@ import rife.bld.publish.PublishDeveloper;
import rife.bld.publish.PublishLicense;
import rife.bld.publish.PublishScm;
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.List;
import static rife.bld.dependencies.Repository.*;
@@ -37,13 +34,13 @@ public class JacocoReportOperationBuild extends Project {
public JacocoReportOperationBuild() {
pkg = "rife.bld.extension";
name = "JacocoReportOperation";
- version = version(0, 9, 11, "SNAPSHOT");
+ version = version(0, 9, 10);
javaRelease = 17;
downloadSources = true;
autoDownloadPurge = true;
-
+
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
var jacocoVersion = new VersionNumber(0, 8, 13);
@@ -51,8 +48,8 @@ public class JacocoReportOperationBuild extends Project {
.include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc"))
.include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
scope(test)
- .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 2)))
- .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 2)))
+ .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
+ .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)))
.include(dependency("org.assertj", "assertj-core", version(3, 27, 3)));
javadocOperation()
@@ -110,32 +107,6 @@ public class JacocoReportOperationBuild extends Project {
.command("scripts/cliargs.sh")
.execute();
}
-
- var testResultsDir = "build/test-results/test/";
- var op = testOperation().fromProject(this);
- op.testToolOptions().reportsDir(new File(testResultsDir));
-
- Exception ex = null;
- try {
- op.execute();
- } catch (Exception e) {
- ex = e;
- }
-
- var xunitViewer = new File("/usr/bin/xunit-viewer");
- if (xunitViewer.exists() && xunitViewer.canExecute()) {
- var reportsDir = "build/reports/tests/test/";
-
- Files.createDirectories(Path.of(reportsDir));
-
- new ExecOperation()
- .fromProject(this)
- .command(xunitViewer.getPath(), "-r", testResultsDir, "-o", reportsDir + "index.html")
- .execute();
- }
-
- if (ex != null) {
- throw ex;
- }
+ super.test();
}
}
diff --git a/src/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java
index c135439..3d8946e 100644
--- a/src/main/java/rife/bld/extension/JacocoReportOperation.java
+++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java
@@ -61,10 +61,6 @@ public class JacocoReportOperation extends AbstractOperation sourceFiles_ = new ArrayList<>();
- /**
- * The test tool options.
- */
- final private Collection testToolOptions_ = new ArrayList<>();
/**
* The location of the CSV report.
*/
@@ -216,15 +212,6 @@ public class JacocoReportOperation extends AbstractOperation",
"--classfiles",
"--csv",
@@ -81,339 +79,131 @@ class JacocoReportOperationTest {
}
- @Nested
- @DisplayName("Execute Tests")
- class ExecuteTests {
- @Test
- void execute() throws Exception {
- newJacocoReportOperation().execute();
-
- assertThat(csvFile).exists();
- assertThat(htmlDir).isDirectory();
- assertThat(xmlFile).exists();
- try (var softly = new AutoCloseableSoftAssertions()) {
- try (var lines = Files.lines(xmlFile.toPath())) {
- softly.assertThat(lines.anyMatch(s ->
- s.contains(""))).isTrue();
- }
- }
- assertThat(Path.of(htmlDir.getPath(), "com.example", "Examples.java.html")).exists();
- }
-
- @Test
- void executeFailure() {
- var op = new JacocoReportOperation().fromProject(new Project());
- assertThatCode(op::execute).isInstanceOf(ExitStatusException.class);
- }
-
- JacocoReportOperation newJacocoReportOperation() {
- var op = new JacocoReportOperation()
- .fromProject(new Project())
- .csv(csvFile)
- .html(htmlDir)
- .xml(xmlFile)
- .classFiles(new File("src/test/resources/Examples.class"))
- .sourceFiles(new File("examples/src/main/java"))
- .execFiles(new File("src/test/resources/jacoco.exec"));
-
- deleteOnExit(tempDir.toFile());
-
- return op;
- }
+ @Test
+ void executeFailureTest() {
+ var op = new JacocoReportOperation().fromProject(new Project());
+ assertThatCode(op::execute).isInstanceOf(ExitStatusException.class);
}
+ @Test
+ void executeTest() throws Exception {
+ newJacocoReportOperation().execute();
- @Nested
- @DisplayName("Options Tests")
- class OptionsTests {
- public static final String FOO = "foo";
- private final File fooFile = new File(FOO);
-
- @Test
- void csvAsFile() {
- var op = new JacocoReportOperation();
- op.csv(fooFile);
- assertThat(op.csv()).isEqualTo(fooFile);
- }
-
- @Test
- void csvAsPath() {
- var fooPath = fooFile.toPath();
- var op = new JacocoReportOperation();
- op.csv(fooPath);
- assertThat(op.csv()).isEqualTo(fooFile);
- }
-
- @Test
- void csvAsString() {
- var op = new JacocoReportOperation();
- op.csv(FOO);
- assertThat(op.csv()).isEqualTo(fooFile);
- }
-
- @Test
- void htmlAsFile() {
- var op = new JacocoReportOperation();
- op.html(fooFile);
- assertThat(op.html()).isEqualTo(fooFile);
- }
-
- @Test
- void htmlAsPath() {
- var fooPath = fooFile.toPath();
- var op = new JacocoReportOperation();
- op.html(fooPath);
- assertThat(op.html()).isEqualTo(fooFile);
- }
-
- @Test
- void htmlAsString() {
- var op = new JacocoReportOperation();
- op.html(FOO);
- assertThat(op.html()).isEqualTo(fooFile);
- }
-
- @Test
- void quietIsFalse() {
- var op = new JacocoReportOperation();
- op.quiet(false);
- assertThat(op.isQuiet()).isFalse();
- }
-
- @Test
- void quietIsTrue() {
- var op = new JacocoReportOperation();
- op.quiet(true);
- assertThat(op.isQuiet()).isTrue();
- }
-
- @Test
- void reportName() {
- var op = new JacocoReportOperation();
- op.name(FOO);
- assertThat(op.name()).isEqualTo(FOO);
- }
-
- @Test
- void tabWidth() {
- var op = new JacocoReportOperation();
- op.tabWidth(4);
- assertThat(op.tabWidth()).isEqualTo(4);
- }
-
- @Test
- void xmlAsFile() {
- var op = new JacocoReportOperation();
- op.xml(fooFile);
- assertThat(op.xml()).isEqualTo(fooFile);
- }
-
- @Test
- void xmlAsPath() {
- var fooPath = fooFile.toPath();
- var op = new JacocoReportOperation();
- op.xml(fooPath);
- assertThat(op.xml()).isEqualTo(fooFile);
- }
-
- @Test
- void xmlAsString() {
- var op = new JacocoReportOperation();
- op.xml(FOO);
- assertThat(op.xml()).isEqualTo(fooFile);
- }
-
- @Nested
- @DisplayName("Test Tool Options Tests")
- class TestToolOptionsTests {
- public static final String BAR = "bar";
-
- @Test
- void testToolOptionsAsArray() {
- var op = new JacocoReportOperation();
- op = op.testToolOptions(FOO, BAR);
- assertThat(op.testToolOptions()).contains(FOO, BAR);
- }
-
- @Test
- void testToolOptionsAsList() {
- var op = new JacocoReportOperation();
- op.testToolOptions(List.of(FOO, BAR));
- assertThat(op.testToolOptions()).contains(FOO, BAR);
+ assertThat(csv).exists();
+ assertThat(html).isDirectory();
+ assertThat(xml).exists();
+ try (var softly = new AutoCloseableSoftAssertions()) {
+ try (var lines = Files.lines(xml.toPath())) {
+ softly.assertThat(lines.anyMatch(s ->
+ s.contains(""))).isTrue();
}
}
+ assertThat(Path.of(html.getPath(), "com.example", "Examples.java.html")).exists();
+
}
- @Nested
- @DisplayName("File Operation Tests")
- class FilesOperationTests {
- private final File barFile = new File("bar");
- private final File fooFile = new File("foo");
- private final JacocoReportOperation op = new JacocoReportOperation();
+ JacocoReportOperation newJacocoReportOperation() {
+ var op = new JacocoReportOperation()
+ .fromProject(new Project())
+ .csv(csv)
+ .html(html)
+ .xml(xml)
+ .classFiles(new File("src/test/resources/Examples.class"))
+ .sourceFiles(new File("examples/src/main/java"))
+ .execFiles(new File("src/test/resources/jacoco.exec"));
- @Nested
- @DisplayName("Class Files Tests")
- class ClassFilesTests {
- @Test
- void classFilesAsFileArray() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFiles(fooFile, barFile);
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
+ deleteOnExit(tempDir.toFile());
- @Test
- void classFilesAsFileList() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFiles(List.of(fooFile, barFile));
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
+ return op;
+ }
- @Test
- void classFilesAsPathArray() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFiles(fooFile.toPath(), barFile.toPath());
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
+ @Test
+ void testClassFiles() {
+ var foo = new File("foo");
+ var bar = new File("bar");
- @Test
- void classFilesAsPathList() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFilesPaths(List.of(fooFile.toPath(), barFile.toPath()));
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
+ var op = new JacocoReportOperation().classFiles("foo", "bar");
+ assertThat(op.classFiles()).as("String...").contains(foo, bar);
+ op.classFiles().clear();
- @Test
- void classFilesAsStringArray() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFiles("foo", "bar");
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
+ op = op.classFiles(foo, bar);
+ assertThat(op.classFiles()).as("File...").contains(foo, bar);
+ op.classFiles().clear();
- @Test
- void classFilesAsStringList() {
- op.classFiles().clear();
- assertThat(op.classFiles()).isEmpty();
- op.classFilesStrings(List.of("foo", "bar"));
- assertThat(op.classFiles()).contains(fooFile, barFile);
- }
- }
+ op = op.classFiles(foo.toPath(), bar.toPath());
+ assertThat(op.classFiles()).as("Path...").contains(foo, bar);
+ op.classFiles().clear();
- @Nested
- @DisplayName("Exec Files Tests")
- class ExecFilesTests {
- private final File barFile = new File("bar");
- private final File fooFile = new File("foo");
- private final JacocoReportOperation op = new JacocoReportOperation();
+ op = op.classFilesStrings(List.of("foo", "bar"));
+ assertThat(op.classFiles()).as("List(String...)").contains(foo, bar);
+ op.classFiles().clear();
- @Test
- void execFilesAsFileArray() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFiles(fooFile, barFile);
- assertThat(op.execFiles()).contains(fooFile, barFile);
- }
+ op = op.classFiles(List.of(foo, bar));
+ assertThat(op.classFiles()).as("File...").contains(foo, bar);
+ op.classFiles().clear();
- @Test
- void execFilesAsFileList() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFiles(List.of(fooFile, barFile));
- assertThat(op.execFiles()).contains(fooFile, barFile);
- }
+ op = op.classFilesPaths(List.of(foo.toPath(), bar.toPath()));
+ assertThat(op.classFiles()).as("Path...").contains(foo, bar);
+ op.classFiles().clear();
+ }
- @Test
- void execFilesAsPathArray() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFiles(fooFile.toPath(), barFile.toPath());
- assertThat(op.execFiles()).contains(fooFile, barFile);
- }
+ @Test
+ void testExecFiles() {
+ var foo = new File("foo");
+ var bar = new File("bar");
- @Test
- void execFilesAsPathList() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFilesPaths(List.of(fooFile.toPath(), barFile.toPath()));
- assertThat(op.execFiles()).contains(fooFile, barFile);
- op.execFiles().clear();
- }
+ var op = new JacocoReportOperation().execFiles("foo", "bar");
+ assertThat(op.execFiles()).as("String...").contains(foo, bar);
+ op.execFiles().clear();
- @Test
- void execFilesAsStringArray() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFiles("foo", "bar");
- assertThat(op.execFiles()).contains(fooFile, barFile);
- }
+ op = op.execFiles(foo, bar);
+ assertThat(op.execFiles()).as("File...").contains(foo, bar);
+ op.execFiles().clear();
- @Test
- void execFilesAsStringList() {
- op.execFiles().clear();
- assertThat(op.execFiles()).isEmpty();
- op.execFilesStrings(List.of("foo", "bar"));
- assertThat(op.execFiles()).contains(fooFile, barFile);
- }
- }
+ op = op.execFiles(foo.toPath(), bar.toPath());
+ assertThat(op.execFiles()).as("Path...").contains(foo, bar);
+ op.execFiles().clear();
- @Nested
- @DisplayName("Source Files Tests")
- class SourceFilesTests {
- private final File barFile = new File("bar");
- private final File fooFile = new File("foo");
- private final JacocoReportOperation op = new JacocoReportOperation();
+ op = op.execFilesStrings(List.of("foo", "bar"));
+ assertThat(op.execFiles()).as("List(String...)").contains(foo, bar);
+ op.execFiles().clear();
- @Test
- void sourceFilesAsFileArray() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFiles(fooFile, barFile);
- assertThat(op.sourceFiles()).as("File...").contains(fooFile, barFile);
- }
+ op = op.execFiles(List.of(foo, bar));
+ assertThat(op.execFiles()).as("File...").contains(foo, bar);
+ op.execFiles().clear();
- @Test
- void sourceFilesAsFileList() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFiles(List.of(fooFile, barFile));
- assertThat(op.sourceFiles()).as("File...").contains(fooFile, barFile);
- }
+ op = op.execFilesPaths(List.of(foo.toPath(), bar.toPath()));
+ assertThat(op.execFiles()).as("Path...").contains(foo, bar);
+ op.execFiles().clear();
+ }
- @Test
- void sourceFilesAsPathList() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFilesPaths(List.of(fooFile.toPath(), barFile.toPath()));
- assertThat(op.sourceFiles()).as("Path...").contains(fooFile, barFile);
- }
+ @Test
+ void testSourceFiles() {
+ var foo = new File("foo");
+ var bar = new File("bar");
- @Test
- void sourceFilesAsStringArray() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFiles("foo", "bar");
- assertThat(op.sourceFiles()).as("String...").contains(fooFile, barFile);
- }
+ var op = new JacocoReportOperation().sourceFiles("foo", "bar");
+ assertThat(op.sourceFiles()).as("String...").contains(foo, bar);
+ op.sourceFiles().clear();
- @Test
- void sourceFilesAsStringList() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFilesStrings(List.of("foo", "bar"));
- assertThat(op.sourceFiles()).as("List(String...)").contains(fooFile, barFile);
- }
+ op = op.sourceFiles(foo, bar);
+ assertThat(op.sourceFiles()).as("File...").contains(foo, bar);
+ op.sourceFiles().clear();
- @Test
- void sourceFilesPathArray() {
- op.sourceFiles().clear();
- assertThat(op.sourceFiles()).isEmpty();
- op.sourceFiles(fooFile.toPath(), barFile.toPath());
- assertThat(op.sourceFiles()).as("Path...").contains(fooFile, barFile);
- }
- }
+ op = op.sourceFiles(foo.toPath(), bar.toPath());
+ assertThat(op.sourceFiles()).as("Path...").contains(foo, bar);
+ op.sourceFiles().clear();
+
+ op = op.sourceFilesStrings(List.of("foo", "bar"));
+ assertThat(op.sourceFiles()).as("List(String...)").contains(foo, bar);
+ op.sourceFiles().clear();
+
+ op = op.sourceFiles(List.of(foo, bar));
+ assertThat(op.sourceFiles()).as("File...").contains(foo, bar);
+ op.sourceFiles().clear();
+
+ op = op.sourceFilesPaths(List.of(foo.toPath(), bar.toPath()));
+ assertThat(op.sourceFiles()).as("Path...").contains(foo, bar);
+ op.sourceFiles().clear();
}
}