Renamed Test Namespace (#68)

jamesagardner · web-flow · commit b06a15a4c450 · 2019-04-26T14:15:00.000-04:00
Removing implications of this only being a unit testing framework as it
will include integration and unit testing components.
diff --git a/marklogic-junit/examples/simple-dhf4/src/test/ml-modules/root/test/suites/My Tests/example-lib-tests.xqy b/marklogic-junit/examples/simple-dhf4/src/test/ml-modules/root/test/suites/My Tests/example-lib-tests.xqy
@@ -1,4 +1,4 @@
 import module namespace example = "example" at "/example-lib.xqy";
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-equal("You said: hello", example:echo("hello"))
diff --git a/marklogic-junit/examples/simple-dhf4/src/test/ml-modules/root/test/suites/My Tests/simple-equals-test.xqy b/marklogic-junit/examples/simple-dhf4/src/test/ml-modules/root/test/suites/My Tests/simple-equals-test.xqy
@@ -1,3 +1,3 @@
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-equal("hello", "hello")
diff --git a/marklogic-junit/examples/simple-ml-gradle/src/test/ml-modules/root/test/suites/My Tests/example-lib-tests.xqy b/marklogic-junit/examples/simple-ml-gradle/src/test/ml-modules/root/test/suites/My Tests/example-lib-tests.xqy
@@ -1,4 +1,4 @@
 import module namespace example = "example" at "/example-lib.xqy";
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-equal("You said: hello", example:echo("hello"))
diff --git a/marklogic-junit/examples/simple-ml-gradle/src/test/ml-modules/root/test/suites/My Tests/simple-equals-test.xqy b/marklogic-junit/examples/simple-ml-gradle/src/test/ml-modules/root/test/suites/My Tests/simple-equals-test.xqy
@@ -1,3 +1,3 @@
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-equal("hello", "hello")
diff --git a/marklogic-unit-test-client/src/main/java/com/marklogic/test/unit/JaxpServiceResponseUnmarshaller.java b/marklogic-unit-test-client/src/main/java/com/marklogic/test/unit/JaxpServiceResponseUnmarshaller.java
@@ -32,7 +32,7 @@ public List<TestModule> parseTestList(String xml) {
 		for (int i = 0; i < kids.getLength(); i++) {
 			Node suiteNode = kids.item(i);
 			if ("suite".equals(suiteNode.getLocalName())
-				&& "http://marklogic.com/test/unit".equals(suiteNode.getNamespaceURI())) {
+				&& "http://marklogic.com/test".equals(suiteNode.getNamespaceURI())) {
 				String suite = suiteNode.getAttributes().getNamedItem("path").getTextContent();
 				NodeList testsNodes = suiteNode.getChildNodes();
 				for (int j = 0; j < testsNodes.getLength(); j++) {
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-all-exist.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-all-exist.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-all-exist(0, ()),
 test:assert-all-exist(1, "1"),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-at-least-one-equal.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-at-least-one-equal.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-at-least-one-equal(0, 0),
 test:assert-at-least-one-equal(0, (0, 1, 2)),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal-json.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal-json.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 declare option xdmp:mapping "false";
 
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal-xml.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal-xml.xqy
@@ -1,4 +1,4 @@
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 (: TODO - fill this out with meaningful tests :)
 
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-equal.xqy
@@ -1,4 +1,4 @@
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 declare function local:case1()
 {
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-exists.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-exists.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-exists("1"),
 test:assert-exists(("1", "2")),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-false.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-false.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-false(fn:false()),
 
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-meets-maximum-threshold.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-meets-maximum-threshold.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-meets-maximum-threshold(6, 6),
 test:assert-meets-maximum-threshold(6, (3, 4, 5, 6)),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-meets-minimum-threshold.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-meets-minimum-threshold.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-meets-minimum-threshold(2, 2),
 test:assert-meets-minimum-threshold(2, (3, 4, 5, 6)),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-not-equal.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-not-equal.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-not-equal(0, 1),
 test:assert-not-equal((0, 1, 2), (0, 2, 1)),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-not-exists.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-not-exists.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-not-exists(()),
 test:assert-throws-error-with-message(
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-throws-error.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-throws-error.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 declare function local:div-by-zero() {
   5 div 0
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-true.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/assert-true.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-true(fn:true()),
 test:assert-true((fn:true(), fn:true())),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/fail.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/fail.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 test:assert-throws-error-with-message(
   function() {
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/success.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Assertions/success.xqy
@@ -1,5 +1,5 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
-declare namespace t="http://marklogic.com/test/unit";
+declare namespace t="http://marklogic.com/test";
 
 test:assert-equal(<t:result type="success"/>, test:success())
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Get Test File/test-get-test-file.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Get Test File/test-get-test-file.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 let $doc := test:get-test-file("basic-doc.xml")
-return test:assert-exists($doc)
+return test:assert-exists($doc)
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-doc-has-collections.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-doc-has-collections.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 import module namespace td="load-test-file-module" at "test-data/td.xqy";
 
 (:
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-doc-has-permissions.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-doc-has-permissions.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 import module namespace td="load-test-file-module" at "test-data/td.xqy";
 
 declare namespace sec="http://marklogic.com/xdmp/security";
@@ -9,11 +9,11 @@ declare namespace sec="http://marklogic.com/xdmp/security";
  : This test makes sure all permissions that we attempted to add in the suite setup were actually added
  :)
 
-let $all-perms := 
+let $all-perms :=
 	for $perm in xdmp:document-get-permissions($td:URI-WITH-PERMS)
 	return fn:concat($perm/sec:role-id/text(), "-", $perm/sec:capability/text())
 
-let $expected-perms := 
+let $expected-perms :=
 	for $perm in $td:PERMS
 	return fn:concat($perm/sec:role-id/text(), "-", $perm/sec:capability/text())
 
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-load-doc-works.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/assert-load-doc-works.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 import module namespace td="load-test-file-module" at "test-data/td.xqy";
 
 
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/suite-setup.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/Data Loaders/Load Test File/suite-setup.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 import module namespace td="load-test-file-module" at "test-data/td.xqy";
 
 (
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/http-helpers.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/http-helpers.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 
 
 test:assert-http-get-status("v1/search?format=xml", $test:DEFAULT_HTTP_OPTIONS, 200),
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-delete-all-xml.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-delete-all-xml.xqy
@@ -6,11 +6,11 @@ xdmp:document-insert("/delete-all-test/doc2.xlsx", <doc>2</doc>, xdmp:default-pe
 xdmp:document-insert("/config/config.xml", <config></config>, xdmp:default-permissions(), "helpers-test-docs");
 
 (: call helper to delete xml/xlsx documents :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 test:delete-all-xml();
 
 (: confirm all xml/xlsx docs except config.xml have been deleted :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 test:assert-not-exists(fn:doc("/delete-all-test/doc1.xml")),
 test:assert-not-exists(fn:doc("/delete-all-test/doc2.xlsx")),
 test:assert-exists(fn:doc("/config/config.xml"));
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-list-from-database.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-list-from-database.xqy
@@ -6,8 +6,8 @@ xdmp:document-insert("/list-from-db-test/path-1/doc2.xml", <doc>path1 doc2</doc>
 xdmp:document-insert("/list-from-db-test/path-2/doc1.xml", <doc>path2 doc1</doc>, xdmp:default-permissions(), "helpers-test-docs");
 
 (: call helper to list docs in a path and confirm we only get the two in that path :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 let $uris := test:list-from-database(xdmp:database(), "/list-from-db-test/path-1/")
 return (
   test:assert-same-values(("/list-from-db-test/path-1/doc1.xml", "/list-from-db-test/path-1/doc2.xml"), $uris)
-);
+);
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-remove-modules-directories.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-remove-modules-directories.xqy
@@ -2,7 +2,7 @@ xquery version "1.0-ml";
 
 (: create a directory in the modules database :)
 xdmp:invoke-function(
-  function() { 
+  function() {
     xdmp:directory-create("/remove-modules-dir-test/")
   },
   <options xmlns="xdmp:eval">
@@ -11,16 +11,16 @@ xdmp:invoke-function(
 );
 
 (: call test helper to remove the directory :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 test:remove-modules-directories("/remove-modules-dir-test/");
 
 (: Confirm the directory has been removed :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 xdmp:invoke-function(
-  function() { 
+  function() {
     test:assert-not-exists(xdmp:document-properties("/remove-modules-dir-test/"))
   },
   <options xmlns="xdmp:eval">
     <database>{xdmp:modules-database()}</database>
   </options>
-) 
+)
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-remove-modules.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Helpers/test-remove-modules.xqy
@@ -2,10 +2,10 @@ xquery version "1.0-ml";
 
 (: add a module to the modules database :)
 xdmp:invoke-function(
-  function() { 
+  function() {
     let $mod := <foo><![CDATA[
       xquery version "1.0-ml";
-       
+
       "Hello World"
       ]]></foo>/text()
 
@@ -17,13 +17,13 @@ xdmp:invoke-function(
 );
 
 (: call the helper to remove the module :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 test:remove-modules("/remove-mods-test/mod1.xqy");
 
 (: confirm the module has been removed :)
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 xdmp:invoke-function(
-  function() { 
+  function() {
     test:assert-not-exists(fn:doc("/remove-mods-test/mod1.xqy"))
   },
   <options xmlns="xdmp:eval">
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Nested Directory/Another Nested Directory/Double Nested Test Suite/double-nested-test.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Nested Directory/Another Nested Directory/Double Nested Test Suite/double-nested-test.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 (:
   This file is used to ensure we detect double nested tests when returning a list of tests and suites.  The below
   assertion is not meaningful.
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Nested Directory/Another Nested Directory/nested-test.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Nested Directory/Another Nested Directory/nested-test.xqy
@@ -1,4 +1,4 @@
-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";
 (:
   This file is used to ensure we detect  nested tests when returning a list of tests and suites.  The below assertion is
   not meaningful.
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/ignored-directories.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/ignored-directories.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy",
 "/test/test-controller.xqy";
 
 let $list := test:list()
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/ignored-files.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/ignored-files.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-controller.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-controller.xqy",
                                                                    "/test/test-helper.xqy";
 
 let $list := test:list()
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/nested-suite.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/nested-suite.xqy
@@ -1,4 +1,4 @@
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-controller.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-controller.xqy",
                                                                    "/test/test-helper.xqy";
 
 let $list := test:list()
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/non-nested-suite.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/non-nested-suite.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-controller.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-controller.xqy",
                                                                    "/test/test-helper.xqy";
 
 let $list := test:list()
diff --git a/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/non-xquery-or-serverside-javascript.xqy b/marklogic-unit-test-client/src/test/ml-modules/root/test/suites/Test Suites/non-xquery-or-serverside-javascript.xqy
@@ -1,6 +1,6 @@
 xquery version "1.0-ml";
 
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-controller.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-controller.xqy",
                                                                    "/test/test-helper.xqy";
 
 let $list := test:list()
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/default.xqy b/marklogic-unit-test-modules/src/main/ml-modules/root/test/default.xqy
@@ -15,7 +15,7 @@ limitations under the License.
 :)
 xquery version "1.0-ml";
 
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy",
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy",
                                                                    "/test/test-controller.xqy";
 import module namespace coverage = "http://marklogic.com/test/coverage" at "/test/test-coverage.xqy";
 
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/formats/j-unit.xsl b/marklogic-unit-test-modules/src/main/ml-modules/root/test/formats/j-unit.xsl
@@ -3,7 +3,7 @@
 -->
 <xsl:stylesheet version="2.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:test="http://marklogic.com/test/unit"
+                xmlns:test="http://marklogic.com/test"
                 xmlns:error="http://marklogic.com/xdmp/error"
                 exclude-result-prefixes="#all">
 	<xsl:output method="xml" encoding="utf-8" indent="yes"/>
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/js/tests.js b/marklogic-unit-test-modules/src/main/ml-modules/root/test/js/tests.js
@@ -22,7 +22,7 @@
  * Modifications copyright (c) 2018 MarkLogic Corporation
  **/
 var queue = [];
-var coverage = $.parseXML("<test:tests xmlns:test='http://marklogic.com/test/unit'/>");
+var coverage = $.parseXML("<test:tests xmlns:test='http://marklogic.com/test'/>");
 
 function resetCoverage() {
   'use strict';
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-controller.xqy b/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-controller.xqy
@@ -4,12 +4,12 @@ xquery version "1.0-ml";
 Defines functions that are used by the default.xqy test runner and by the REST endpoint.
 :)
 
-module namespace test = "http://marklogic.com/test/unit";
+module namespace test = "http://marklogic.com/test";
 
 import module namespace cover = "http://marklogic.com/test/coverage" at "/test/test-coverage.xqy";
 import module namespace cvt = "http://marklogic.com/cpf/convert" at "/MarkLogic/conversion/convert.xqy";
 import module namespace functx = "http://www.functx.com" at "/MarkLogic/functx/functx-1.0-nodoc-2007-01.xqy";
-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";
 
 declare variable $XSL-PATTERN as xs:string := "\.xslt?$";
 declare variable $TEST-SUITES-ROOT := "/test/suites/";
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-coverage.xqy b/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-coverage.xqy
@@ -25,9 +25,9 @@ xquery version "1.0-ml";
  :)
 module namespace cover="http://marklogic.com/test/coverage";
 
-import module namespace helper = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";
-declare namespace test = "http://marklogic.com/test/unit";
-declare default element namespace "http://marklogic.com/test/unit";
+import module namespace helper = "http://marklogic.com/test" at "/test/test-helper.xqy";
+declare namespace test = "http://marklogic.com/test";
+declare default element namespace "http://marklogic.com/test";
 
 declare option xdmp:mapping "false";
 
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-helper.xqy b/marklogic-unit-test-modules/src/main/ml-modules/root/test/test-helper.xqy
@@ -15,7 +15,7 @@ limitations under the License.
 :)
 xquery version "1.0-ml";
 
-module namespace test = "http://marklogic.com/test/unit";
+module namespace test = "http://marklogic.com/test";
 
 import module namespace cvt = "http://marklogic.com/cpf/convert" at "/MarkLogic/conversion/convert.xqy";
 
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/common.xsl b/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/common.xsl
@@ -22,7 +22,7 @@
  Modifications copyright (c) 2018 MarkLogic Corporation
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:test="http://marklogic.com/test/unit"
+                xmlns:test="http://marklogic.com/test"
                 xmlns:xdmp="http://marklogic.com/xdmp"
                 xmlns:error="http://marklogic.com/xdmp/error"
                 xmlns:prof="http://marklogic.com/xdmp/profile"
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/module/html.xsl b/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/module/html.xsl
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/report/html.xsl b/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/report/html.xsl
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/report/xml.xsl b/marklogic-unit-test-modules/src/main/ml-modules/root/test/xslt/coverage/report/xml.xsl
diff --git a/marklogic-unit-test-modules/src/main/ml-modules/services/marklogic-unit-test.xqy b/marklogic-unit-test-modules/src/main/ml-modules/services/marklogic-unit-test.xqy
diff --git a/src/main/ml-modules/root/test/formats/j-unit.xsl b/src/main/ml-modules/root/test/formats/j-unit.xsl
diff --git a/src/main/ml-modules/root/test/test-coverage.xqy b/src/main/ml-modules/root/test/test-coverage.xqy
diff --git a/src/main/ml-modules/root/test/xslt/coverage/common.xsl b/src/main/ml-modules/root/test/xslt/coverage/common.xsl
diff --git a/src/main/ml-modules/root/test/xslt/coverage/module/html.xsl b/src/main/ml-modules/root/test/xslt/coverage/module/html.xsl
diff --git a/src/main/ml-modules/root/test/xslt/coverage/report/html.xsl b/src/main/ml-modules/root/test/xslt/coverage/report/html.xsl
diff --git a/src/main/ml-modules/root/test/xslt/coverage/report/xml.xsl b/src/main/ml-modules/root/test/xslt/coverage/report/xml.xsl

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-import module namespace test = "http://marklogic.com/test/unit" at "/test/test-helper.xqy";`
	`1`	`+import module namespace test = "http://marklogic.com/test" at "/test/test-helper.xqy";`
`2`	`2`
`3`	`3`	`test:assert-equal("hello", "hello")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import module namespace test="http://marklogic.com/test/unit" at "/test/test-helper.xqy";`
	`1`	`+import module namespace test="http://marklogic.com/test" at "/test/test-helper.xqy";`
`2`	`2`
`3`	`3`	`test:assert-all-exist(0, ()),`
`4`	`4`	`test:assert-all-exist(1, "1"),`