Merge pull request #521 from jamesagardner/mlUnitTest-nested-test-suites

Test Results for Nested Test Suites

Author: rjrudin

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

@@ -90,7 +90,7 @@ class UnitTestTask extends MarkLogicTask {
 					testsFailed = true
 				}
 				String xml = suite.getXml()
-				String filename = "TEST-" + suite.getName() + ".xml"
+				String filename = "TEST-" + escapeFilename(suite.getName()) + ".xml"
 				org.springframework.util.FileCopyUtils.copy(xml.getBytes(), new File(resultsDir, filename))
 				fileCount++;
 			}
@@ -105,4 +105,8 @@ class UnitTestTask extends MarkLogicTask {
 			client.release()
 		}
 	}
+
+	static String escapeFilename(String filename) {
+		return filename.replaceAll("(/|\\\\)", ".")
+	}
 }

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

@@ -0,0 +1,28 @@
+package com.marklogic.gradle
+
+import org.junit.Test
+import com.marklogic.gradle.task.test.UnitTestTask
+
+class UnitTestTaskTest extends GroovyTestCase {
+
+
+	@Test
+	void testEscapingJavascriptFilenames() {
+		assertEquals("nestedTest.filename.sjs", UnitTestTask.escapeFilename("nestedTest/filename.sjs"))
+		assertEquals("nestedTest.filename.sjs", UnitTestTask.escapeFilename("nestedTest\\filename.sjs"))
+		assertEquals("nestedTest.doubleNestedTest.filenameWithDetails.sjs",
+			UnitTestTask.escapeFilename("nestedTest/doubleNestedTest/filenameWithDetails.sjs"))
+		assertEquals("nestedTest.doubleNestedTest.filenameWithDetails.sjs",
+			UnitTestTask.escapeFilename("nestedTest\\doubleNestedTest\\filenameWithDetails.sjs"))
+	}
+
+	@Test
+	public void testEscapingXqueryFilenames() {
+		assertEquals("nested-test.filename.xqy", UnitTestTask.escapeFilename("nested-test/filename.xqy"))
+		assertEquals("nested-test.filename.xqy", UnitTestTask.escapeFilename("nested-test\\filename.xqy"))
+		assertEquals("nested-test.double-nested-test.filename-with-details.xqy",
+			UnitTestTask.escapeFilename("nested-test/double-nested-test/filename-with-details.xqy"))
+		assertEquals("nested-test.double-nested-test.filename-with-details.xqy",
+			UnitTestTask.escapeFilename("nested-test\\double-nested-test\\filename-with-details.xqy"))
+	}
+}