MLE-24733 Merging the two test ml-gradle projects

CONTRIBUTING.md

@@ -32,6 +32,7 @@ While still in the test-app directory run the following gradle command.
 
     cd test-app
     ./gradlew -i mlDeploy
+    ./gradlew -i -Penv=e2e mlLoadData mlLoadModules
 
 Once the deploy has completed successfully, use "cd .." to return to the root directory of the project.
 

Jenkinsfile

@@ -16,6 +16,7 @@ def runTests() {
     ./gradlew -i mlWaitTillReady
     ./gradlew -i mlTestConnections
     ./gradlew -i mlDeploy
+    ./gradlew -i -Penv=e2e mlLoadData mlLoadModules
 
 		cd ..
 		rm -rf $WORKSPACE/*.xml || true
@@ -70,19 +71,12 @@ def runLint() {
 
 def runE2ETests() {
   sh label: 'run-e2e-tests', script: '''
-    export JAVA_HOME=$JAVA_HOME_DIR
-    export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
-    export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH
+    export PATH=${NODE_HOME_DIR}/bin:$PATH
 		cd node-client-api
 		node --version
 		npm --version
 		npm ci
 
-    cd test-complete-app-mlDeploy
-    echo "Deploying from test-complete-app-mlDeploy"
-    ./gradlew -i mlDeploy
-    cd ..
-
     echo "Running test-complete tests"
     ./node_modules/.bin/mocha --no-parallel -R xunit --timeout 60000  test-complete/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-complete-results.xml  || true
     echo "Done with test-complete tests"

test-app/build.gradle

@@ -12,7 +12,7 @@ buildscript {
 }
 
 plugins {
-  id "net.saliman.properties" version "1.5.2"
+  id "net.saliman.properties" version "1.6.0"
 }
 
 apply plugin: "com.marklogic.ml-gradle"
@@ -46,3 +46,32 @@ ext {
   command.setValidFor(365)
   mlAppDeployer.commands.add(command)
 }
+
+tasks.register("curlPeople", Exec) {
+  commandLine = [
+    'curl',
+    '--fail',
+    '--anyauth', '--user', 'admin:admin',
+    '-i',
+    '-X', 'POST',
+    '--data-binary', '@./src/main/turtle/people/people.ttl',
+    '-H', 'Content-type: text/turtle',
+    'http://localhost:8079/v1/graphs?graph=/people'
+  ]
+}
+
+tasks.register("curlCompanies", Exec) {
+  commandLine = [
+    'curl',
+    '--fail',
+    '--anyauth', '--user', 'admin:admin',
+    '-i',
+    '-X', 'POST',
+    '--data-binary', '@./src/main/turtle/companies/companies_100.ttl',
+    '-H', 'Content-type: text/turtle',
+    'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl'
+  ]
+}
+
+mlDeploy.finalizedBy curlPeople
+mlDeploy.finalizedBy curlCompanies

test-app/gradle-e2e.properties

@@ -0,0 +1,8 @@
+# Defines properties for loading data and modules for the so-called "e2e" tests in "test-complete".
+mlDataPaths=src/main/ml-e2e-data
+mlModulePaths=src/main/ml-e2e-modules
+
+mlDataDatabaseName=nodeOpticFunctionalTest
+mlModulesDatabaseName=nodeOpticFunctionalTestModules
+
+mlNoRestServer=true

test-app/gradle.properties

@@ -1,7 +1,10 @@
+# See https://github.com/stevesaliman/gradle-properties-plugin
+propertiesPluginEnvironmentNameProperty=env
+
 mlAppName=unittest-nodeapi
 mlContentDatabaseName=unittest-nodeapi
 mlHost=localhost
 mlUsername=admin
 mlPassword=admin
 mlRestPort=8015
-mlContentForestsPerHost=3
+mlContentForestsPerHost=3

test-complete-app-mlDeploy/src/main/ml-config/servers/rest-api-server.json → test-app/src/main/ml-config/servers/node-client-api-ssl-server.json

@@ -10,5 +10,5 @@
     "url-rewriter": "/MarkLogic/rest-api/rewriter.xml",
     "rewrite-resolves-globally": true,
     "authentication": "digestbasic",
-    "ssl-certificate-template": "ssl-project-template"
-}
+    "ssl-certificate-template": "node-client-ssl-template"
+}