Merge branch 'dev'

Author: rjrudin

examples/unit-test-project/README.md

@@ -10,7 +10,7 @@ include this by default (not every ml-gradle user will use ml-unit-test), so it
         jcenter()
       }
       dependencies {
-        classpath "com.marklogic:ml-unit-test-client:0.11"
+        classpath "com.marklogic:ml-unit-test-client:0.11.1"
       }
     }
 
@@ -22,7 +22,7 @@ is a feature of ml-gradle for depending on packages of MarkLogic modules):
     }
       
     dependencies {
-      mlRestApi "com.marklogic:ml-unit-test-modules:0.11"
+      mlRestApi "com.marklogic:ml-unit-test-modules:0.11.1"
     }
 
 With those additions in place, the "mlUnitTest" task can be run. This task will use the value of mlTestRestPort to 

examples/unit-test-project/gradle.properties

@@ -1,5 +1,5 @@
-mlGradleVersion=3.6.3
-mlUnitTestVersion=0.11
+mlGradleVersion=3.7.1
+mlUnitTestVersion=0.11.1
 
 mlHost=localhost
 mlAppName=unit-test-example

gradle.properties

@@ -1,8 +1,8 @@
 group=com.marklogic
-version=3.7.0
+version=3.7.1
 javadocsDir=../gh-pages-marklogic-java/javadocs
 
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.7.0
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.7.1
 mlcpUtilDependency=com.marklogic:mlcp-util:0.9.0
 mlDataMovementDependency=com.marklogic:marklogic-data-movement-components:1.0
-mlUnitTestDependency=com.marklogic:ml-unit-test-client:0.10.0
+mlUnitTestDependency=com.marklogic:ml-unit-test-client:0.11.1

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -283,6 +283,7 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.task("mlUnitTest", type: UnitTestTask, group: unitTestGroup, description: "Run tests found under /test/suites in the modules database. " +
 			"Connects to MarkLogic via the REST API server defined by mlTestRestPort (or by mlRestPort if mlTestRestPort is not set), and uses mlRest* properties for authentication. " +
 			"Use -PunitTestResultPath to override where test result files are written, which defaults to build/test-results/marklogic-unit-test. " +
+			"Use -PrunCodeCoverage to enable code coverage support when running the tests. " + 
 			"Use -PrunTeardown and -PrunSuiteTeardown to control whether teardown and suite teardown scripts are run; these default to 'true' and can be set to 'false' instead. ")
 
 		logger.info("Finished initializing ml-gradle\n")

src/main/groovy/com/marklogic/gradle/task/test/UnitTestTask.groovy

@@ -28,18 +28,23 @@ class UnitTestTask extends MarkLogicTask {
 
 			boolean runTeardown = true
 			boolean runSuiteTeardown = true
+			boolean runCoverage = false
 			if (project.hasProperty("runTeardown")) {
 				runTeardown = Boolean.parseBoolean(project.property("runTeardown"))
 			}
 			if (project.hasProperty("runSuiteTeardown")) {
 				runSuiteTeardown = Boolean.parseBoolean(project.property("runSuiteTeardown"))
 			}
+			if (project.hasProperty("runCodeCoverage")) {
+				runCoverage = Boolean.parseBoolean(project.property("runCodeCoverage"))
+			}
 
 			println "Run teardown scripts: " + runTeardown
 			println "Run suite teardown scripts: " + runSuiteTeardown
+			println "Run code coverage: " + runCoverage
 			println "Running all suites..."
 			long start = System.currentTimeMillis()
-			def suites = testManager.runAllSuites(runTeardown, runSuiteTeardown)
+			def suites = testManager.runAllSuites(runTeardown, runSuiteTeardown, runCoverage)
 			println "Done running all suites; time: " + (System.currentTimeMillis() - start) + "ms"
 			def report = new DefaultJUnitTestReporter().reportOnJUnitTestSuites(suites)
 			println report

src/test/groovy/com/marklogic/gradle/DeployAppTaskTest.groovy

@@ -8,7 +8,7 @@ class DeployAppTaskTest extends BaseTest {
 
 	def "deploy barebones app"() {
 		setup:
-		print(runTask('mlUnDeploy').output)
+		print(runTask('mlUnDeploy',  '-Pconfirm=true').output)
 
 		expect:
 		def srf = getServerConfig()
@@ -31,7 +31,7 @@ class DeployAppTaskTest extends BaseTest {
 		drf2.resourceExists("my-app-modules")
 
 		cleanup:
-		runTask('mlUndeploy')
+		runTask('mlUndeploy',  '-Pconfirm=true')
 	}
 
 }