#129 fix creation of triggers database; first pass tests

Author: eouthwaite

gradle/build.gradle

@@ -1,4 +1,32 @@
+// copied
+
+buildscript {
+  repositories {
+    jcenter()
+  }
+  dependencies {
+    classpath "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
+    classpath "com.marklogic:ml-gradle:${mlGradleVersion}"
+  }
+}
+
 plugins {
   id "net.saliman.properties" version "1.4.6"
-  id "com.marklogic.ml-gradle" version "3.8.1" 
+//   id "com.marklogic.ml-gradle" version "3.8.1"
+}
+
+apply plugin: "java"
+apply plugin: "com.marklogic.ml-gradle"
+
+repositories {
+  jcenter()
+}
+
+dependencies {
+  mlRestApi "com.marklogic:ml-unit-test-modules:${mlUnitTestVersion}"
+
+  // For running ml-unit-test tests via JUnit
+  testCompile "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
+  testCompile "junit:junit:4.12"
 }
+

gradle/gradle.properties

@@ -1,41 +1,40 @@
+# copied from ml-unit-test
+mlGradleVersion=3.7.1
+mlUnitTestVersion=0.11.1
+
 # Roxy properties that were mapped to ml-gradle properties
 mlAppName=workflow
 mlRestPort=8040
-mlRestAdminPassword=5cPeht38`|NU32OX_?+H
+mlRestAdminPassword=admin
 mlRestAuthentication=digest
-mlContentDatabaseName=${app-name}-content
+mlContentDatabaseName=workflow-content
 mlContentForestsPerHost=1
 mlGroupName=Default
-mlModulesDatabaseName=${app-name}-modules
+mlModulesDatabaseName=workflow-modules
 mlPassword=admin
 mlTestRestPort=8042
 mlUsername=admin
+mlTriggersDatabaseName=workflow-triggers
+mlReplaceTokensInModules=true
 
-# Added automatically by ml-gradle under the assumption that a Roxy application defines all of the app servers that it needs 
+# Added automatically by ml-gradle under the assumption that a Roxy application defines all of the app servers that it needs
 # and thus doesn't need ml-gradle to automatically create a REST API server for it.
 mlNoRestServer=true
 
 # All other Roxy properties
-xquery.dir=${basedir}/src
+xquery.dir=${workflow-test}/src
 controller-ext=xqy
-mlGroupName=Default
 app-type=rest
 rest-options.dir=${basedir}/rest-api/config
 data.dir=${basedir}/data
 config.file=${basedir}/deploy/ml-config.xml
 triggers.file=${basedir}/deploy/triggers-config.xml
 schemas.dir=${basedir}/schemas
 schemas.root=/
-mlUsername=admin
-mlPassword=admin
-mlAppName=workflow
 modules-root=/
 modules-prefix=/
-app-role=${app-name}-role
-mlContentDatabaseName=${app-name}-content
-mlModulesDatabaseName=${app-name}-modules
+app-role=workflow-role
 app-modules-db=${modules-db}
-mlContentForestsPerHost=1
 do-not-deploy-tests=prod
 xquery-test.dir=${basedir}/src/test
 bootstrap-port-five=8002
@@ -44,13 +43,11 @@ qconsole-port=8000
 load-html-as-xml=false
 load-js-as-binary=false
 load-css-as-binary=true
-mlRestPort=8040
 xcc-port=8041
 install-xcc=true
 use-https=false
 use-https-for-rest=false
-mlRestAuthentication=digest
-default-user=${app-name}-user
+default-user=workflow-user
 xdbc-authentication-method=digest
 url-rewriter=/MarkLogic/rest-api/rewriter.xml
 error-handler=/MarkLogic/rest-api/error-handler.xqy
@@ -72,12 +69,15 @@ application-conf-file=src/app/config/config.xqy
 verify_retry_max=5
 verify_retry_interval=10
 pipeline-config-file=${basedir}/deploy/pipeline-config.xml
-test-content-db=${app-name}-content-test
-test-modules-db=${app-name}-modules
-mlTestRestPort=8042
-triggers-db=${app-name}-triggers
-mlRestAdminPassword=5cPeht38`|NU32OX_?+H
+test-content-db=workflow-content-test
+test-modules-db=workflow-modules
 rest-ext.dir=${basedir}/rest-api/ext
 rest-transforms.dir=${basedir}/rest-api/transforms
 rewrite-resolves-globally=true
 save-commit-info=false
+
+
+# Test modules could be kept under src/main/ml-modules, but it's recommend to keep them in a separate directory so that
+# the directory can be easily excluded by overriding this property
+mlConfigPaths=src/main/ml-config,src/test/ml-config
+mlModulePaths=src/main/ml-modules,src/test/ml-modules

gradle/src/main/ml-config/databases/workflow-content.json renamed to gradle/src/main/ml-config/databases/content-database.json

@@ -99,4 +99,4 @@
   "assignment-policy" : {
     "assignment-policy-name" : "bucket"
   }
-}
+}

gradle/src/main/ml-config/databases/workflow-modules.json renamed to gradle/src/main/ml-config/databases/modules-database.json

@@ -79,4 +79,4 @@
   "assignment-policy" : {
     "assignment-policy-name" : "bucket"
   }
-}
+}

gradle/src/main/ml-config/databases/workflow-triggers.json renamed to gradle/src/main/ml-config/databases/triggers-database.json

@@ -79,4 +79,4 @@
   "assignment-policy" : {
     "assignment-policy-name" : "bucket"
   }
-}
+}

gradle/src/main/ml-config/forests/workflow-content-test/workflow-content-test-001-1.json

@@ -1,10 +1,10 @@
 {
-  "server-name" : "workflow",
-  "group-name" : "Default",
+  "server-name" : "%%NAME%%",
+  "group-name" : "%%GROUP%%",
   "server-type" : "http",
   "enabled" : true,
   "root" : "/",
-  "port" : 8040,
+  "port" : "%%PORT%%",
   "webDAV" : false,
   "execute" : true,
   "display-last-login" : false,
@@ -70,4 +70,4 @@
   "content-database" : "workflow-content",
   "modules-database" : "workflow-modules",
   "default-user" : "workflow-user"
-}
+}