Merge branch 'dev'

Author: rjrudin

build.gradle

@@ -30,7 +30,7 @@ dependencies {
 	compile mlDataMovementDependency
   compile group: 'commons-io', name: 'commons-io', version: '2.5'
 
-	compileOnly "com.marklogic:ml-unit-test-client:0.9.1"
+	compileOnly mlUnitTestDependency
 
 	testCompile localGroovy()
 	testCompile gradleTestKit()

examples/unit-test-project/build.gradle

@@ -1,14 +1,15 @@
 buildscript {
   repositories {
     jcenter()
+	  mavenLocal()
 
 	  // Needed for ml-unit-test-client dependency until it's available via jcenter()
 	  maven {
 		  url {"https://dl.bintray.com/rjrudin/maven/"}
 	  }
   }
   dependencies {
-	  classpath "com.marklogic:ml-unit-test-client:0.9.1"
+	  classpath "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
     classpath "com.marklogic:ml-gradle:${mlGradleVersion}"
   }
 }
@@ -18,6 +19,7 @@ apply plugin: "com.marklogic.ml-gradle"
 
 repositories {
 	jcenter()
+	mavenLocal()
 
 	// Needed for ml-unit-test and ml-unit-test-client dependencies until they're available via jcenter()
 	maven {
@@ -26,9 +28,9 @@ repositories {
 }
 
 dependencies {
-	mlRestApi "com.marklogic:ml-unit-test:0.9.1"
+	mlRestApi "com.marklogic:ml-unit-test:${mlUnitTestVersion}"
 
 	// For running ml-unit-test tests via JUnit
-	testCompile "com.marklogic:ml-unit-test-client:0.9.1"
+	testCompile "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
 	testCompile "junit:junit:4+"
 }

examples/unit-test-project/gradle.properties

@@ -1,4 +1,5 @@
-mlGradleVersion=3.6.0
+mlGradleVersion=3.6.3
+mlUnitTestVersion=0.10.0
 
 mlHost=localhost
 mlAppName=unit-test-example

examples/unit-test-project/src/test/ml-modules/root/test/suites/My Tests/suite-teardown.xqy

@@ -0,0 +1 @@
+xdmp:log("Suite teardown")

examples/unit-test-project/src/test/ml-modules/root/test/suites/My Tests/teardown.xqy

@@ -0,0 +1 @@
+xdmp:log("Test teardown")

gradle.properties

@@ -1,5 +1,7 @@
 group=com.marklogic
-version=3.6.2
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.6.2
+version=3.6.3
+
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.6.3
 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

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

@@ -276,7 +276,8 @@ class MarkLogicPlugin implements Plugin<Project> {
 				"Can use -PsuiteName to override the name of the test suite, and -PtestName to override the name of the test module.")
 		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 -PunitTestResultPath to override where test result files are written, which defaults to build/test-results/marklogic-unit-test. " +
+			"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

@@ -25,7 +25,22 @@ class UnitTestTask extends MarkLogicTask {
 		def client = appConfig.getTestRestPort() != null ? appConfig.newTestDatabaseClient() : appConfig.newDatabaseClient()
 		try {
 			def testManager = new TestManager(client)
-			def suites = testManager.runAllSuites()
+
+			boolean runTeardown = true
+			boolean runSuiteTeardown = true
+			if (project.hasProperty("runTeardown")) {
+				runTeardown = Boolean.parseBoolean(project.property("runTeardown"))
+			}
+			if (project.hasProperty("runSuiteTeardown")) {
+				runSuiteTeardown = Boolean.parseBoolean(project.property("runSuiteTeardown"))
+			}
+
+			println "Run teardown scripts: " + runTeardown
+			println "Run suite teardown scripts: " + runSuiteTeardown
+			println "Running all suites..."
+			long start = System.currentTimeMillis()
+			def suites = testManager.runAllSuites(runTeardown, runSuiteTeardown)
+			println "Done running all suites; time: " + (System.currentTimeMillis() - start) + "ms"
 			def report = new DefaultJUnitTestReporter().reportOnJUnitTestSuites(suites)
 			println report