test: use junit 5

Author: quen2404

pom.xml

@@ -56,6 +56,7 @@
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <junit.jupiter.version>5.1.0</junit.jupiter.version>
         <junit.platform.version>1.1.0</junit.platform.version>
+        <assertj-core.version>3.10.0</assertj-core.version>
     </properties>
 
     <dependencies>
@@ -70,9 +71,33 @@
             <version>1.2.0</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>${junit.platform.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -235,6 +260,7 @@
                         <include>**/*Tests.java</include>
                         <include>**/*TestCase.java</include>
                     </includes>
+                    <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>
                 <dependencies>
                     <dependency>

src/test/java/com/qdesrame/openapi/test/AddPropDiffTest.java

@@ -3,7 +3,7 @@
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Created by adarsh.sharma on 26/02/18. */
 public class AddPropDiffTest {

src/test/java/com/qdesrame/openapi/test/AllOfDiffTest.java

@@ -3,7 +3,7 @@
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Created by adarsh.sharma on 19/12/17. */
 public class AllOfDiffTest {

src/test/java/com/qdesrame/openapi/test/ArrayDiffTest.java

@@ -3,7 +3,7 @@
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ArrayDiffTest {
 

src/test/java/com/qdesrame/openapi/test/BackwardCompatibilityTest.java

@@ -3,7 +3,7 @@
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardCompatible;
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Created by adarsh.sharma on 24/12/17. */
 public class BackwardCompatibilityTest {

src/test/java/com/qdesrame/openapi/test/ContentDiffTest.java

@@ -1,9 +1,10 @@
 package com.qdesrame.openapi.test;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import com.qdesrame.openapi.diff.OpenApiCompare;
 import com.qdesrame.openapi.diff.model.ChangedOpenApi;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class ContentDiffTest {
 
@@ -13,18 +14,18 @@ public class ContentDiffTest {
   @Test
   public void testContentDiffWithOneEmptyMediaType() {
     ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC1, OPENAPI_DOC2);
-    Assert.assertTrue(changedOpenApi.isIncompatible());
+    assertThat(changedOpenApi.isIncompatible()).isTrue();
   }
 
   @Test
   public void testContentDiffWithEmptyMediaTypes() {
     ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC1, OPENAPI_DOC1);
-    Assert.assertTrue(changedOpenApi.isUnchanged());
+    assertThat(changedOpenApi.isUnchanged()).isTrue();
   }
 
   @Test
   public void testSameContentDiff() {
     ChangedOpenApi changedOpenApi = OpenApiCompare.fromLocations(OPENAPI_DOC2, OPENAPI_DOC2);
-    Assert.assertTrue(changedOpenApi.isUnchanged());
+    assertThat(changedOpenApi.isUnchanged()).isTrue();
   }
 }

src/test/java/com/qdesrame/openapi/test/OneOfDiffTest.java

@@ -4,7 +4,7 @@
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiBackwardIncompatible;
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Created by adarsh.sharma on 19/12/17. */
 public class OneOfDiffTest {

src/test/java/com/qdesrame/openapi/test/OpenApiDiffTest.java

@@ -1,6 +1,7 @@
 package com.qdesrame.openapi.test;
 
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import com.qdesrame.openapi.diff.OpenApiCompare;
 import com.qdesrame.openapi.diff.model.ChangedOpenApi;
@@ -11,15 +12,14 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class OpenApiDiffTest {
 
+  final String SWAGGER_V2_HTTP = "http://petstore.swagger.io/v2/swagger.json";
   private final String OPENAPI_DOC1 = "petstore_v2_1.yaml";
   private final String OPENAPI_DOC2 = "petstore_v2_2.yaml";
   private final String OPENAPI_EMPTY_DOC = "petstore_v2_empty.yaml";
-  final String SWAGGER_V2_HTTP = "http://petstore.swagger.io/v2/swagger.json";
 
   @Test
   public void testEqual() {
@@ -44,9 +44,9 @@ public void testNewApi() {
     } catch (IOException e) {
       e.printStackTrace();
     }
-    Assert.assertTrue(newEndpoints.size() > 0);
-    Assert.assertTrue(missingEndpoints.isEmpty());
-    Assert.assertTrue(changedEndPoints.isEmpty());
+    assertThat(newEndpoints).isNotEmpty();
+    assertThat(missingEndpoints).isEmpty();
+    assertThat(changedEndPoints).isEmpty();
   }
 
   @Test
@@ -67,9 +67,9 @@ public void testDeprecatedApi() {
     } catch (IOException e) {
       e.printStackTrace();
     }
-    Assert.assertTrue(newEndpoints.isEmpty());
-    Assert.assertTrue(missingEndpoints.size() > 0);
-    Assert.assertTrue(changedEndPoints.isEmpty());
+    assertThat(newEndpoints).isEmpty();
+    assertThat(missingEndpoints).isNotEmpty();
+    assertThat(changedEndPoints).isEmpty();
   }
 
   @Test
@@ -87,7 +87,7 @@ public void testDiff() {
     } catch (IOException e) {
       e.printStackTrace();
     }
-    Assert.assertFalse(changedEndPoints.isEmpty());
+    assertThat(changedEndPoints).isNotEmpty();
   }
 
   @Test

src/test/java/com/qdesrame/openapi/test/ParameterDiffTest.java

@@ -2,7 +2,7 @@
 
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiChangedEndpoints;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /** Created by adarsh.sharma on 03/01/18. */
 public class ParameterDiffTest {

src/test/java/com/qdesrame/openapi/test/PathDiffTest.java

@@ -1,8 +1,9 @@
 package com.qdesrame.openapi.test;
 
 import static com.qdesrame.openapi.test.TestUtils.assertOpenApiAreEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class PathDiffTest {
 
@@ -15,8 +16,9 @@ public void testEqual() {
     assertOpenApiAreEquals(OPENAPI_PATH1, OPENAPI_PATH2);
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testMultiplePathWithSameSignature() {
-    assertOpenApiAreEquals(OPENAPI_PATH3, OPENAPI_PATH3);
+    assertThrows(
+        IllegalArgumentException.class, () -> assertOpenApiAreEquals(OPENAPI_PATH3, OPENAPI_PATH3));
   }
 }