Merge branch 'feature/9-subprojects' into develop

Author: rjrudin

gradle.properties

@@ -1,17 +1,2 @@
 group=com.marklogic
-version=0.10.0
-
-# These properties are used for the test application that ml-gradle deploys so we can test out ml-unit-test
-mlAppName=marklogic-unit-test-testapp
-mlHost=localhost
-mlUsername=admin
-mlPassword=admin
-mlRestPort=8030
-mlContentForestsPerHost=1
-
-# Load both the ml-unit-test framework code and some test modules
-mlModulePaths=src/main/ml-modules,src/test/ml-modules
-
-# This defaults to src/main/ml-config, but ml-unit-test doesn't have any configuration files itself. So the config
-# files are stored under src/test for the sole purpose of running tests on ml-unit-test.
-mlConfigPath=src/test/ml-config
+version=0.11

ml-unit-test-client/.gitignore

@@ -0,0 +1,6 @@
+.idea
+.gradle
+*.iml
+.DS_Store
+build
+out

build.gradle renamed to ml-unit-test-client/build.gradle

@@ -1,12 +1,6 @@
-buildscript {
-	repositories {
-		mavenLocal()
-	}
-}
-
 plugins {
 	id "java"
-  id "maven-publish"
+	id "maven-publish"
 	id "com.jfrog.bintray" version "1.8.0"
 
 	// ml-gradle is used for deploying a test application so that this project itself can be tested
@@ -30,35 +24,11 @@ dependencies {
 	testCompile "junit:junit:4+"
 }
 
-// Defines a configuration for the MarkLogic modules; used by the modulesZip task below
-configurations {
-	modules
-}
-
-
-jar {
-	baseName "ml-unit-test-client"
-}
-
 task sourcesJar(type: Jar, dependsOn: classes) {
 	classifier "sources"
 	from sourceSets.main.allJava
 }
 
-task modulesZip(type: Zip) {
-	description = "Zip up the ml-unit-test MarkLogic modules into a package that can be published"
-	from("src/main/ml-modules") {
-		into("ml-unit-test/ml-modules")
-	}
-	destinationDir file("build/libs")
-	baseName "ml-unit-test"
-}
-
-// Define the artifacts, in addition to the jar registered by the "java" plugin
-artifacts {
-	modules modulesZip
-}
-
 // Setup publishing of both a jar (containing the src/main/java code) and the modules zip
 // Can eventually include a test jar (containing some src/test/java code) if desired
 // Run "gradle publishtomavenlocal" to publish these locally
@@ -73,18 +43,14 @@ publishing {
 			artifactId "ml-unit-test-client"
 			artifact sourcesJar
 		}
-		mainModules(MavenPublication) {
-			artifactId "ml-unit-test"
-			artifact modulesZip
-		}
 	}
 }
 
 if (project.hasProperty("myBintrayUser")) {
 	bintray {
 		user = myBintrayUser
 		key = myBintrayKey
-		publications = ["mainJava", "sourcesJava", "mainModules"]
+		publications = ["mainJava", "sourcesJava"]
 		pkg {
 			repo = "maven"
 			name = project.name

ml-unit-test-client/gradle.properties

@@ -0,0 +1,14 @@
+# These properties are used for the test application that ml-gradle deploys so we can test out ml-unit-test
+mlAppName=marklogic-unit-test-testapp
+mlHost=localhost
+mlUsername=admin
+mlPassword=admin
+mlRestPort=8090
+mlContentForestsPerHost=1
+
+# Load both the ml-unit-test framework code and some test modules
+mlModulePaths=../ml-unit-test-modules/src/main/ml-modules,src/test/ml-modules
+
+# This defaults to src/main/ml-config, but ml-unit-test doesn't have any configuration files itself. So the config
+# files are stored under src/test for the sole purpose of running tests on ml-unit-test.
+mlConfigPath=src/test/ml-config

src/main/java/com/marklogic/test/unit/DefaultJUnitTestReporter.java renamed to ml-unit-test-client/src/main/java/com/marklogic/test/unit/DefaultJUnitTestReporter.java

@@ -31,14 +31,17 @@ public List<TestModule> parseTestList(String xml) {
 		List<TestModule> testModules = new ArrayList<>();
 		for (int i = 0; i < kids.getLength(); i++) {
 			Node suiteNode = kids.item(i);
-			String suite = suiteNode.getAttributes().getNamedItem("path").getTextContent();
-			NodeList testsNodes = suiteNode.getChildNodes();
-			for (int j = 0; j < testsNodes.getLength(); j++) {
-				NodeList testNodes = testsNodes.item(j).getChildNodes();
-				for (int k = 0; k < testNodes.getLength(); k++) {
-					Node testNode = testNodes.item(k);
-					String test = testNode.getAttributes().getNamedItem("path").getTextContent();
-					testModules.add(new TestModule(test, suite));
+			// getLocalName returns null, have to compare against getNodeName to ensure we have a suite
+			if ("t:suite".equals(suiteNode.getNodeName())) {
+				String suite = suiteNode.getAttributes().getNamedItem("path").getTextContent();
+				NodeList testsNodes = suiteNode.getChildNodes();
+				for (int j = 0; j < testsNodes.getLength(); j++) {
+					NodeList testNodes = testsNodes.item(j).getChildNodes();
+					for (int k = 0; k < testNodes.getLength(); k++) {
+						Node testNode = testNodes.item(k);
+						String test = testNode.getAttributes().getNamedItem("path").getTextContent();
+						testModules.add(new TestModule(test, suite));
+					}
 				}
 			}
 		}