Merge pull request #869 from hcoles/java_16

test against java 16
hcoles · Mar 11, 2021 · 04a29f9 · 04a29f9
2 parents 66976b6 + 8426158
commit 04a29f9
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,8 +18,8 @@ jobs:
             java: 8
           - title: "JDK 11"
             java: 11
-          - title: "JDK 15"
-            java: 15
+          - title: "JDK 16"
+            java: "16-ea"
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout from Git'

diff --git a/pitest-entry/pom.xml b/pitest-entry/pom.xml
@@ -156,7 +156,6 @@
 		<dependency>
 			<groupId>nl.jqno.equalsverifier</groupId>
 			<artifactId>equalsverifier</artifactId>
-			<version>1.7.5</version>
 			<scope>test</scope>
 		</dependency>
 

diff --git a/pitest/pom.xml b/pitest/pom.xml
@@ -12,6 +12,23 @@
 	<url>http://pitest.org</url>
 	<description>Mutation testing system for Java.</description>
 
+	<properties>
+		<surefire.argline/>
+	</properties>
+	<profiles>
+		<profile>
+			<id>jdk16</id>
+			<activation>
+				<jdk>16</jdk>
+			</activation>
+			<properties>
+				<!-- pitest does not use reflection, but some of the tests depend on xstream, which does. Jdk 16 fails with
+				 errors due to the module system. jdk8 does not support the add-opens option, so it must be activated here by jdk-->
+				<surefire.argline>--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.lang.ref=ALL-UNNAMED</surefire.argline>
+			</properties>
+		</profile>
+	</profiles>
+
 	<build>
 		<plugins>
 			<plugin>
@@ -42,6 +59,8 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<testNGArtifactName>none:none</testNGArtifactName>
+					<!-- pitest does not use reflection, but some of the tests depend on xstream, which does -->
+					<argLine>${surefire.argline}</argLine>
 
 					<includes>
 						<include>org/**/Test*.java</include>
@@ -220,7 +239,6 @@
 		<dependency>
 			<groupId>nl.jqno.equalsverifier</groupId>
 			<artifactId>equalsverifier</artifactId>
-			<version>1.7.5</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/pitest/src/test/java/org/pitest/coverage/BlockLocationTest.java b/pitest/src/test/java/org/pitest/coverage/BlockLocationTest.java
@@ -8,7 +8,9 @@ public class BlockLocationTest {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(BlockLocation.class).verify();
+    EqualsVerifier.forClass(BlockLocation.class)
+            .withOnlyTheseFields("block", "location")
+            .verify();
   }
 
 }
diff --git a/pitest/src/test/java/org/pitest/coverage/TestInfoTest.java b/pitest/src/test/java/org/pitest/coverage/TestInfoTest.java
@@ -8,6 +8,8 @@ public class TestInfoTest {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(TestInfo.class).verify();
+    EqualsVerifier.forClass(TestInfo.class)
+            .withOnlyTheseFields("name", "definingClass")
+            .verify();
   }
 }
diff --git a/pitest/src/test/java/org/pitest/coverage/analysis/BlockTest.java b/pitest/src/test/java/org/pitest/coverage/analysis/BlockTest.java
@@ -8,7 +8,10 @@ public class BlockTest {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(Block.class).verify();
+    EqualsVerifier.forClass(Block.class)
+            .withOnlyTheseFields("firstInstruction")
+            .withOnlyTheseFields("lastInstruction")
+            .verify();
   }
 
 }
diff --git a/pitest/src/test/java/org/pitest/mutationtest/engine/MutationDetailsTest.java b/pitest/src/test/java/org/pitest/mutationtest/engine/MutationDetailsTest.java
@@ -38,7 +38,9 @@ public void shouldDefaultFilenameWhenNoneKnown() {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(MutationDetails.class).verify();
+    EqualsVerifier.forClass(MutationDetails.class)
+            .withOnlyTheseFields("id")
+            .verify();
   }
 
 }
diff --git a/pitest/src/test/java/org/pitest/plugin/FeatureTest.java b/pitest/src/test/java/org/pitest/plugin/FeatureTest.java
@@ -10,7 +10,9 @@ public class FeatureTest {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(Feature.class).verify();
+    EqualsVerifier.forClass(Feature.class)
+            .withOnlyTheseFields("name")
+            .verify();
   }
 
   @Test

diff --git a/pitest/src/test/java/org/pitest/testapi/execute/MultipleTestGroupTest.java b/pitest/src/test/java/org/pitest/testapi/execute/MultipleTestGroupTest.java
@@ -73,7 +73,9 @@ public void shouldStopExecutingWhenResultCollectorRequestsStop() {
 
   @Test
   public void shouldObeyHashcodeEqualsContract() {
-    EqualsVerifier.forClass(MultipleTestGroup.class).verify();
+    EqualsVerifier.forClass(MultipleTestGroup.class)
+            .withOnlyTheseFields("children")
+            .verify();
   }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -137,6 +137,17 @@
 		</profile>
 	</profiles>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>nl.jqno.equalsverifier</groupId>
+				<artifactId>equalsverifier</artifactId>
+				<version>3.5.4</version>
+				<scope>test</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 	<!-- common dependencies used in all subprojects -->
 	<dependencies>
 		<dependency>
@@ -154,7 +165,7 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.9.0</version>
+			<version>3.19.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>