fixing tests

Author: paxtonhare

marklogic-data-hub/build.gradle

@@ -5,7 +5,6 @@ plugins {
     id 'com.jfrog.bintray' version '1.7.2'
     id 'com.marklogic.ml-gradle' version '2.3.4'
     id 'com.moowork.node' version '0.13'
-    id 'com.github.hauner.jarTest' version '1.0'
 }
 
 repositories {

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

@@ -100,7 +100,6 @@ public void init() {
             writeResourceFileWithReplace("ml-config/security/roles/data-hub-user.json", rolesDir.resolve("data-hub-user.json"));
             writeResourceFileWithReplace("ml-config/security/users/data-hub-user.json", usersDir.resolve("data-hub-user.json"));
 
-
             writeResourceFile("scaffolding/build_gradle", projectDir.resolve("build.gradle"));
             writeResourceFileWithReplace("scaffolding/gradle_properties", projectDir.resolve("gradle.properties"));
             writeResourceFile("scaffolding/gradle-local_properties", projectDir.resolve("gradle-local.properties"));

marklogic-data-hub/src/main/resources/ml-config/security/roles/data-hub-user.json

@@ -0,0 +1,16 @@
+{
+  "role-name": "%%mlHubUserRole%%",
+  "description": "A role that allows the user to read and write from MarkLogic Data Hub databases",
+  "privilege": [
+    {
+      "privilege-name": "rest-admin",
+      "action": "http://marklogic.com/xdmp/privileges/rest-admin",
+      "kind": "execute"
+    },
+    {
+      "privilege-name": "manage-admin",
+      "action": "http://marklogic.com/xdmp/privileges/manage-admin",
+      "kind": "execute"
+    }
+  ]
+}

marklogic-data-hub/src/main/resources/ml-config/security/users/data-hub-user.json

@@ -0,0 +1,6 @@
+{
+  "user-name": "%%mlHubUserName%%",
+  "description": "A user that is used for reading and writing from MarkLogic Data Hub databases",
+  "password": "%%mlHubUserPassword%%",
+  "role": ["%%mlHubUserRole%%"]
+}

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

@@ -161,6 +161,8 @@ protected static HubConfig getHubConfig(String projectDir) {
         hubConfig.jobPort = jobPort;
         hubConfig.username = user;
         hubConfig.password = password;
+        hubConfig.adminUsername = user;
+        hubConfig.adminPassword = password;
         return hubConfig;
     }
 

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

@@ -49,8 +49,6 @@ class BaseTest extends Specification {
             plugins {
                 id 'com.marklogic.ml-data-hub'
             }
-
-            workingDir = ${testProjectDir.root}
         """
     }
 
@@ -94,9 +92,6 @@ class BaseTest extends Specification {
 
     def setup() {
         createBuildFile()
-
-        if (makeProperties) {
-            createFullPropertiesFile()
-        }
+        createFullPropertiesFile()
     }
 }

quick-start/build.gradle

@@ -55,7 +55,6 @@ dependencies {
 
     testCompile("junit:junit")
     testCompile("org.springframework.boot:spring-boot-starter-test:${springBootVersion}")
-    testCompile project (path: ':marklogic-data-hub', configuration: 'testArchives')
 }
 
 configurations {

quick-start/src/test/java/com/marklogic/quickstart/service/TraceServiceTest.java

@@ -1,27 +1,62 @@
 package com.marklogic.quickstart.service;
 
-import com.marklogic.hub.HubTestBase;
+import com.marklogic.client.DatabaseClient;
+import com.marklogic.client.DatabaseClientFactory;
+import com.marklogic.hub.DataHub;
+import com.marklogic.hub.HubConfig;
+import org.apache.commons.io.FileUtils;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.File;
 import java.io.IOException;
 
-public class TraceServiceTest extends HubTestBase {
+public class TraceServiceTest {
+    public static final String PROJECT_PATH = "ye-olde-project";
+
     @BeforeClass
     public static void setup() throws IOException {
-        HubTestBase.installHub();
+        installHub();
     }
 
     @AfterClass
     public static void teardown() throws IOException {
-        HubTestBase.uninstallHub();
+        uninstallHub();
     }
 
     @Test
     public void getTraces() throws Exception {
-        TraceService tm = new TraceService(HubTestBase.traceClient);
+        DatabaseClient traceClient = DatabaseClientFactory.newClient("localhost", 8012, "admin", "admin", DatabaseClientFactory.Authentication.DIGEST);
+        TraceService tm = new TraceService(traceClient);
         tm.getTraces(null, 1, 10);
     }
 
+    protected static void installHub() throws IOException {
+        new DataHub(getHubConfig()).install();
+    }
+
+    protected static void uninstallHub() throws IOException {
+        new DataHub(getHubConfig()).uninstall();
+        FileUtils.deleteDirectory(new File(PROJECT_PATH));
+    }
+
+    protected static HubConfig getHubConfig() {
+        return getHubConfig(PROJECT_PATH);
+    }
+
+    protected static HubConfig getHubConfig(String projectDir) {
+        HubConfig hubConfig = new HubConfig(projectDir);
+        hubConfig.host = "localhost";
+        hubConfig.stagingPort = 8010;
+        hubConfig.finalPort = 8011;
+        hubConfig.tracePort = 8012;
+        hubConfig.jobPort = 8013;
+        hubConfig.username = "admin";
+        hubConfig.password = "admin";
+        hubConfig.adminUsername = "admin";
+        hubConfig.adminPassword = "admin";
+        return hubConfig;
+    }
+
 }