more test fixing

Author: paxtonhare

.travis.yml

@@ -14,4 +14,8 @@ install:
   - ./shared/dev-tasks/install-dependencies.sh
 script:
   - nvm use $NODE_VERSION
-  - '[ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] && ./gradlew test || ./gradlew jshint'
+  - if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then
+      ./gradlew check;
+    else
+      ./gradlew jshint;
+    fi

marklogic-data-hub/src/main/java/com/marklogic/hub/EntityManager.java

@@ -60,7 +60,7 @@ public List<Entity> getEntities() {
 
         ArrayList<Entity> entities = null;
         if (children.getLength() > 0) {
-            entities = new ArrayList<Entity>();
+            entities = new ArrayList<>();
         }
 
         Node node;

marklogic-data-hub/src/test/java/com/marklogic/hub/EntityManagerTest.java

@@ -42,6 +42,10 @@ public class EntityManagerTest extends HubTestBase {
     public static void setup() throws IOException {
         XMLUnit.setIgnoreWhitespace(true);
 
+        clearDb(HubConfig.DEFAULT_STAGING_NAME);
+        clearDb(HubConfig.DEFAULT_FINAL_NAME);
+        clearDb(HubConfig.DEFAULT_MODULES_DB_NAME);
+
         installHub();
 
         DocumentMetadataHandle meta = new DocumentMetadataHandle();

marklogic-data-hub/src/test/java/com/marklogic/hub/FlowManagerTest.java

@@ -48,6 +48,10 @@ public class FlowManagerTest extends HubTestBase {
     public static void setup() throws IOException {
         XMLUnit.setIgnoreWhitespace(true);
 
+        clearDb(HubConfig.DEFAULT_STAGING_NAME);
+        clearDb(HubConfig.DEFAULT_FINAL_NAME);
+        clearDb(HubConfig.DEFAULT_MODULES_DB_NAME);
+
         installHub();
 
         DocumentMetadataHandle meta = new DocumentMetadataHandle();

marklogic-data-hub/src/test/java/com/marklogic/hub/HubProjectTest.java

@@ -16,7 +16,8 @@ public class HubProjectTest extends HubTestBase {
     private static File projectPath = new File("ye-olde-project");
 
     @BeforeClass
-    public static void setup() {
+    public static void setup() throws IOException {
+        FileUtils.deleteDirectory(projectPath);
     }
 
     @AfterClass

marklogic-data-hub/src/test/java/com/marklogic/hub/HubTestBase.java

@@ -29,6 +29,9 @@
 import com.marklogic.client.io.*;
 import com.marklogic.hub.deploy.util.HubDeployStatusListener;
 import com.marklogic.hub.flow.FlowCacheInvalidator;
+import com.marklogic.mgmt.ManageClient;
+import com.marklogic.mgmt.ManageConfig;
+import com.marklogic.mgmt.databases.DatabaseManager;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
@@ -271,6 +274,14 @@ protected static void installStagingDoc(String uri, String doc) {
         stagingDocMgr.write(uri, new StringHandle(doc));
     }
 
+    protected static void clearDb(String dbName) {
+        HubConfig hubConfig = getHubConfig();
+        ManageConfig config = new ManageConfig(hubConfig.host, 8002, hubConfig.username, hubConfig.password);
+        ManageClient client = new ManageClient(config);
+        DatabaseManager databaseManager = new DatabaseManager(client);
+        databaseManager.clearDatabase(dbName);
+    }
+
     protected static void installStagingDoc(String uri, DocumentMetadataHandle meta, String doc) {
         stagingDocMgr.write(uri, meta, new StringHandle(doc));
     }

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

@@ -39,6 +39,10 @@ class BaseTest extends Specification {
 
     DatabaseClient stagingClient() {
         HubConfig hubConfig = new HubConfig()
+        hubConfig.username = "admin";
+        hubConfig.password = "admin";
+        hubConfig.adminUsername = "admin";
+        hubConfig.adminPassword = "admin";
         return hubConfig.newStagingClient()
     }
 
@@ -59,6 +63,9 @@ class BaseTest extends Specification {
 
             mlUsername=admin
             mlPassword=admin
+            
+            mlManageUsername=admin
+            mlManagePassword=admin
 
             mlAdminUsername=admin
             mlAdminPassword=admin