DH4.3.3 Jenkins File issues

Author: SameeraPriyathamTadikonda

Jenkinsfile

@@ -59,6 +59,7 @@ pipeline{
                   }
                   }
 		}
+        stage('tests'){
         parallel{
 		stage('Unit-Tests-11.3.0'){
 		agent { label 'dhfLinuxAgent'}
@@ -156,6 +157,7 @@ pipeline{
                   }
                   }
 		}
+        }
         }
 		stage('code-review'){
 		when {

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

@@ -19,14 +19,12 @@ package com.marklogic.gradle.task
 
 import com.marklogic.client.io.DOMHandle
 import com.marklogic.client.io.DocumentMetadataHandle
+import com.marklogic.hub.Debugging
 import com.marklogic.hub.HubConfig
+import com.marklogic.hub.Tracing
 import org.apache.commons.io.FileUtils
 import org.gradle.testkit.runner.UnexpectedBuildFailure
 import org.gradle.testkit.runner.UnexpectedBuildSuccess
-import com.marklogic.hub.Tracing;
-import com.marklogic.hub.Debugging;
-
-import java.nio.file.Paths
 
 import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual
 import static org.gradle.testkit.runner.TaskOutcome.FAILED
@@ -39,7 +37,7 @@ class InstalledTests extends BaseTest {
         // this will be relatively fast (idempotent) for already-installed hubs
         println(runTask('hubInstallModules', '-i').getOutput())
         println(runTask('mlLoadModules', '-i').getOutput())
-		clearDatabases(HubConfig.DEFAULT_STAGING_NAME, HubConfig.DEFAULT_FINAL_NAME, HubConfig.DEFAULT_JOB_NAME);
+        clearDatabases(HubConfig.DEFAULT_STAGING_NAME, HubConfig.DEFAULT_FINAL_NAME, HubConfig.DEFAULT_JOB_NAME)
     }
 
     def cleanupSpec() {
@@ -110,25 +108,25 @@ class InstalledTests extends BaseTest {
         assert (getStagingDocCount() == 0)
         assert (getFinalDocCount() == 0)
 
-        DocumentMetadataHandle meta = new DocumentMetadataHandle();
-        meta.getCollections().add("my-new-entity");
+        DocumentMetadataHandle meta = new DocumentMetadataHandle()
+        meta.getCollections().add("my-new-entity")
         installStagingDoc("/employee1.xml", meta, new File("src/test/resources/run-flow-test/employee1.xml").text)
         installStagingDoc("/employee2.xml", meta, new File("src/test/resources/run-flow-test/employee2.xml").text)
         assert (getStagingDocCount() == 2)
         assert (getFinalDocCount() == 0)
-        String result;
+        String result
         installModule("/entities/my-new-entity/harmonize/my-new-harmonize-flow/content/content.xqy", "run-flow-test/content.xqy")
 
         when:
-        result = runTask('hubRunFlow', '-Pdhf.key=value', '-PshowOptions=true','-PentityName=my-new-entity', '-PflowName=my-new-harmonize-flow', '-i').getOutput()
+        result = runTask('hubRunFlow', '-Pdhf.key=value', '-PshowOptions=true', '-PentityName=my-new-entity', '-PflowName=my-new-harmonize-flow', '-i').getOutput()
         println(result)
 
         then:
         notThrown(UnexpectedBuildFailure)
         getStagingDocCount() == 2
         getFinalDocCount() == 2
-        assert(result.contains("key = value"))
-        assert(! result.contains("dhf.key = value"))
+        assert (result.contains("key = value"))
+        assert (!result.contains("dhf.key = value"))
         assertXMLEqual(getXmlFromResource("run-flow-test/harmonized1.xml"), hubConfig().newFinalClient().newDocumentManager().read("/employee1.xml").next().getContent(new DOMHandle()).get())
         assertXMLEqual(getXmlFromResource("run-flow-test/harmonized2.xml"), hubConfig().newFinalClient().newDocumentManager().read("/employee2.xml").next().getContent(new DOMHandle()).get())
     }
@@ -142,8 +140,8 @@ class InstalledTests extends BaseTest {
         assert (getStagingDocCount() == 0)
         assert (getFinalDocCount() == 0)
 
-        DocumentMetadataHandle meta = new DocumentMetadataHandle();
-        meta.getCollections().add("my-new-entity");
+        DocumentMetadataHandle meta = new DocumentMetadataHandle()
+        meta.getCollections().add("my-new-entity")
         installFinalDoc("/employee1.xml", meta, new File("src/test/resources/run-flow-test/employee1.xml").text)
         installFinalDoc("/employee2.xml", meta, new File("src/test/resources/run-flow-test/employee2.xml").text)
 
@@ -185,67 +183,4 @@ class InstalledTests extends BaseTest {
         result.getOutput().contains('The following Flows are legacy flows:')
         result.getOutput().contains('legacy-test => legacy-input-flow')
     }
-
-    def "createHarmonizeFlow with useES flag"() {
-        given:
-        propertiesFile << """
-            ext {
-                entityName=Employee
-                flowName=my-new-harmonize-flow
-                useES=true
-            }
-        """
-
-        when:
-        runTask('hubUpdate')
-        runTask('hubCreateEntity')
-        copyResourceToFile("employee.entity.json", Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "Employee.entity.json").toFile())
-        runTask('mlLoadModules')
-        def result = runTask('hubCreateHarmonizeFlow')
-
-        then:
-        notThrown(UnexpectedBuildFailure)
-        result.task(":hubCreateHarmonizeFlow").outcome == SUCCESS
-
-        File entityDir = Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "harmonize", "my-new-harmonize-flow").toFile()
-        entityDir.isDirectory() == true
-        File contentPlugin = Paths.get(testProjectDir.root.toString(), "plugins", "entities", "Employee", "harmonize", "my-new-harmonize-flow", "content.sjs").toFile()
-        contentPlugin.text.contains("extractInstanceEmployee")
-    }
-
-    def "runHarmonizeFlow with bad sourceDB"() {
-        given:
-
-        println(runTask('hubCreateHarmonizeFlow', '-PentityName=my-new-entity', '-PflowName=my-new-harmonize-flow', '-PdataFormat=xml', '-PpluginFormat=xqy', '-PuseES=false').getOutput())
-        println(runTask('mlReLoadModules'))
-
-        clearDatabases(HubConfig.DEFAULT_STAGING_NAME, HubConfig.DEFAULT_FINAL_NAME)
-        assert (getStagingDocCount() == 0)
-        assert (getFinalDocCount() == 0)
-
-        DocumentMetadataHandle meta = new DocumentMetadataHandle();
-        meta.getCollections().add("my-new-entity");
-        installStagingDoc("/employee1.xml", meta, new File("src/test/resources/run-flow-test/employee1.xml").text)
-        installStagingDoc("/employee2.xml", meta, new File("src/test/resources/run-flow-test/employee2.xml").text)
-
-        assert (getStagingDocCount() == 2)
-        assert (getFinalDocCount() == 0)
-        installModule("/entities/my-new-entity/harmonize/my-new-harmonize-flow/content/content.xqy", "run-flow-test/content.xqy")
-
-
-        when:
-        propertiesFile << """
-            ext {
-                entityName=my-new-entity
-                flowName=my-new-harmonize-flow
-                sourceDB=12345678
-            }
-        """
-        def result = runTask('hubRunFlow', '-i')
-
-        then:
-        notThrown(UnexpectedBuildFailure)
-        result.getOutput().contains('No such database 12345678')
-        result.task(":hubRunFlow").outcome == SUCCESS
-    }
 }