Compare commits

...

19 commits

Author SHA1 Message Date
38d25733fc
Bump PIT from version 1.19.0 to 1.19.1 2025-04-08 09:02:58 -07:00
0671bdfd7a
Version 1.0.10 2025-03-28 11:20:00 -07:00
926580f12e
Updated extensions dependencies
Bump PMD from 1.2.1 to 1.2.2
Bump Exec from 1.0.4 to 1.0.5
2025-03-28 11:19:37 -07:00
7fbe975128
Cleanup workaround 2025-03-25 15:28:40 -07:00
e9f1fe25d9
Workaround for pitest not being able to deal with wildcard paths on Windows 2025-03-25 14:37:33 -07:00
ebef9ea3d5
Log process command line arguments 2025-03-25 13:30:05 -07:00
c4ba97ff6d
Enabled extensions logging 2025-03-25 13:29:33 -07:00
4573055b56
Bump Pitest extension to version 1.1.10-SNAPSHOT 2025-03-25 13:18:02 -07:00
edbc515eba
Add OS matrix for Ubuntu, Windows and macOS 2025-03-25 13:15:09 -07:00
09beae6e4e
Only check pitest arguments on Linux 2025-03-25 13:14:57 -07:00
dad854d7e8
Fix non system specific path separator 2025-03-25 13:11:25 -07:00
d373dd26c6
JDK 24 2025-03-18 23:38:42 -07:00
bff5cd76e6
Add generic installation instructions 2025-03-18 13:04:31 -07:00
2e3d65bd08
Bump PIT to version 1.19.0 2025-03-17 09:48:00 -07:00
22b0babdd5
Bump PMD extension to version 1.2.1 2025-03-17 09:47:25 -07:00
f089ff8c9f
Bump PIT Junit5 plugin to version 1.2.2 2025-02-24 23:02:42 -08:00
80c4ae0744
Bump bld to version 2.2.1 2025-02-24 22:54:59 -08:00
3d8d41ae3d
Bump JUnit to version 5.12.0 2025-02-24 22:53:44 -08:00
c0afb715d7
Bump PIT to version 1.18.2 2025-02-17 10:00:56 -08:00
14 changed files with 100 additions and 37 deletions

View file

@ -1,14 +1,16 @@
name: bld-ci name: bld-ci
on: [push, pull_request, workflow_dispatch] on: [ push, pull_request, workflow_dispatch ]
jobs: jobs:
build-bld-project: build-bld-project:
runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
java-version: [17, 21, 23] 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 }}
steps: steps:
- name: Checkout source repository - name: Checkout source repository
@ -22,8 +24,16 @@ jobs:
distribution: "zulu" distribution: "zulu"
java-version: ${{ matrix.java-version }} java-version: ${{ matrix.java-version }}
- name: Download dependencies [examples]
working-directory: examples
run: ./bld download
- name: Run PIT tests [examples]
working-directory: examples
run: ./bld compile pit
- name: Download dependencies - name: Download dependencies
run: ./bld download run: ./bld download
- name: Run tests - name: Run tests
run: ./bld compile test run: ./bld compile test

View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -9,7 +9,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.2.0.jar", "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar" "lib/**/*.jar"
] ]
} }

View file

