Merge branch 'master' into emptyGroups

Author: hcoles

README.md

@@ -6,12 +6,13 @@ Adds support to pitest for JUnit 5 platform test engines, e.g. Jupiter, Cucumber
 
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.pitest/pitest-junit5-plugin/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/org.pitest/pitest-junit5-plugin)
 
+Releases 1.2.1 and 1.2.2 requires pitest 1.15.2 or above.
+
 Release 1.2.0 requires pitest 1.14.0 or above.
 
-When used with the pitest-maven plugin, it will automatically work with JUnit platform 1.5.0 to 1.10.0-M1 (and probably above).
+When used with the pitest-maven plugin, or version 1.15.0 of the gradle plugin, it will automatically work with JUnit platform 1.5.0 to 1.10.0-M1 (and probably above).
 
-When used with the pitest gradle plugin, it will automatically work with JUnit platform 1.9.2. To work with other versions an explicit dependency
-on junit-platform-launcher must be added to the project under test.
+When used with earlier versions of the pitest gradle plugin a dependency must be added to a compatible version of junit-platform-launcher. Depending on how the gradle project is configured the must be added wither a scope of either pitest, or a testImplementation.
 
 Older versions of the plugin must be matched to both the pitest and junit version in use as below.
 
@@ -39,12 +40,12 @@ To activate the plugin it must be placed on the classpath of the pitest tool (**
       <plugin>
         <groupId>org.pitest</groupId>
         <artifactId>pitest-maven</artifactId>
-        <version>1.10.3</version>
+        <version>1.18.2</version>
         <dependencies>
           <dependency>
             <groupId>org.pitest</groupId>
             <artifactId>pitest-junit5-plugin</artifactId>
-            <version>1.1.1</version>
+            <version>1.2.2</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -57,13 +58,13 @@ For Pitest configuration options, have a look at http://pitest.org/quickstart/ma
 ```
 plugins {
     id 'java'
-    id 'info.solidsoft.pitest' version '1.7.4'
+    id 'info.solidsoft.pitest' version '1.15.0'
 }
 
 pitest {
     //adds dependency to org.pitest:pitest-junit5-plugin and sets "testPlugin" to "junit5"
-    junit5PluginVersion = '1.1.1'
-    pitestVersion = '1.10.3'
+    junit5PluginVersion = '1.2.2'
+    pitestVersion = '1.18.2'
     // ...
 }
 ```
@@ -72,6 +73,18 @@ See [gradle-pitest-plugin documentation](https://github.com/szpak/gradle-pitest-
 
 ## Release Notes
 
+### 1.2.2
+
+* #109 Set platform-launcher dependency to provided
+
+The pitest maven and gradle plugins now automatically resolve the correct version of platform launcher at
+runtime. The built against version of platform-launcher was however being included as a transative dependency sometimes
+causing a conflict at runtime.
+
+### 1.2.1
+
+* #103 Report errors and failures during scan stage
+
 ### 1.1.1
 
 * #73 Automatically disable parallel mode

pom.xml

@@ -23,7 +23,7 @@
 		<junit.platform.version>1.9.2</junit.platform.version>
 		<junit.version>5.9.2</junit.version>
 		<mockito.version>2.7.6</mockito.version>
-		<pitest.version>1.9.0</pitest.version>
+		<pitest.version>1.15.2</pitest.version>
 		<cucumber.version>5.0.0</cucumber.version>
 		<spock.version>2.3-groovy-4.0</spock.version>
 		<groovy.version>4.0.11</groovy.version>
@@ -169,6 +169,7 @@
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
 			<version>${junit.platform.version}</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -238,7 +239,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.5</version>
+				<version>0.8.11</version>
 				<executions>
 					<execution>
 						<goals>

src/main/java/org/pitest/junit5/JUnit5TestUnitFinder.java

@@ -131,9 +131,11 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
                 if (!identifiers.contains(testIdentifier)) {
                     identifiers.add(testIdentifier);
                 }
-                l.executionFinished(new Description(testIdentifier.getUniqueId(), testClass), false);
+                l.executionFinished(new Description(testIdentifier.getUniqueId(), testClass)
+                        , false, testExecutionResult.getThrowable().orElse(null));
             } else if (testIdentifier.isTest()) {
-                l.executionFinished(new Description(testIdentifier.getUniqueId(), testClass), true);
+                l.executionFinished(new Description(testIdentifier.getUniqueId(), testClass)
+                        , true);
             }
         }
 

