Updated unit test project based on new marklogic-unit-test release

Author: rjrudin

build.gradle

@@ -3,7 +3,7 @@ plugins {
   id "maven-publish"
 	id "signing"
 
-  id "com.github.jk1.dependency-license-report" version "1.3"
+  id "com.github.jk1.dependency-license-report" version "1.17"
   id "com.gradle.plugin-publish" version "0.15.0"
 	id "java-gradle-plugin"
 
@@ -19,11 +19,7 @@ targetCompatibility = "8"
 
 repositories {
   mavenLocal() // Used only for local development
-
 	mavenCentral()
-
-	// Needed for marklogic-unit-test-client
-  jcenter()
 }
 
 dependencies {
@@ -34,7 +30,7 @@ dependencies {
 	implementation "com.marklogic:marklogic-data-movement-components:2.3.0"
 	implementation "commons-io:commons-io:2.8.0"
 
-	compileOnly "com.marklogic:marklogic-unit-test-client:1.0.0"
+	compileOnly "com.marklogic:marklogic-unit-test-client:1.1.0"
 
 	testImplementation localGroovy()
 	testImplementation gradleTestKit()

examples/unit-test-project/README.md

@@ -9,22 +9,22 @@ include this by default (not every ml-gradle user will use marklogic-unit-test),
 
     buildscript {
       repositories {
-        jcenter()
+        mavenCentral()
       }
       dependencies {
-        classpath "com.marklogic:marklogic-unit-test-client:1.0.0"
+        classpath "com.marklogic:marklogic-unit-test-client:1.1.0"
       }
     }
 
 Next, the marklogic-unit-test framework is depended on and installed as an "mlBundle" dependency (the "mlBundle" configuration
 is a feature of ml-gradle for depending on packages of MarkLogic modules):
 
     repositories {
-      jcenter()
+      mavenCentral()
     }
       
     dependencies {
-      mlBundle "com.marklogic:marklogic-unit-test-modules:1.0.0"
+      mlBundle "com.marklogic:marklogic-unit-test-modules:1.1.0"
     }
 
 ## Running unit tests
@@ -34,32 +34,35 @@ determine which MarkLogic app server to connect to - see below for how to custom
 
 First, deploy the application:
 
-    gradle mlDeploy
+    ./gradlew mlDeploy
 
 This will deploy the application along with the marklogic-unit-test modules.
 
 Then, run the tests:
 
-    gradle mlUnitTest
+    ./gradlew mlUnitTest
 
 Two tests are run, and one should fail, so you can see what a failed test looks like. 
 
 This project includes the Gradle Java plugin, which allows you to run tests under src/test/java. This project includes
-an example of a JUnit Parameterized test that invokes each marklogic-unit-test module separately - you can try it like this:
+an example of a test that invokes each marklogic-unit-test module separately - you can try it like this:
 
-    gradle test
+    ./gradlew test
 
-Again, two tests will run, and one will intentionally fail. The Parameterized test can be run in an IDE as well, allowing
-you to take advantage of your IDE's support for JUnit tests.
+Again, two tests will run, and one will intentionally fail. The test can be run in an IDE as well, allowing
+you to take advantage of your IDE's support for JUnit tests. The test depends on the marklogic-junit5 library from the
+marklogic-unit-test project. This library provides support for writing JUnit 5 tests, including running all of your 
+marklogic-unit-test modules. See [the marklogic-junit5 project](https://github.com/marklogic-community/marklogic-unit-test/tree/master/marklogic-junit5)
+for more information.
 
 You can also access the marklogic-unit-test REST endpoints directly:
 
-- List the tests - http://localhost:8135/v1/resources/marklogic-unit-test
-- Run a test suite - http://localhost:8135/v1/resources/marklogic-unit-test?rs:func=run&rs:suite=My%20Tests
+- List the tests - http://localhost:8015/v1/resources/marklogic-unit-test
+- Run a test suite - http://localhost:8015/v1/resources/marklogic-unit-test?rs:func=run&rs:suite=My%20Tests
 
 And you can run the original UI test runner by going to:
 
-- http://localhost:8135/test/default.xqy
+- http://localhost:8015/test/default.xqy
 
 ## Configuring which server mlUnitTest connects to 
 

examples/unit-test-project/build.gradle

@@ -1,7 +1,5 @@
 buildscript {
   repositories {
-		// Still need jcenter until marklogic-unit-test is published to Maven Central
-    jcenter()
 		mavenCentral()
 	  mavenLocal()
   }
@@ -16,13 +14,16 @@ apply plugin: "com.marklogic.ml-gradle"
 
 repositories {
 	mavenCentral()
-	jcenter()
+	mavenLocal()
 }
 
 dependencies {
 	mlBundle "com.marklogic:marklogic-unit-test-modules:${marklogicUnitTestVersion}"
 
 	// For running marklogic-unit-test tests via JUnit
-	testImplementation "com.marklogic:marklogic-unit-test-client:${marklogicUnitTestVersion}"
-	testImplementation "junit:junit:4.12"
+	testImplementation "com.marklogic:marklogic-junit5:${marklogicUnitTestVersion}"
+}
+
+test {
+	useJUnitPlatform()
 }

examples/unit-test-project/gradle.properties

@@ -1,14 +1,14 @@
-mlGradleVersion=4.3.0
-marklogicUnitTestVersion=1.0.0
+mlGradleVersion=4.3.0-SNAPSHOT
+marklogicUnitTestVersion=1.1.0
 
 mlHost=localhost
 mlAppName=unit-test-example
-mlRestPort=8134
+mlRestPort=8014
 
 # It's recommend to have two REST servers - one for the app, and one for running tests, which will point to a separate
 # content database as well
 
-mlTestRestPort=8135
+mlTestRestPort=8015
 mlUsername=admin
 mlPassword=admin
 

examples/unit-test-project/src/test/java/example/ParameterizedTest.java

@@ -0,0 +1,12 @@
+package example;
+
+import com.marklogic.junit5.spring.MarkLogicUnitTestsTest;
+
+/**
+ * Example of running each test module as a separate JUnit test. The parent class handles all the work, which includes
+ * reading config from gradle.properties and gradle-local.properties. This class is needed though so that JUnit has
+ * something it can find and run in the test source tree.
+ */
+public class RunUnitTestsTest extends MarkLogicUnitTestsTest {
+
+}