#135: Upgraded tests to JUnit 5

Removed jcenter dependency as well

Author: rjrudin

.gitignore

@@ -13,4 +13,4 @@ out
 target
 gradle-local.properties
 snyk
-
+.vscode

build.gradle

@@ -3,51 +3,65 @@ plugins {
   id "maven-publish"
   id "eclipse"
   id "idea"
-	id "com.jfrog.bintray" version "1.8.4"
 	id "com.github.jk1.dependency-license-report" version "1.3"
-
-	id "net.saliman.properties" version "1.5.1"
 	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
 }
 
+group = "com.marklogic"
+archivesBaseName = "ml-javaclient-util"
+version = "4.1-SNAPSHOT"
+
 sourceCompatibility = "8"
 targetCompatibility = "8"
 
 repositories {
-  jcenter()
 	mavenCentral()
-	maven { url "http://developer.marklogic.com/maven2/" }
 }
 
 dependencies {
-  api 'com.marklogic:marklogic-client-api:5.3.2'
-  api 'com.marklogic:marklogic-xcc:10.0.5'
-  api 'org.jdom:jdom2:2.0.6'
-  api 'org.springframework:spring-context:5.2.9.RELEASE'
+  api ('com.marklogic:marklogic-client-api:5.4.0') {
+		// This isn't available via mavenCentral with its 2.3 coordinates, so it's excluded
+		// and then depended on below via its 2.5 coordinates
+		exclude module: "okhttp-digest"
+	}
+	implementation 'io.github.rburgst:okhttp-digest:2.5'
+
+  api 'com.marklogic:marklogic-xcc:10.0.6.2'
+  api 'org.springframework:spring-context:5.3.7'
 
-  testImplementation 'junit:junit:4+'
-	testImplementation 'org.springframework:spring-test:5.2.9.RELEASE'
+  implementation 'org.jdom:jdom2:2.0.6'
+	implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.1'
+	implementation 'org.slf4j:slf4j-api:1.7.30'
+
+  testImplementation "org.junit.jupiter:junit-jupiter:5.7.1"
+	testImplementation 'org.springframework:spring-test:5.3.7'
 
   // Used for testing loading modules from the classpath
-  testRuntime files("lib/modules.jar")
+  testImplementation files("lib/modules.jar")
 
 	// Forcing Spring to use logback instead of commons-logging
-	testRuntime "ch.qos.logback:logback-classic:1.2.3"
-	testRuntime group: "org.slf4j", name: "jcl-over-slf4j", version: "1.7.30"
-	testRuntime group: "org.slf4j", name: "slf4j-api", version: "1.7.30"
+	testImplementation "ch.qos.logback:logback-classic:1.2.3"
+	testImplementation "org.slf4j:jcl-over-slf4j:1.7.30"
+	testImplementation "org.slf4j:slf4j-api:1.7.30"
+}
+
+test {
+	useJUnitPlatform()
+  testLogging {
+    events 'started','passed', 'skipped', 'failed'
+    exceptionFormat 'full'
+  }
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
   classifier 'sources'
-  from sourceSets.main.allJava
+  from sourceSets.main.allSource
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
 	classifier "javadoc"
-	from file(javadocsDir + "/" + project.name)
+	from javadoc
 }
-
-javadoc.destinationDir = file(javadocsDir + "/" + project.name)
 javadoc.failOnError = false
 
 publishing {
@@ -65,31 +79,6 @@ publishing {
   }
 }
 
-if (project.hasProperty("myBintrayUser")) {
-  bintray {
-    user = myBintrayUser
-    key = myBintrayKey
-    publications = ['mainJava', 'sourcesJava']
-    pkg {
-      repo = 'maven'
-      name = project.name
-      licenses = ['Apache-2.0']
-      vcsUrl = 'https://github.com/rjrudin/' + project.name + '.git'
-      version {
-        name = project.version
-        released = new Date()
-      }
-    }
-  }
-}
-
-test {
-  testLogging {
-    events 'started','passed', 'skipped', 'failed'
-    exceptionFormat 'full'
-  }
-}
-
 // See https://github.com/snyk/gradle-plugin for more information
 snyk {
 	//arguments = '--all-sub-projects'

gradle.properties

@@ -1,6 +1,2 @@
-group=com.marklogic
-javadocsDir=../gh-pages-marklogic-java/javadocs
-version=4.1.1
-
-# Define this via gradle-local.properties or on the command line when running snyk-test
+# Define this on the command line when running snyk-test
 snykToken=

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip

pom.xml.old

@@ -2,9 +2,8 @@
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.ext.spring.SpringDatabaseClientConfig;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,11 +13,11 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {TestConfig.class})
-public abstract class AbstractIntegrationTest extends Assert {
+public abstract class AbstractIntegrationTest {
 
 	protected Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -33,7 +32,7 @@ protected DatabaseClient newClient() {
 		return client;
 	}
 
-	@After
+	@AfterEach
 	public void releaseClientOnTearDown() {
 		if (client != null) {
 			try {

src/test/java/com/marklogic/client/ext/AbstractIntegrationTest.java

@@ -12,7 +12,7 @@
 import com.marklogic.client.io.FileHandle;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 
@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class RestBatchWriterTest extends AbstractIntegrationTest {
 
 	@Test
@@ -55,7 +57,7 @@ public void failureTestWithCustomListener() {
 		writer.waitForCompletion();
 
 		Throwable caughtError = testWriteListener.caughtError;
-		assertNotNull("An error should have been thrown due to the invalid XML", caughtError);
+		assertNotNull(caughtError, "An error should have been thrown due to the invalid XML");
 		assertTrue(caughtError instanceof FailedRequestException);
 	}
 

src/test/java/com/marklogic/client/ext/batch/RestBatchWriterTest.java

@@ -1,8 +1,10 @@
 package com.marklogic.client.ext.es;
 
 import com.marklogic.client.ext.AbstractIntegrationTest;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests against the default Documents database. Doesn't clear it out before or after.
@@ -33,7 +35,7 @@ public class EntityServicesTest extends AbstractIntegrationTest {
 		"  }\n" +
 		"}";
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		client = newClient("Documents");
 	}

src/test/java/com/marklogic/client/ext/es/EntityServicesTest.java

@@ -1,13 +1,14 @@
 package com.marklogic.client.ext.file;
 
 import com.marklogic.client.ext.tokenreplacer.DefaultTokenReplacer;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.Properties;
 
-public class CollectionsFileDocumentFileProcessorTest extends Assert {
+import static org.junit.jupiter.api.Assertions.*;
+
+public class CollectionsFileDocumentFileProcessorTest {
 
 	private CollectionsFileDocumentFileProcessor processor = new CollectionsFileDocumentFileProcessor();
 

src/test/java/com/marklogic/client/ext/file/CollectionsFileDocumentFileProcessorTest.java

@@ -1,16 +1,15 @@
 package com.marklogic.client.ext.file;
 
-import com.marklogic.client.ext.file.DefaultDocumentFileReader;
-import com.marklogic.client.ext.file.DocumentFile;
-import com.marklogic.client.ext.file.DocumentFileReader;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DocumentFinderTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class DocumentFinderTest {
 
 	private DocumentFileReader sut = new DefaultDocumentFileReader();