src/test/java/org/pitest/junit5/JUnit5TestUnitFinderTest.java

@@ -19,6 +19,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
+import org.opentest4j.AssertionFailedError;
 import org.pitest.junit5.cucumber.RunCucumberTest;
 import org.pitest.junit5.repository.AbstractTestClass;
 import org.pitest.junit5.repository.InterfaceTestClass;
@@ -67,9 +68,11 @@
 import org.pitest.testapi.TestGroupConfig;
 import org.pitest.testapi.TestUnit;
 import org.pitest.testapi.TestUnitExecutionListener;
+import org.spockframework.runtime.ConditionNotSatisfiedError;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -149,12 +152,14 @@ void detectsFailingTests() {
     void detectsFailingSpockTests() {
         findsAndRunsNTests(1, TestSpecWithFailingFeature.class);
         nTestsFails(1, TestSpecWithFailingFeature.class);
+        errorIsRecorded(t -> t instanceof ConditionNotSatisfiedError, TestSpecWithFailingFeature.class);
     }
 
     @Test
     void detectsErroringTestsWhenPassingTestsPresent() {
         nTestsPass(2, TestClassWithMixedPassAndFail.class);
         nTestsFails(2, TestClassWithMixedPassAndFail.class);
+        errorIsRecorded(t -> t instanceof RuntimeException, TestClassWithMixedPassAndFail.class);
     }
 
     @Test
@@ -333,6 +338,7 @@ void findsAndRunsTestsWithSetupSpec() {
     @Test
     void findsAndRunsTestsWithFailingAfterAll() {
         findsAndRunsNTests(2, TestClassWithFailingAfterAll.class);
+        errorIsRecorded(t -> t instanceof AssertionFailedError, TestClassWithFailingAfterAll.class);
     }
 
     @Test
@@ -379,6 +385,11 @@ private void nTestsFails(int n, Class<?> clazz) {
         assertThat(l.failed).hasSize(n);
     }
 
+    private void errorIsRecorded(Predicate<Throwable> p, Class<?> clazz) {
+        RecordingListener l = run(basicConfig(), clazz);
+        assertThat(l.errors).anyMatch(p);
+    }
+
     private RecordingListener run(JUnit5TestUnitFinder underTest, Class<?> clazz) {
         RecordingListener l = new RecordingListener();
         underTest.findTestUnits(clazz, l);
@@ -395,33 +406,24 @@ class RecordingListener implements TestUnitExecutionListener {
     List<Description> started = new ArrayList<>();
     List<Description> failed = new ArrayList<>();
     List<Description> passed = new ArrayList<>();
-    TestUnitExecutionListener l = new TestUnitExecutionListener() {
-        @Override
-        public void executionStarted(Description description) {
-            started.add(description);
-        }
 
-        @Override
-        public void executionFinished(Description description, boolean pass) {
-            if (pass) {
-                passed.add(description);
-            } else {
-                failed.add(description);
-            }
-        }
-    };
+    List<Throwable> errors = new ArrayList<>();
 
     @Override
     public void executionStarted(Description description) {
         started.add(description);
     }
 
     @Override
-    public void executionFinished(Description description, boolean pass) {
+    public void executionFinished(Description description, boolean pass, Throwable optional) {
         if (pass) {
             passed.add(description);
         } else {
             failed.add(description);
         }
+
+        if (optional != null) {
+            errors.add(optional);
+        }
     }
 }