@ -2,12 +2,20 @@
[![License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) [![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) [![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.0-FA9052?label=bld&labelColor=2392FF)](https://rife2.com/bld) [![bld](https://img.shields.io/badge/2.2.1-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-pitest/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pitest) [![Release](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/releases/com/uwyn/rife2/bld-pitest/maven-metadata.xml?color=blue)](https://repo.rife2.com/#/releases/com/uwyn/rife2/bld-pitest)
[![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pitest/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pitest) [![Snapshot](https://flat.badgen.net/maven/v/metadata-url/repo.rife2.com/snapshots/com/uwyn/rife2/bld-pitest/maven-metadata.xml?label=snapshot)](https://repo.rife2.com/#/snapshots/com/uwyn/rife2/bld-pitest)
[![GitHub CI](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml) [![GitHub CI](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml/badge.svg)](https://github.com/rife2/bld-pitest/actions/workflows/bld.yml)
To install, please refer to the [extensions documentation](https://github.com/rife2/bld/wiki/Extensions). To install the latest version, add the following to the `lib/bld/bld-wrapper.properties` file:
```properties
bld.extension-pitest=com.uwyn.rife2:bld-pitest
```
For more information, please refer to the [extensions](https://github.com/rife2/bld/wiki/Extensions) documentation.
## Mutation Testing with PIT
To run mutation tests and coverage, add the following to your build file: To run mutation tests and coverage, add the following to your build file:
@ -40,8 +48,8 @@ Don't forget to add the Pitest `test` dependencies to your build file, as they a
```java ```java
repositories = List.of(MAVEN_CENTRAL); repositories = List.of(MAVEN_CENTRAL);
scope(test) scope(test)
.include(dependency("org.pitest", "pitest", version(1, 18, 1))) .include(dependency("org.pitest", "pitest", version(1, 19, 1)))
.include(dependency("org.pitest", "pitest-command-line", version(1, 17, 4))) .include(dependency("org.pitest", "pitest-command-line", version(1, 17, 4)))
.include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1))) .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
.include(dependency("org.pitest", "pitest-testng-plugin", version(1, 0, 0))); .include(dependency("org.pitest", "pitest-testng-plugin", version(1, 0, 0)));
``` ```

View file

@ -2,12 +2,12 @@
<library name="bld"> <library name="bld">
<CLASSES> <CLASSES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1.jar!/" />
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$PROJECT_DIR$/lib/bld" /> <root url="file://$PROJECT_DIR$/lib/bld" />
<root url="jar://$USER_HOME$/.bld/dist/bld-2.2.0-sources.jar!/" /> <root url="jar://$USER_HOME$/.bld/dist/bld-2.2.1-sources.jar!/" />
</SOURCES> </SOURCES>
<excluded> <excluded>
<root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" /> <root url="jar://$PROJECT_DIR$/lib/bld/bld-wrapper.jar!/" />

View file

@ -9,7 +9,7 @@
], ],
"java.configuration.updateBuildConfiguration": "automatic", "java.configuration.updateBuildConfiguration": "automatic",
"java.project.referencedLibraries": [ "java.project.referencedLibraries": [
"${HOME}/.bld/dist/bld-2.2.0.jar", "${HOME}/.bld/dist/bld-2.2.1.jar",
"lib/**/*.jar" "lib/**/*.jar"
] ]
} }

Binary file not shown.

View file

@ -1,7 +1,7 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-pitest=com.uwyn.rife2:bld-pitest:1.0.9 bld.extension-pitest=com.uwyn.rife2:bld-pitest:1.0.10
bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.0 bld.version=2.2.1

View file

@ -7,6 +7,9 @@ import rife.tools.FileUtils;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.List; import java.util.List;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import static rife.bld.dependencies.Scope.test; import static rife.bld.dependencies.Scope.test;
@ -26,16 +29,26 @@ public class ExamplesBuild extends Project {
repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES); repositories = List.of(MAVEN_CENTRAL, RIFE2_RELEASES);
var pitest = version(1, 18, 1); var pitest = version(1, 19, 1);
scope(test) scope(test)
.include(dependency("org.pitest", "pitest", pitest)) .include(dependency("org.pitest", "pitest", pitest))
.include(dependency("org.pitest", "pitest-command-line", pitest)) .include(dependency("org.pitest", "pitest-command-line", pitest))
.include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1))) .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))); .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 12, 1)));
} }
public static void main(String[] args) { public static void main(String[] args) {
// Enable detailed logging for the extensions
var level = Level.ALL;
var logger = Logger.getLogger("rife.bld.extension");
var consoleHandler = new ConsoleHandler();
consoleHandler.setLevel(level);
logger.addHandler(consoleHandler);
logger.setLevel(level);
logger.setUseParentHandlers(false);
new ExamplesBuild().start(args); new ExamplesBuild().start(args);
} }

Binary file not shown.

View file

@ -1,8 +1,8 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.downloadLocation= bld.downloadLocation=
bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.4 bld.extension-exec=com.uwyn.rife2:bld-exec:1.0.5
bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.0 bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.2.2
bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_CENTRAL,MAVEN_LOCAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.sourceDirectories= bld.sourceDirectories=
bld.version=2.2.0 bld.version=2.2.1

View file

