fixed #517

Author: paxtonhare

marklogic-data-hub/src/main/resources/ml-config/servers/final-server.json

@@ -6,7 +6,7 @@
   "port": "%%mlFinalPort%%",
   "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%mlFinalDbName%%",
-  "authentication": "digest",
+  "authentication": "%%mlFinalAuth%%",
   "default-error-format": "json",
   "error-handler": "/MarkLogic/rest-api/error-handler.xqy",
   "url-rewriter": "/MarkLogic/rest-api/rewriter.xml",

marklogic-data-hub/src/main/resources/ml-config/servers/job-server.json

@@ -6,7 +6,7 @@
   "port": "%%mlJobPort%%",
   "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%mlJobDbName%%",
-  "authentication": "digest",
+  "authentication": "%%mlJobAuth%%",
   "default-error-format": "json",
   "error-handler": "/MarkLogic/rest-api/error-handler.xqy",
   "url-rewriter": "/MarkLogic/rest-api/rewriter.xml",

marklogic-data-hub/src/main/resources/ml-config/servers/staging-server.json

@@ -6,7 +6,7 @@
   "port": "%%mlStagingPort%%",
   "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%mlStagingDbName%%",
-  "authentication": "digest",
+  "authentication": "%%mlStagingAuth%%",
   "default-error-format": "json",
   "error-handler": "/MarkLogic/rest-api/error-handler.xqy",
   "url-rewriter": "/MarkLogic/rest-api/rewriter.xml",

marklogic-data-hub/src/main/resources/ml-config/servers/trace-server.json

@@ -6,7 +6,7 @@
   "port": "%%mlTracePort%%",
   "modules-database": "%%mlModulesDbName%%",
   "content-database": "%%mlTraceDbName%%",
-  "authentication": "digest",
+  "authentication": "%%mlTraceAuth%%",
   "default-error-format": "json",
   "error-handler": "/MarkLogic/rest-api/error-handler.xqy",
   "url-rewriter": "/com.marklogic.hub/tracing-rewriter.xml",

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/BaseTest.groovy

@@ -29,8 +29,6 @@ import javax.xml.parsers.ParserConfigurationException
 
 class BaseTest extends Specification {
 
-    public static boolean makeProperties = true;
-
     static final TemporaryFolder testProjectDir = new TemporaryFolder()
     static File buildFile
     static File propertiesFile
@@ -239,10 +237,13 @@ class BaseTest extends Specification {
         """
     }
 
+    static void createGradleFiles() {
+        createBuildFile()
+        createFullPropertiesFile()
+    }
+
     def setupSpec() {
         XMLUnit.setIgnoreWhitespace(true)
         testProjectDir.create()
-        createBuildFile()
-        createFullPropertiesFile()
     }
 }

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/BasicAuthTest.groovy

@@ -0,0 +1,72 @@
+package com.marklogic.gradle.task
+
+import org.gradle.testkit.runner.UnexpectedBuildFailure
+
+import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
+
+class BasicAuthTest extends BaseTest {
+
+    def setupSpec() {
+        createBuildFile()
+        runTask("hubInit")
+        createProperties()
+    }
+
+    void createProperties() {
+        propertiesFile = new File(testProjectDir.root, 'gradle.properties')
+        propertiesFile << """
+            mlHost=localhost
+            mlAppName=data-hub
+
+            mlUsername=admin
+            mlPassword=admin
+
+            mlManageUsername=admin
+            mlManagePassword=admin
+
+            mlAdminUsername=admin
+            mlAdminPassword=admin
+
+
+            mlStagingAppserverName=data-hub-STAGING
+            mlStagingPort=8010
+            mlStagingDbName=data-hub-STAGING
+            mlStagingForestsPerHost=4
+            mlStagingAuth=basic
+
+
+            mlFinalAppserverName=data-hub-FINAL
+            mlFinalPort=8011
+            mlFinalDbName=data-hub-FINAL
+            mlFinalForestsPerHost=4
+            mlFinalAuth=basic
+
+            mlTraceAppserverName=data-hub-TRACING
+            mlTracePort=8012
+            mlTraceDbName=data-hub-TRACING
+            mlTraceForestsPerHost=1
+            mlTraceAuth=basic
+
+            mlJobAppserverName=data-hub-JOBS
+            mlJobPort=8013
+            mlJobDbName=data-hub-JOBS
+            mlJobForestsPerHost=1
+            mlJobAuth=basic
+
+            mlModulesDbName=data-hub-MODULES
+            mlTriggersDbName=data-hub-TRIGGERS
+            mlSchemasDbName=data-hub-SCHEMAS
+        """
+    }
+
+    def "bootstrap a project with basic auth"() {
+        when:
+        def result = runTask('mlDeploy')
+        print(result.output)
+
+        then:
+        notThrown(UnexpectedBuildFailure)
+        result.task(":mlDeploy").outcome == SUCCESS
+    }
+
+}

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateEntityTaskTest.groovy

@@ -9,6 +9,10 @@ import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class CreateEntityTaskTest extends BaseTest {
+    def setupSpec() {
+        createGradleFiles()
+    }
+
     def "create entity with no name"() {
         when:
         def result = runFailTask('hubCreateEntity')

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateHarmonizeFlowTaskTest.groovy

@@ -9,6 +9,10 @@ import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class CreateHarmonizeFlowTaskTest extends BaseTest {
+    def setupSpec() {
+        createGradleFiles()
+    }
+
     def "createHarmonizeFlow with no entityName"() {
         when:
         def result = runFailTask('hubCreateHarmonizeFlow')

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/CreateInputFlowTaskTest.groovy

@@ -9,6 +9,10 @@ import static org.gradle.testkit.runner.TaskOutcome.FAILED
 import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 
 class CreateInputFlowTaskTest extends BaseTest {
+    def setupSpec() {
+        createGradleFiles()
+    }
+
     def "createInputFlow with no entityName"() {
         when:
         def result = runFailTask('hubCreateInputFlow')

ml-data-hub-plugin/src/test/groovy/com/marklogic/gradle/task/InitProjectTaskTest.groovy

@@ -8,7 +8,7 @@ import static org.gradle.testkit.runner.TaskOutcome.SUCCESS
 class InitProjectTaskTest extends BaseTest {
 
     def setupSpec() {
-        makeProperties = false;
+        createGradleFiles()
     }
 
     def "init a hub project"() {