- upgrades to junit 5 + upgrades dependencies

Author: baywet

build.gradle

@@ -22,6 +22,10 @@ java {
     withJavadocJar()
 }
 
+test {
+    useJUnitPlatform()
+}
+
 sourceSets {
     main {
         java {

docs/upgrade-to-v3.md

@@ -128,7 +128,7 @@ As the connection configuration evolved over time, the connection configuration
 ### Dependencies upgrade
 
 - OkHttpClient has been upgraded from 3.X to 4.9.0.
-- Google Guava has been upgraded from 20 to 29.
+- Google Guava has been upgraded from 20 to 30.
 
 No action needs to be taken unless the project has a direct reference to an older version of those libraries, in which case the references need to be upgraded to match the versions listed here.
 

gradle/dependencies.gradle

@@ -1,9 +1,10 @@
 dependencies {
-	implementation 'com.google.guava:guava:29.0-jre'
+	implementation 'com.google.guava:guava:30.1-jre'
 
     // Use JUnit test framework
-    testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.mockito:mockito-inline:3.6.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    testImplementation 'org.mockito:mockito-inline:3.7.7'
 
     api 'com.google.code.gson:gson:2.8.6'
 

pom.xml

@@ -8,14 +8,14 @@
 
 	<groupId>com.microsoft.graph</groupId>
 	<artifactId>microsoft-graph</artifactId>
-	<version>2.3.0</version>
+	<version>3.0.0</version>
 	<packaging>pom</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>29.0-jre</version>
+			<version>30.1-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -30,7 +30,7 @@
 		<dependency>
 			<groupId>com.microsoft.graph</groupId>
 			<artifactId>microsoft-graph-core</artifactId>
-			<version>1.0.5</version>
+			<version>2.0.0</version>
 		</dependency>
 	</dependencies>
 </project>

src/test/java/com/microsoft/graph/conventions/DeltaLinks.java

@@ -1,11 +1,11 @@
 package com.microsoft.graph.conventions;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import com.microsoft.graph.functional.TestBase;
 import com.microsoft.graph.http.HttpMethod;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Request;
 

src/test/java/com/microsoft/graph/conventions/ParameterSets.java

@@ -1,12 +1,12 @@
 package com.microsoft.graph.conventions;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import com.microsoft.graph.http.HttpMethod;
 import com.microsoft.graph.functional.TestBase;
 import com.microsoft.graph.models.ReportRootGetMailboxUsageStorageParameterSet;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.Request;
 

src/test/java/com/microsoft/graph/functional/BatchTests.java

@@ -1,7 +1,7 @@
 package com.microsoft.graph.functional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.IOException;
 
@@ -13,17 +13,17 @@
 import com.microsoft.graph.models.User;
 import com.microsoft.graph.requests.UserRequest;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-@Ignore
+@Disabled
 public class BatchTests {
     @Test
     public void GetsABatchFromRequests() throws IOException{

src/test/java/com/microsoft/graph/functional/CalendarTests.java

@@ -1,13 +1,13 @@
 package com.microsoft.graph.functional;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import com.microsoft.graph.models.Calendar;
 import com.microsoft.graph.models.Event;
@@ -18,11 +18,11 @@
 import com.microsoft.graph.options.Option;
 import com.microsoft.graph.options.QueryOption;
 
-@Ignore
+@Disabled
 public class CalendarTests {
 	GraphServiceClient graphServiceClient = null;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		TestBase testBase = new TestBase();
 		graphServiceClient = testBase.graphClient;

src/test/java/com/microsoft/graph/functional/CustomRequestTests.java

@@ -1,11 +1,11 @@
 package com.microsoft.graph.functional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
@@ -17,11 +17,11 @@
 /**
  * Tests for sending custom requests using the SDK
  */
-@Ignore
+@Disabled
 public class CustomRequestTests {
 	private TestBase testBase;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		testBase = new TestBase();
 	}

src/test/java/com/microsoft/graph/functional/ODataTests.java

@@ -1,15 +1,15 @@
 package com.microsoft.graph.functional;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import com.google.gson.JsonPrimitive;
 import com.microsoft.graph.models.Extension;
@@ -19,12 +19,12 @@
 import com.microsoft.graph.requests.GroupDeltaCollectionPage;
 import com.microsoft.graph.models.GroupDeltaParameterSet;
 
-@Ignore
+@Disabled
 public class ODataTests {
 
     private TestBase testBase;
 
-    @Before
+    @BeforeEach
     public void setUp() {
        testBase = new TestBase();
 
@@ -97,10 +97,10 @@ public void testSchemaExtensions() {
                 }
             }
             if (!foundUpdatedProperty) {
-                Assert.fail("Patch failed on Schema Extension");
+                fail("Patch failed on Schema Extension");
             }
         } catch (Exception e) {
-            Assert.fail("Patch failed on Schema Extension");
+            fail("Patch failed on Schema Extension");
         } finally {
             testBase.graphClient.schemaExtensions(newExtension.id).buildRequest().delete();
         }