@ -38,7 +38,7 @@ public class PitestOperationBuild extends Project {
public PitestOperationBuild() { public PitestOperationBuild() {
pkg = "rife.bld.extension"; pkg = "rife.bld.extension";
name = "PitestExtension"; name = "PitestExtension";
version = version(1, 0, 9); version = version(1, 0, 11, "SNAPSHOT");
javaRelease = 17; javaRelease = 17;
@ -47,15 +47,15 @@ public class PitestOperationBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS); repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL, RIFE2_RELEASES, RIFE2_SNAPSHOTS);
var pitest = version(1, 18, 1); var pitest = version(1, 19, 1);
scope(compile) scope(compile)
.include(dependency("com.uwyn.rife2", "bld", version(2, 2, 0))); .include(dependency("com.uwyn.rife2", "bld", version(2, 2, 1)));
scope(test) scope(test)
.include(dependency("org.pitest", "pitest", pitest)) .include(dependency("org.pitest", "pitest", pitest))
.include(dependency("org.pitest", "pitest-command-line", pitest)) .include(dependency("org.pitest", "pitest-command-line", pitest))
.include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 1))) .include(dependency("org.pitest", "pitest-junit5-plugin", version(1, 2, 2)))
.include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 11, 4))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 12, 1)))
.include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 11, 4))) .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.assertj", "assertj-core", version(3, 27, 3)));
javadocOperation() javadocOperation()
@ -108,10 +108,13 @@ public class PitestOperationBuild extends Project {
@Override @Override
public void test() throws Exception { public void test() throws Exception {
new ExecOperation() var os = System.getProperty("os.name");
.fromProject(this) if (os != null && os.toLowerCase().contains("linux")) {
.command("scripts/cliargs.sh") new ExecOperation()
.execute(); .fromProject(this)
.command("scripts/cliargs.sh")
.execute();
}
super.test(); super.test();
} }
} }

View file

@ -109,6 +109,19 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
return avoidCallsTo(List.of(avoidCallTo)); return avoidCallsTo(List.of(avoidCallTo));
} }
private String buildClassPath(String... path) {
var classpath = new StringBuilder();
for (var p : path) {
if (!p.isBlank()) {
if (!classpath.isEmpty()) {
classpath.append(File.pathSeparator);
}
classpath.append(p);
}
}
return classpath.toString();
}
/** /**
* List of packages and classes which are to be considered outside the scope of mutation. Any lines of code * List of packages and classes which are to be considered outside the scope of mutation. Any lines of code
* containing calls to these classes will not be mutated. * containing calls to these classes will not be mutated.
@ -432,9 +445,10 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
if (project_ != null) { if (project_ != null) {
args.add(javaTool()); args.add(javaTool());
args.add("-cp"); args.add("-cp");
args.add(String.format("%s:%s:%s:%s", new File(project_.libTestDirectory(), "*"), args.add(buildClassPath(joinClasspathJar(project_.testClasspathJars()),
new File(project_.libCompileDirectory(), "*"), project_.buildMainDirectory(), joinClasspathJar(project_.compileClasspathJars()),
project_.buildTestDirectory())); joinClasspathJar(project_.providedClasspathJars()),
project_.buildMainDirectory().getAbsolutePath(), project_.buildTestDirectory().getAbsolutePath()));
args.add("org.pitest.mutationtest.commandline.MutationCoverageReport"); args.add("org.pitest.mutationtest.commandline.MutationCoverageReport");
if (!options_.containsKey(SOURCE_DIRS)) { if (!options_.containsKey(SOURCE_DIRS)) {
@ -449,6 +463,10 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
}); });
} }
if (LOGGER.isLoggable(Level.FINE)) {
LOGGER.fine(String.join(" ", args));
}
return args; return args;
} }
@ -682,6 +700,14 @@ public class PitestOperation extends AbstractProcessOperation<PitestOperation> {
return s != null && !s.isBlank(); return s != null && !s.isBlank();
} }
private String joinClasspathJar(List<File> jars) {
if (!jars.isEmpty()) {
return String.join(File.pathSeparator, jars.stream().map(File::getAbsolutePath).toList());
} else {
return "";
}
}
/** /**
* Argument string to use when PIT launches child processes. This is most commonly used to increase the amount of * Argument string to use when PIT launches child processes. This is most commonly used to increase the amount of
* memory available to the process, but may be used to pass any valid JVM argument. * memory available to the process, but may be used to pass any valid JVM argument.

View file

@ -18,6 +18,8 @@ package rife.bld.extension;
import org.assertj.core.api.AutoCloseableSoftAssertions; import org.assertj.core.api.AutoCloseableSoftAssertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import rife.bld.BaseProject; import rife.bld.BaseProject;
import rife.bld.Project; import rife.bld.Project;
import rife.bld.WebProject; import rife.bld.WebProject;
@ -64,6 +66,7 @@ class PitestOperationTest {
} }
@Test @Test
@EnabledOnOs(OS.LINUX)
void checkAllParameters() throws IOException { void checkAllParameters() throws IOException {
var args = Files.readAllLines(Paths.get("src", "test", "resources", "pitest-args.txt")); var args = Files.readAllLines(Paths.get("src", "test", "resources", "pitest-args.txt"));