diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index 36867b5..4c1af5e 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -8,6 +8,7 @@ import java.io.IOException; import java.util.List; import static rife.bld.dependencies.Repository.MAVEN_CENTRAL; +import static rife.bld.dependencies.Repository.MAVEN_LOCAL; import static rife.bld.dependencies.Scope.test; public class ExamplesBuild extends Project { @@ -16,7 +17,7 @@ public class ExamplesBuild extends Project { name = "Examples"; version = version(0, 1, 0); - repositories = List.of(MAVEN_CENTRAL); + repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); scope(test) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 9, 3))) @@ -26,13 +27,6 @@ public class ExamplesBuild extends Project { public static void main(String[] args) { new ExamplesBuild().start(args); } - -// @Override -// public void test() throws Exception { -// super.test(); -// jacoco(); -// } - @BuildCommand(summary = "Generates Jacoco Reports") public void jacoco() throws IOException { new JacocoReportOperation() diff --git a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java index 04a02ca..598bb8d 100644 --- a/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java +++ b/src/bld/java/rife/bld/extension/JacocoReportOperationBuild.java @@ -53,8 +53,6 @@ public class JacocoReportOperationBuild extends Project { .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 0))) .include(dependency("org.assertj:assertj-joda-time:2.2.0")); - testOperation().mainClass("rife.bld.extension.JacocoReportOperationTest"); - javadocOperation() .javadocOptions() .docLint(NO_MISSING) @@ -62,7 +60,7 @@ public class JacocoReportOperationBuild extends Project { publishOperation() .repository(version.isSnapshot() ? repository("rife2-snapshot") : repository("rife2")) - // .repository(MAVEN_LOCAL) +// .repository(MAVEN_LOCAL) .info() .groupId("com.uwyn.rife2") .artifactId("bld-jacoco-report") @@ -84,7 +82,7 @@ public class JacocoReportOperationBuild extends Project { } @BuildCommand(summary = "Runs PMD analysis") - public void pmd() throws Exception { + public void pmd() { new PmdOperation() .fromProject(this) .failOnViolation(true) diff --git a/src/main/java/rife/bld/extension/JacocoReportOperation.java b/src/main/java/rife/bld/extension/JacocoReportOperation.java index 7b209bb..4122100 100644 --- a/src/main/java/rife/bld/extension/JacocoReportOperation.java +++ b/src/main/java/rife/bld/extension/JacocoReportOperation.java @@ -142,34 +142,38 @@ public class JacocoReportOperation extends AbstractOperation + s.contains(""))).isTrue(); + } + +// deleteOnExit(tempDir.toFile()); } JacocoReportOperation newJacocoReportOperation() { var o = new JacocoReportOperation(); - o.csv(new File(tempDir.toFile(), "jacoco.csv")); + 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; } - - @Test - void executeTest() { - assertThat(true).isTrue(); // TODO - } } \ No newline at end of file diff --git a/src/test/resources/Examples.class b/src/test/resources/Examples.class new file mode 100644 index 0000000..3c5d3b3 Binary files /dev/null and b/src/test/resources/Examples.class differ diff --git a/src/test/resources/jacoco.exec b/src/test/resources/jacoco.exec new file mode 100644 index 0000000..fc1f7a2 Binary files /dev/null and b/src/test/resources/jacoco.exec differ diff --git a/update-test-resource.sh b/update-test-resource.sh new file mode 100755 index 0000000..991b313 --- /dev/null +++ b/update-test-resource.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +rm -rf src/test/resources/* +examples/bld co jacoco +cp -f "examples/build/main/com/example/Examples.class" src/test/resources/ +cp -f "examples/build/jacoco/jacoco.exec" src/test/resources/