Merge pull request #366 from marklogic/feature/separate-test-app

Moved test app files into "test-app" folder

Author: rjrudin

Jenkinsfile

@@ -1,14 +1,13 @@
 @Library('shared-libraries') _
 
 // Using testCodeCoverageReport from the jacoco-report-aggregation plugin to produce an aggregated code coverage
-// report, even though Sonar doesn't seem to be able to make sense of it yet. 
+// report, even though Sonar doesn't seem to be able to make sense of it yet.
 def runtests(String javaVersion){
   sh label:'test', script: '''#!/bin/bash
     export JAVA_HOME=$'''+javaVersion+'''
     export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
     export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
     cd marklogic-spark-connector
-    echo "mlPassword=admin" > gradle-local.properties
     echo "Waiting for MarkLogic server to initialize."
     sleep 30s
    ./gradlew -i mlDeploy

gradle.properties

@@ -3,22 +3,6 @@
 # 3.5.3 release notes - https://spark.apache.org/releases/spark-release-3-5-3.html .
 sparkVersion=3.5.3
 
-# Only used for the test app and for running tests.
-mlHost=localhost
-mlAppName=spark-test
-mlRestPort=8015
-mlTestRestPort=8016
-mlUsername=admin
-mlPassword=set this in gradle-local.properties
-mlConfigPaths=src/test/ml-config
-mlModulePaths=src/test/ml-modules
-mlSchemaPaths=src/test/ml-schemas
-mlDataPaths=src/test/ml-data
-mlCascadePermissions=true
-# For now, only load the test data into the test database so that tests can use it.
-mlDataDatabaseName=spark-test-test-content
-
-
 # Define these on the command line to publish to OSSRH
 # See https://central.sonatype.org/publish/publish-gradle/#credentials for more information
 mavenCentralUsername=

marklogic-spark-connector/build.gradle

@@ -1,7 +1,6 @@
 plugins {
   id 'net.saliman.properties' version '1.5.2'
   id 'com.gradleup.shadow' version '8.3.3'
-  id "com.marklogic.ml-gradle" version "5.0.0"
   id 'maven-publish'
 
   // This is working in terms of nicely aggregating jacoco code coverage data from each subproject. It produces a very
@@ -101,18 +100,10 @@ dependencies {
   testImplementation "org.skyscreamer:jsonassert:1.5.1"
 }
 
-test {
-  // Allows mlHost to override the value in gradle.properties, which the test plumbing will default to.
-  environment "mlHost", mlHost
-}
-
-task reloadTestData(type: com.marklogic.gradle.task.MarkLogicTask) {
-  description = "Convenience task for clearing the test database and reloading the test data; only intended for a connector developer to use."
-  doLast {
-    new com.marklogic.mgmt.resource.databases.DatabaseManager(getManageClient()).clearDatabase("spark-test-test-content")
-  }
-}
-reloadTestData.finalizedBy mlLoadData
+//test {
+//  // Allows mlHost to override the value in gradle.properties, which the test plumbing will default to.
+//  environment "mlHost", mlHost
+//}
 
 if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
   test {
@@ -213,15 +204,3 @@ task gettingStartedZip(type: Zip) {
   archiveFileName = "marklogic-spark-getting-started-${version}.zip"
   destinationDirectory = file("build")
 }
-
-tasks.register("addMarkLogic12SchemasIfNecessary", com.marklogic.gradle.task.MarkLogicTask) {
-  description = "If testing against MarkLogic 12, include schemas that will not work on MarkLogic 11 or earlier."
-  doLast {
-    def version = new com.marklogic.mgmt.resource.clusters.ClusterManager(getManageClient()).getVersion()
-    if (version.startsWith("12.")) {
-      mlAppConfig.getSchemaPaths().add(new File(getProjectDir(), "src/test/ml-schemas-12").getAbsolutePath())
-    }
-  }
-}
-mlDeploy.dependsOn addMarkLogic12SchemasIfNecessary
-mlLoadSchemas.dependsOn addMarkLogic12SchemasIfNecessary

marklogic-spark-connector/src/test/java/com/marklogic/spark/TestConfig.java

@@ -9,7 +9,7 @@
 
 @Configuration
 @PropertySource(
-    value = {"file:../gradle.properties", "file:../gradle-local.properties"},
+    value = {"file:../test-app/gradle.properties", "file:../test-app/gradle-local.properties"},
     ignoreResourceNotFound = true
 )
 public class TestConfig extends SimpleTestConfig {

settings.gradle

@@ -1 +1 @@
-include "marklogic-langchain4j", "marklogic-spark-api", "marklogic-spark-langchain4j", "marklogic-spark-connector"
+include "marklogic-langchain4j", "marklogic-spark-api", "marklogic-spark-langchain4j", "marklogic-spark-connector", "test-app"

test-app/build.gradle

@@ -0,0 +1,24 @@
+plugins {
+  id "net.saliman.properties" version "1.5.2"
+  id "com.marklogic.ml-gradle" version "5.0.0"
+}
+
+task reloadTestData(type: com.marklogic.gradle.task.MarkLogicTask) {
+  description = "Convenience task for clearing the test database and reloading the test data; only intended for a connector developer to use."
+  doLast {
+    new com.marklogic.mgmt.resource.databases.DatabaseManager(getManageClient()).clearDatabase("spark-test-test-content")
+  }
+}
+reloadTestData.finalizedBy mlLoadData
+
+tasks.register("addMarkLogic12SchemasIfNecessary", com.marklogic.gradle.task.MarkLogicTask) {
+  description = "If testing against MarkLogic 12, include schemas that will not work on MarkLogic 11 or earlier."
+  doLast {
+    def version = new com.marklogic.mgmt.resource.clusters.ClusterManager(getManageClient()).getVersion()
+    if (version.startsWith("12.")) {
+      mlAppConfig.getSchemaPaths().add(new File(getProjectDir(), "src/main/ml-schemas-12").getAbsolutePath())
+    }
+  }
+}
+mlDeploy.dependsOn addMarkLogic12SchemasIfNecessary
+mlLoadSchemas.dependsOn addMarkLogic12SchemasIfNecessary

test-app/gradle.properties

@@ -0,0 +1,11 @@
+# Only used for the test app and for running tests.
+mlHost=localhost
+mlAppName=spark-test
+mlRestPort=8015
+mlTestRestPort=8016
+mlUsername=admin
+mlPassword=admin
+mlCascadePermissions=true
+
+# For now, only load the test data into the test database so that tests can use it.
+mlDataDatabaseName=spark-test-test-content