Compatibility changes to make lib work with Java 11 and Junit 5

Author: andrebonna

.mvn/jvm.config

@@ -0,0 +1 @@
+--add-opens java.base/java.lang=ALL-UNNAMED

pom.xml

@@ -53,38 +53,58 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.2</version>
+            <version>2.8.5</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.18</version>
+            <version>1.18.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
+            <version>3.8.1</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>2.23.0</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.8.0</version>
+            <version>3.11.1</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>2.23.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>1.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.7.25</version>
+            <version>1.8.0-beta2</version>
         </dependency>
     </dependencies>
 
@@ -93,10 +113,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -116,6 +135,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.0.0</version>
+                <configuration>
+                    <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

src/main/java/io/github/jsonSnapshot/SnapshotCaptor.java

@@ -72,10 +72,10 @@ private Object shallowCopy(Object value) {
     }
 
     private Object constructCopy(Class<?> argumentClass)
-        throws InstantiationException, IllegalAccessException, java.lang.reflect.InvocationTargetException {
+            throws InstantiationException, IllegalAccessException, java.lang.reflect.InvocationTargetException, NoSuchMethodException {
 
         try {
-            return argumentClass.newInstance();
+            return argumentClass.getDeclaredConstructor().newInstance();
         }
         catch (Exception e) {
             // Ignore - should log
@@ -84,7 +84,7 @@ private Object constructCopy(Class<?> argumentClass)
         Constructor[] constructors = argumentClass.getDeclaredConstructors();
 
         if (constructors.length == 0) {
-            return argumentClass.newInstance();
+            return argumentClass.getDeclaredConstructor().newInstance();
         }
 
         int i = 0;

src/main/java/io/github/jsonSnapshot/SnapshotMatcher.java

@@ -6,6 +6,7 @@
 import org.assertj.core.util.Arrays;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,7 +16,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class SnapshotMatcher {
@@ -127,7 +127,8 @@ private static StackTraceElement findStackElement() throws ClassNotFoundExceptio
                 Method method = clazz.getMethod(stackTraceElements[j].getMethodName());
 
                 // Navigate into stack until Test class/method level
-                if (method.isAnnotationPresent(Test.class) || method.isAnnotationPresent(BeforeClass.class)) {
+                if (method.isAnnotationPresent(Test.class) || method.isAnnotationPresent(BeforeClass.class) ||
+                        method.isAnnotationPresent(org.junit.jupiter.api.Test.class) || method.isAnnotationPresent(BeforeAll.class)) {
                     i = j;
                     break;
                 }

src/test/java/io/github/jsonSnapshot/SnapshotIntegrationTest.java

@@ -1,28 +1,23 @@
 package io.github.jsonSnapshot;
 
-import org.hamcrest.core.StringStartsWith;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static io.github.jsonSnapshot.SnapshotMatcher.*;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SnapshotIntegrationTest {
 
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
-    @BeforeClass
+    @BeforeAll
     public static void beforeAll() {
         start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterAll() {
         validateSnapshots();
     }
@@ -58,22 +53,18 @@ private void matchInsidePrivate() {
 
     @Test
     public void shouldThrowSnapshotMatchException() {
-        expectedException.expect(SnapshotMatchException.class);
-        expectedException.expectMessage(StringStartsWith.startsWith("Error on: \n" +
-                "io.github.jsonSnapshot.SnapshotIntegrationTest.shouldThrowSnapshotMatchException=["));
-        expect(FakeObject.builder().id("anyId5").value(6).name("anyName5").build()).toMatchSnapshot();
+        assertThrows(SnapshotMatchException.class, expect(FakeObject.builder().id("anyId5").value(6).name("anyName5").build())::toMatchSnapshot, "Error on: \n" +
+                "io.github.jsonSnapshot.SnapshotIntegrationTest.shouldThrowSnapshotMatchException=[");
     }
 
     @Test
     public void shouldThrowStackOverflowError() {
-        expectedException.expect(StackOverflowError.class);
-
         // Create cycle JSON
         FakeObject fakeObject1 = FakeObject.builder().id("anyId1").value(1).name("anyName1").build();
         FakeObject fakeObject2 = FakeObject.builder().id("anyId2").value(2).name("anyName2").build();
         fakeObject1.setFakeObject(fakeObject2);
         fakeObject2.setFakeObject(fakeObject1);
 
-        expect(fakeObject1).toMatchSnapshot();
+        assertThrows(StackOverflowError.class, () -> expect(fakeObject1).toMatchSnapshot());
     }
 }

src/test/java/io/github/jsonSnapshot/SnapshotMatcherTest.java

@@ -1,13 +1,11 @@
 package io.github.jsonSnapshot;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,20 +14,28 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@RunWith(MockitoJUnitRunner.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@ExtendWith(MockitoExtension.class)
 public class SnapshotMatcherTest {
 
     private static final String FILE_PATH = "src/test/java/io/github/jsonSnapshot/SnapshotMatcherTest.snap";
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeAll() {
         SnapshotMatcher.start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterAll() throws IOException {
         SnapshotMatcher.validateSnapshots();
+        File f = new File(FILE_PATH);
+        assertThat(StringUtils.join(Files.readAllLines(f.toPath()), "\n")).
+                isEqualTo("io.github.jsonSnapshot.SnapshotMatcherTest.should1ShowSnapshotSuccessfully=[\n" +
+                        "  \"any type of object\"\n" +
+                        "]\n\n\n" +
+                        "io.github.jsonSnapshot.SnapshotMatcherTest.should2SecondSnapshotExecutionSuccessfully=[\n" +
+                        "  \"any second type of object\",\n" +
+                        "  \"any third type of object\"\n" +
+                        "]");
         Files.delete(Paths.get(FILE_PATH));
     }
 
@@ -41,16 +47,7 @@ public void should1ShowSnapshotSuccessfully() throws IOException {
         if(!f.exists() || f.isDirectory()) {
             throw new RuntimeException("File should exist here");
         }
-
-        assertThat(StringUtils.join(Files.readAllLines(f.toPath()), "\n")).isEqualTo("");
-
         SnapshotMatcher.expect("any type of object").toMatchSnapshot();
-
-        assertThat(StringUtils.join(Files.readAllLines(f.toPath()), "\n")).
-                isEqualTo("io.github.jsonSnapshot.SnapshotMatcherTest.should1ShowSnapshotSuccessfully=[\n" +
-                        "  \"any type of object\"\n" +
-                        "]");
-
     }
 
     @Test
@@ -60,17 +57,6 @@ public void should2SecondSnapshotExecutionSuccessfully() throws IOException {
         if(!f.exists() || f.isDirectory()) {
             throw new RuntimeException("File should exist here");
         }
-
         SnapshotMatcher.expect("any second type of object", "any third type of object").toMatchSnapshot();
-
-        assertThat(StringUtils.join(Files.readAllLines(f.toPath()), "\n")).
-                isEqualTo("io.github.jsonSnapshot.SnapshotMatcherTest.should1ShowSnapshotSuccessfully=[\n" +
-                        "  \"any type of object\"\n" +
-                        "]\n\n\n" +
-                        "io.github.jsonSnapshot.SnapshotMatcherTest.should2SecondSnapshotExecutionSuccessfully=[\n" +
-                        "  \"any second type of object\",\n" +
-                        "  \"any third type of object\"\n" +
-                        "]");
-
     }
 }

src/test/java/io/github/jsonSnapshot/SnapshotOverrideClassTest.java

@@ -1,19 +1,19 @@
 package io.github.jsonSnapshot;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 
 import static io.github.jsonSnapshot.SnapshotMatcher.start;
 import static io.github.jsonSnapshot.SnapshotMatcher.validateSnapshots;
 
 public class SnapshotOverrideClassTest extends SnapshotSuperClassTest {
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeAll() {
         start();
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterAll() {
         validateSnapshots();
     }

src/test/java/io/github/jsonSnapshot/SnapshotSuperClassTest.java

@@ -1,6 +1,7 @@
 package io.github.jsonSnapshot;
 
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 
 import static io.github.jsonSnapshot.SnapshotMatcher.expect;
 

src/test/java/io/github/jsonSnapshot/SnapshotTest.java

@@ -1,11 +1,11 @@
 package io.github.jsonSnapshot;
 
 import com.google.gson.GsonBuilder;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -15,8 +15,9 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SnapshotTest {
 
     private static final SnapshotConfig DEFAULT_CONFIG = new DefaultConfig();
@@ -29,15 +30,15 @@ public class SnapshotTest {
     private Snapshot snapshot;
 
 
-    @Before
+    @BeforeEach
     public void setUp() throws NoSuchMethodException, IOException {
         snapshotFile = new SnapshotFile(DEFAULT_CONFIG.getFilePath(), "anyFilePath");
         snapshot = new Snapshot(snapshotFile, String.class,
                 String.class.getDeclaredMethod("toString"),
                 (object) -> new GsonBuilder().setPrettyPrinting().create().toJson(object),"anyObject");
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws IOException {
         Files.delete(Paths.get(FILE_PATH));
     }
@@ -54,10 +55,11 @@ public void shouldMatchSnapshotSuccessfully() {
         assertThat(snapshotFile.getRawSnapshots()).isEqualTo(Stream.of(SNAPSHOT).collect(Collectors.toCollection(TreeSet::new)));
     }
 
-    @Test(expected = SnapshotMatchException.class)
+    @Test
     public void shouldMatchSnapshotWithException() {
         snapshotFile.push(SNAPSHOT_NAME + "anyWrongSnapshot");
-        snapshot.toMatchSnapshot();
+
+        assertThrows(SnapshotMatchException.class, snapshot::toMatchSnapshot);
     }
 
 }