diff --git a/.github/workflows/bld.yml b/.github/workflows/bld.yml index 6dc0235..c0ba763 100644 --- a/.github/workflows/bld.yml +++ b/.github/workflows/bld.yml @@ -1,16 +1,14 @@ name: bld-ci -on: [ push, pull_request, workflow_dispatch ] +on: [push, pull_request, workflow_dispatch] jobs: build-bld-project: + runs-on: ubuntu-latest + 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 }} + java-version: [17, 21, 22] steps: - name: Checkout source repository @@ -24,16 +22,11 @@ jobs: distribution: "zulu" java-version: ${{ matrix.java-version }} - - name: Download dependencies [examples] - working-directory: examples + - name: Grant execute permission for bld + run: chmod +x bld + + - name: Download the dependencies run: ./bld download - - name: Compile and run JaCoCo [examples] - working-directory: examples - run: ./bld compile jacoco - - - name: Download dependencies - run: ./bld download - - - name: Run tests - run: ./bld compile test \ No newline at end of file + - name: Run tests with bld + run: ./bld compile test diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 508f6a5..bf43624 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -47,11 +47,11 @@ jobs: uses: actions/configure-pages@v3 - name: Upload artifact - uses: actions/upload-pages-artifact@v3 + uses: actions/upload-pages-artifact@v1 with: # Upload generated Javadocs repository path: "build/javadoc/" - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v4 + uses: actions/deploy-pages@v1 diff --git a/.idea/bld.xml b/.idea/bld.xml deleted file mode 100644 index 6600cee..0000000 --- a/.idea/bld.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/copyright/Apache_License.xml b/.idea/copyright/Apache_License.xml index 4446c15..ade80da 100644 --- a/.idea/copyright/Apache_License.xml +++ b/.idea/copyright/Apache_License.xml @@ -1,6 +1,6 @@ - - \ No newline at end of file + diff --git a/.idea/icon.svg b/.idea/icon.svg deleted file mode 100644 index 81220b4..0000000 --- a/.idea/icon.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/.idea/libraries/bld.xml b/.idea/libraries/bld.xml index 153a060..0b615c1 100644 --- a/.idea/libraries/bld.xml +++ b/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/.idea/libraries/compile.xml b/.idea/libraries/compile.xml index 99cc0c0..9bd86aa 100644 --- a/.idea/libraries/compile.xml +++ b/.idea/libraries/compile.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/runtime.xml b/.idea/libraries/runtime.xml index d4069f2..2ae5c4b 100644 --- a/.idea/libraries/runtime.xml +++ b/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/libraries/test.xml b/.idea/libraries/test.xml index 57ed5ef..b80486a 100644 --- a/.idea/libraries/test.xml +++ b/.idea/libraries/test.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/.idea/runConfigurations/Run Tests.xml b/.idea/runConfigurations/Run Tests.xml new file mode 100644 index 0000000..1c87a6e --- /dev/null +++ b/.idea/runConfigurations/Run Tests.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index ba429d0..9e8368e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.2.1.jar", + "${HOME}/.bld/dist/bld-1.9.0.jar", "lib/**/*.jar" ] } diff --git a/README.md b/README.md index fa7d3b7..e7d2b47 100644 --- a/README.md +++ b/README.md @@ -3,26 +3,18 @@ [![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![Java](https://img.shields.io/badge/java-17%2B-blue)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) -[![bld](https://img.shields.io/badge/2.2.1-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) +[![bld](https://img.shields.io/badge/1.9.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-jacoco-report/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-jacoco-report) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-jacoco-report/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-jacoco-report) [![GitHub CI](https://github.com/rife2/bld-jacoco-report/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-jacoco-report/actions/workflows/bld.yml) -To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file: - -```properties -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report -``` - -For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation. - -## Generate Code Coverage Reports +To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). To run the tests and generate the code coverage reports, add the floowing to your build file: ```java @BuildCommand(summary = "Generates Jacoco Reports") -public void jacoco() throws Exception { +public void jacoco() throws IOException { new JacocoReportOperation() .fromProject(this) .execute(); diff --git a/config/pmd.xml b/config/pmd.xml index 2641880..3d3203c 100644 --- a/config/pmd.xml +++ b/config/pmd.xml @@ -7,9 +7,9 @@ + + - - diff --git a/examples/.idea/libraries/bld.xml b/examples/.idea/libraries/bld.xml index 153a060..0b615c1 100644 --- a/examples/.idea/libraries/bld.xml +++ b/examples/.idea/libraries/bld.xml @@ -2,12 +2,12 @@ - + - + diff --git a/examples/.idea/libraries/compile.xml b/examples/.idea/libraries/compile.xml index 99cc0c0..9bd86aa 100644 --- a/examples/.idea/libraries/compile.xml +++ b/examples/.idea/libraries/compile.xml @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/examples/.idea/libraries/runtime.xml b/examples/.idea/libraries/runtime.xml index d4069f2..2ae5c4b 100644 --- a/examples/.idea/libraries/runtime.xml +++ b/examples/.idea/libraries/runtime.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/examples/.idea/libraries/test.xml b/examples/.idea/libraries/test.xml index 57ed5ef..b80486a 100644 --- a/examples/.idea/libraries/test.xml +++ b/examples/.idea/libraries/test.xml @@ -8,7 +8,7 @@ - - + + \ No newline at end of file diff --git a/examples/.vscode/settings.json b/examples/.vscode/settings.json index ba429d0..9e8368e 100644 --- a/examples/.vscode/settings.json +++ b/examples/.vscode/settings.json @@ -9,7 +9,7 @@ ], "java.configuration.updateBuildConfiguration": "automatic", "java.project.referencedLibraries": [ - "${HOME}/.bld/dist/bld-2.2.1.jar", + "${HOME}/.bld/dist/bld-1.9.0.jar", "lib/**/*.jar" ] } diff --git a/examples/lib/bld/bld-wrapper.jar b/examples/lib/bld/bld-wrapper.jar index b186992..82762f1 100644 Binary files a/examples/lib/bld/bld-wrapper.jar and b/examples/lib/bld/bld-wrapper.jar differ diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 736e12d..92b7bdd 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.downloadLocation= -bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.10 +bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.4 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -bld.version=2.2.1 +bld.downloadLocation= +bld.version=1.9.0 diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index 4dd3a0b..7dca92f 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -17,16 +17,14 @@ public class ExamplesBuild extends Project { name = "Examples"; version = version(0, 1, 0); - javaRelease = 17; - downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); scope(test) - .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.junit.jupiter", "junit-jupiter", version(5, 10, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))); } public static void main(String[] args) { @@ -34,7 +32,7 @@ public class ExamplesBuild extends Project { } @BuildCommand(summary = "Generates Jacoco Reports") - public void jacoco() throws Exception { + public void jacoco() throws IOException { new JacocoReportOperation() .fromProject(this) .execute(); diff --git a/lib/bld/bld-wrapper.jar b/lib/bld/bld-wrapper.jar index cf19588..82762f1 100644 Binary files a/lib/bld/bld-wrapper.jar and b/lib/bld/bld-wrapper.jar differ diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index b8fd71b..d08186d 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,7 +1,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.2 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.8 bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES -bld.version=2.2.1 +bld.downloadLocation= +bld.version=1.9.0 diff --git a/scripts/cliargs.sh b/scripts/cliargs.sh deleted file mode 100755 index a1b7900..0000000 --- a/scripts/cliargs.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/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 54a64c4..77da4d1 100644 --- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java +++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2025 the original author or authors. + * Copyright 2023-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,32 +25,30 @@ import rife.bld.publish.PublishScm; import java.util.List; -import static rife.bld.dependencies.Repository.*; -import static rife.bld.dependencies.Scope.compile; -import static rife.bld.dependencies.Scope.test; +import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; +import static rife.bld.dependencies.Repository.RIFE2_RELEASES; +import static rife.bld.dependencies.Scope.*; import static rife.bld.operations.JavadocOptions.DocLinkOption.NO_MISSING; public class JacocoReportOperationBuild extends Project { public JacocoReportOperationBuild() { pkg = "rife.bld.extension"; name = "JacocoReportOperation"; - version = version(0, 9, 10); + version = version(0, 9, 4); javaRelease = 17; - downloadSources = true; autoDownloadPurge = true; - - repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); + repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); - var jacocoVersion = new VersionNumber(0, 8, 13); + var jacocoVersion = new VersionNumber(0, 8, 12); scope(compile) .include(dependency("org.jacoco", "jacoco", jacocoVersion).exclude("*", "org.jacoco.doc")) - .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1))); + .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0))); scope(test) - .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))); + .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) + .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))) + .include(dependency("org.assertj", "assertj-core", version(3, 25, 3))); javadocOperation() .javadocOptions() @@ -61,25 +59,27 @@ public class JacocoReportOperationBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) - .repository(repository("github")) .info() .groupId("com.uwyn.rife2") .artifactId("bld-jacoco-report") .description("bld Extension to Generate JaCoCo Code Coverage Reports") .url("https://github.com/rife2/bld-pmd") - .developer(new PublishDeveloper() - .id("ethauvin") - .name("Erik C. Thauvin") - .email("erik@thauvin.net") - .url("https://erik.thauvin.net/") + .developer( + new PublishDeveloper() + .id("ethauvin") + .name("Erik C. Thauvin") + .email("erik@thauvin.net") + .url("https://erik.thauvin.net/") ) - .license(new PublishLicense() - .name("The Apache License, Version 2.0") - .url("https://www.apache.org/licenses/LICENSE-2.0.txt") + .license( + new PublishLicense() + .name("The Apache License, Version 2.0") + .url("https://www.apache.org/licenses/LICENSE-2.0.txt") ) - .scm(new PublishScm().connection("scm:git:https://github.com/rife2/bld-pmd.git") - .developerConnection("scm:git:git@github.com:rife2/bld-pmd.git") - .url("https://github.com/rife2/bld-pmd") + .scm( + new PublishScm().connection("scm:git:https://github.com/rife2/bld-pmd.git") + .developerConnection("scm:git:git@github.com:rife2/bld-pmd.git") + .url("https://github.com/rife2/bld-pmd") ) .signKey(property("sign.key")) .signPassphrase(property("sign.passphrase")); @@ -90,23 +90,11 @@ public class JacocoReportOperationBuild extends Project { } @BuildCommand(summary = "Runs PMD analysis") - public void pmd() throws Exception { + public void pmd() { new PmdOperation() .fromProject(this) .failOnViolation(true) .ruleSets("config/pmd.xml") .execute(); } - - @Override - public void test() throws Exception { - var os = System.getProperty("os.name"); - if (os != null && os.toLowerCase().contains("linux")) { - 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 3d8946e..77cae06 100644 --- a/src/main/java/rife/bld/extension/JacocoReportOperation.java +++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2023-2025 the original author or authors. + * Copyright 2023-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,57 +52,61 @@ public class JacocoReportOperation extends AbstractOperation classFiles_ = new ArrayList<>(); + final List classFiles = new ArrayList<>(); /** * The location of the exec files. */ - final private Collection execFiles_ = new ArrayList<>(); + final List execFiles = new ArrayList<>(); /** * The location of the source files. */ - final private Collection sourceFiles_ = new ArrayList<>(); + final List sourceFiles = new ArrayList<>(); /** * The location of the CSV report. */ - private File csv_; + File csv; /** * The file to write execution data to. */ - private File destFile_; + File destFile; /** * The source file encoding. */ - private String encoding_; + String encoding; /** * The location of the HTML report. */ - private File html_; - /** - * The project reference. - */ - private BaseProject project_; + File html; /** * The report name. */ - private String reportName_ = "JaCoCo Coverage Report"; + String name = "JaCoCo Coverage Report"; + /** + * The project reference. + */ + BaseProject project; + /** + * The quiet flag. + */ + boolean quiet; /** * THe tab width. */ - private int tabWidth_ = 4; + int tabWidth = 4; /** * THe location of the XML report */ - private File xml_; + File xml; private IBundleCoverage analyze(ExecutionDataStore data) throws IOException { var builder = new CoverageBuilder(); var analyzer = new Analyzer(data, builder); - for (var f : classFiles_) { + for (var f : classFiles) { LOGGER.info(f.getAbsolutePath()); analyzer.analyzeAll(f); } - return builder.getBundle(reportName_); + return builder.getBundle(name); } /** @@ -110,10 +114,10 @@ public class JacocoReportOperation extends AbstractOperation classFiles() { - return classFiles_; - } - - /** - * Sets the locations of Java class files. - * - * @param classFiles the class files - * @return this operation instance - * @see #classFiles(File...) */ public JacocoReportOperation classFiles(Collection classFiles) { - classFiles_.addAll(classFiles); - return this; - } - - /** - * Sets the locations of Java class files. - * - * @param classFiles the class files - * @return this operation instance - * @see #classFiles(Path...) - */ - public JacocoReportOperation classFilesPaths(Collection classFiles) { - return classFiles(classFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of Java class files. - * - * @param classFiles the class files - * @return this operation instance - * @see #classFiles(String...) - */ - public JacocoReportOperation classFilesStrings(Collection classFiles) { - return classFiles(classFiles.stream().map(File::new).toList()); - } - - /** - * Sets the location of the CSV report. - * - * @param csv the report location - * @return this operation instance - */ - public JacocoReportOperation csv(File csv) { - csv_ = csv; + this.classFiles.addAll(classFiles); return this; } /** * Sets the location of the CSV report. * - * @param csv the report location + * @param cvs the report location * @return this operation instance */ - public JacocoReportOperation csv(String csv) { - return csv(new File(csv)); - } - - /** - * Sets the location of the CSV report. - * - * @param csv the report location - * @return this operation instance - */ - public JacocoReportOperation csv(Path csv) { - return csv(csv.toFile()); + public JacocoReportOperation csv(File cvs) { + this.csv = cvs; + return this; } /** @@ -219,30 +149,10 @@ public class JacocoReportOperation extends AbstractOperation execFiles) { - execFiles_.addAll(execFiles); + this.execFiles.addAll(List.of(execFiles)); return this; } - /** - * Returns the locations of the JaCoCo *.exec files to read. - * - * @return the exec files - */ - public Collection execFiles() { - return execFiles_; - } - /** * Sets the locations of the JaCoCo *.exec files to read. * * @param execFiles the exec files * @return this operation instance - * @see #execFiles(Path...) */ - public JacocoReportOperation execFilesPaths(Collection execFiles) { - return execFiles(execFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of the JaCoCo *.exec files to read. - * - * @param execFiles the exec files - * @return this operation instance - * @see #execFiles(String...) - */ - public JacocoReportOperation execFilesStrings(Collection execFiles) { - return execFiles(execFiles.stream().map(File::new).toList()); + public JacocoReportOperation execFiles(Collection execFiles) { + this.execFiles.addAll(execFiles); + return this; } /** * Performs the operation execution that can be wrapped by the {@code #executeOnce} call. */ @Override - public void execute() throws Exception { - if ((project_ == null)) { - if (LOGGER.isLoggable(Level.SEVERE) && !silent()) { - LOGGER.severe("A project must be specified."); - } - throw new ExitStatusException(ExitStatusException.EXIT_FAILURE); - } + public void execute() throws IOException { + if ((project == null) && LOGGER.isLoggable(Level.SEVERE)) { + LOGGER.severe("A project must be specified."); + } else { + var buildJacocoReportsDir = Path.of(project.buildDirectory().getPath(), "reports", "jacoco", "test").toFile(); + var buildJacocoExecDir = Path.of(project.buildDirectory().getPath(), "jacoco").toFile(); + var buildJacocoExec = Path.of(buildJacocoExecDir.getPath(), "jacoco.exec").toFile(); - var buildJacocoReportsDir = Path.of(project_.buildDirectory().getPath(), "reports", "jacoco", "test").toFile(); - var buildJacocoExecDir = Path.of(project_.buildDirectory().getPath(), "jacoco").toFile(); - var buildJacocoExec = Path.of(buildJacocoExecDir.getPath(), "jacoco.exec").toFile(); - - if (destFile_ == null) { - destFile_ = buildJacocoExec; - } - - if (execFiles_.isEmpty()) { - var testOperation = project_.testOperation().fromProject(project_); - testOperation.javaOptions().javaAgent(Path.of(project_.libBldDirectory().getPath(), - "org.jacoco.agent-" + JaCoCo.VERSION.substring(0, JaCoCo.VERSION.lastIndexOf('.')) - + "-runtime.jar").toFile(), "destfile=" + destFile_.getPath()); - - testOperation.execute(); - - if (LOGGER.isLoggable(Level.INFO) && !silent()) { - LOGGER.log(Level.INFO, "Execution Data: {0}", destFile_); + if (destFile == null) { + destFile = Path.of(buildJacocoExecDir.getPath(), "jacoco.exec").toFile(); } - if (buildJacocoExec.exists()) { - execFiles_.add(buildJacocoExec); + if (execFiles.isEmpty()) { +// project.testOperation().fromProject(project).javaOptions().javaAgent( +// Path.of(project.libBldDirectory().getPath(), "org.jacoco.agent-" +// + JaCoCo.VERSION.substring(0, JaCoCo.VERSION.lastIndexOf('.')) + "-runtime.jar").toFile(), +// "destfile=" + destFile.getPath()); + project.testOperation().fromProject(project).javaOptions().add("-javaagent:" + + Path.of(project.libBldDirectory().getPath(), "org.jacoco.agent-" + + JaCoCo.VERSION.substring(0, JaCoCo.VERSION.lastIndexOf('.')) + "-runtime.jar") + + "=destfile=" + destFile.getPath()); + try { + project.testOperation().execute(); + } catch (InterruptedException | ExitStatusException e) { + throw new IOException(e); + } + + if (LOGGER.isLoggable(Level.INFO) && !quiet) { + LOGGER.log(Level.INFO, "Execution Data: {0}", destFile); + } + + if (buildJacocoExec.exists()) { + execFiles.add(buildJacocoExec); + } } + + if (sourceFiles.isEmpty()) { + sourceFiles.add(project.srcMainJavaDirectory()); + } + + if (classFiles.isEmpty()) { + classFiles.add(project.buildMainDirectory()); + } + + if (html == null) { + html = new File(buildJacocoReportsDir, "html"); + } + + if (xml == null) { + xml = new File(buildJacocoReportsDir, "jacocoTestReport.xml"); + } + + if (csv == null) { + csv = new File(buildJacocoReportsDir, "jacocoTestReport.csv"); + } + + //noinspection ResultOfMethodCallIgnored + buildJacocoReportsDir.mkdirs(); + //noinspection ResultOfMethodCallIgnored + buildJacocoExecDir.mkdirs(); + + var loader = loadExecFiles(); + var bundle = analyze(loader.getExecutionDataStore()); + writeReports(bundle, loader); } - - if (sourceFiles_.isEmpty()) { - sourceFiles_.add(project_.srcMainJavaDirectory()); - } - - if (classFiles_.isEmpty()) { - classFiles_.add(project_.buildMainDirectory()); - } - - if (html_ == null) { - html_ = new File(buildJacocoReportsDir, "html"); - } - - if (xml_ == null) { - xml_ = new File(buildJacocoReportsDir, "jacocoTestReport.xml"); - } - - if (csv_ == null) { - csv_ = new File(buildJacocoReportsDir, "jacocoTestReport.csv"); - } - - //noinspection ResultOfMethodCallIgnored - buildJacocoReportsDir.mkdirs(); - //noinspection ResultOfMethodCallIgnored - buildJacocoExecDir.mkdirs(); - - var loader = loadExecFiles(); - var bundle = analyze(loader.getExecutionDataStore()); - writeReports(bundle, loader); } /** @@ -404,7 +264,7 @@ public class JacocoReportOperation extends AbstractOperation visitors = new ArrayList<>(); - if (xml_ != null) { + if (xml != null) { var formatter = new XMLFormatter(); - visitors.add(formatter.createVisitor(Files.newOutputStream(xml_.toPath()))); + visitors.add(formatter.createVisitor(Files.newOutputStream(xml.toPath()))); } - if (csv_ != null) { + if (csv != null) { var formatter = new CSVFormatter(); - visitors.add(formatter.createVisitor(Files.newOutputStream(csv_.toPath()))); + visitors.add(formatter.createVisitor(Files.newOutputStream(csv.toPath()))); } - if (html_ != null) { + if (html != null) { var formatter = new HTMLFormatter(); - visitors.add(formatter.createVisitor(new FileMultiReportOutput(html_))); + visitors.add(formatter.createVisitor(new FileMultiReportOutput(html))); } return new MultiReportVisitor(visitors); @@ -503,82 +343,28 @@ public class JacocoReportOperation extends AbstractOperation sourceFiles) { - sourceFiles_.addAll(sourceFiles); + this.sourceFiles.addAll(List.of(sourceFiles)); return this; } - /** - * Returns the locations of the source files. - * - * @return the source files - */ - public Collection sourceFiles() { - return sourceFiles_; - } - /** * Sets the locations of the source files. (e.g., {@code src/main/java}) * * @param sourceFiles the source files * @return this operation instance - * @see #sourceFiles(Path...) */ - public JacocoReportOperation sourceFilesPaths(Collection sourceFiles) { - return sourceFiles(sourceFiles.stream().map(Path::toFile).toList()); - } - - /** - * Sets the locations of the source files. (e.g., {@code src/main/java}) - * - * @param sourceFiles the source files - * @return this operation instance - * @see #sourceFiles(String...) - */ - public JacocoReportOperation sourceFilesStrings(Collection sourceFiles) { - return sourceFiles(sourceFiles.stream().map(File::new).toList()); + public JacocoReportOperation sourceFiles(Collection sourceFiles) { + this.sourceFiles.addAll(sourceFiles); + return this; } @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops") private ISourceFileLocator sourceLocator() { - var multi = new MultiSourceFileLocator(tabWidth_); - for (var f : sourceFiles_) { - multi.add(new DirectorySourceFileLocator(f, encoding_, tabWidth_)); + var multi = new MultiSourceFileLocator(tabWidth); + for (var f : sourceFiles) { + multi.add(new DirectorySourceFileLocator(f, encoding, tabWidth)); } return multi; } @@ -590,13 +376,13 @@ 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()); - assertThatCode(op::execute).isInstanceOf(ExitStatusException.class); - } - - @Test - void executeTest() throws Exception { + void executeTest() throws IOException { newJacocoReportOperation().execute(); 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(); - } + try (var lines = Files.lines(xml.toPath())) { + assertThat(lines.anyMatch(s -> + s.contains(""))).isTrue(); } assertThat(Path.of(html.getPath(), "com.example", "Examples.java.html")).exists(); + deleteOnExit(tempDir.toFile()); } 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")); - - deleteOnExit(tempDir.toFile()); - - return op; - } - - @Test - void testClassFiles() { - var foo = new File("foo"); - var bar = new File("bar"); - - var op = new JacocoReportOperation().classFiles("foo", "bar"); - assertThat(op.classFiles()).as("String...").contains(foo, bar); - op.classFiles().clear(); - - op = op.classFiles(foo, bar); - assertThat(op.classFiles()).as("File...").contains(foo, bar); - op.classFiles().clear(); - - op = op.classFiles(foo.toPath(), bar.toPath()); - assertThat(op.classFiles()).as("Path...").contains(foo, bar); - op.classFiles().clear(); - - op = op.classFilesStrings(List.of("foo", "bar")); - assertThat(op.classFiles()).as("List(String...)").contains(foo, bar); - op.classFiles().clear(); - - op = op.classFiles(List.of(foo, bar)); - assertThat(op.classFiles()).as("File...").contains(foo, bar); - op.classFiles().clear(); - - op = op.classFilesPaths(List.of(foo.toPath(), bar.toPath())); - assertThat(op.classFiles()).as("Path...").contains(foo, bar); - op.classFiles().clear(); - } - - @Test - void testExecFiles() { - var foo = new File("foo"); - var bar = new File("bar"); - - var op = new JacocoReportOperation().execFiles("foo", "bar"); - assertThat(op.execFiles()).as("String...").contains(foo, bar); - op.execFiles().clear(); - - op = op.execFiles(foo, bar); - assertThat(op.execFiles()).as("File...").contains(foo, bar); - op.execFiles().clear(); - - op = op.execFiles(foo.toPath(), bar.toPath()); - assertThat(op.execFiles()).as("Path...").contains(foo, bar); - op.execFiles().clear(); - - op = op.execFilesStrings(List.of("foo", "bar")); - assertThat(op.execFiles()).as("List(String...)").contains(foo, bar); - op.execFiles().clear(); - - op = op.execFiles(List.of(foo, bar)); - assertThat(op.execFiles()).as("File...").contains(foo, bar); - op.execFiles().clear(); - - op = op.execFilesPaths(List.of(foo.toPath(), bar.toPath())); - assertThat(op.execFiles()).as("Path...").contains(foo, bar); - op.execFiles().clear(); - } - - @Test - void testSourceFiles() { - var foo = new File("foo"); - var bar = new File("bar"); - - var op = new JacocoReportOperation().sourceFiles("foo", "bar"); - assertThat(op.sourceFiles()).as("String...").contains(foo, bar); - op.sourceFiles().clear(); - - op = op.sourceFiles(foo, bar); - assertThat(op.sourceFiles()).as("File...").contains(foo, bar); - op.sourceFiles().clear(); - - 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(); + var o = new JacocoReportOperation(); + o.fromProject(new Project()); + o.csv(csv); + o.html(html); + o.xml(xml); + o.classFiles(new File("src/test/resources/Examples.class")); + o.sourceFiles(new File("examples/src/main/java")); + o.execFiles(new File("src/test/resources/jacoco.exec")); + return o; } } diff --git a/src/test/resources/jacoco-args.txt b/src/test/resources/jacoco-args.txt deleted file mode 100644 index e883975..0000000 --- a/src/test/resources/jacoco-args.txt +++ /dev/null @@ -1,10 +0,0 @@ - ---classfiles ---csv ---encoding ---html ---name ---quiet ---sourcefiles ---tabwith ---xml