optimizing tests

Author: paxtonhare

.travis.yml

@@ -7,5 +7,4 @@ before_install:
  - ./.travis/download.sh
 
 script:
-  - docker-compose build
   - docker-compose run marklogic

.travis/Dockerfile-ml

@@ -29,7 +29,7 @@ VOLUME /marklogic-data-hub
 ADD ./ /marklogic-data-hub
 WORKDIR /marklogic-data-hub
 
-RUN ./gradlew tasks 2>&1 > /dev/null
+RUN ./gradlew build -x test 2>&1 > /dev/null
 
 # Define default command (which avoids immediate shutdown)
 CMD /tmp/startml.sh && ./gradlew test

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

@@ -22,19 +22,12 @@ public class DataHubInstallTest extends HubTestBase {
     @BeforeClass
     public static void setup() throws IOException {
         XMLUnit.setIgnoreWhitespace(true);
-        dataHub = new DataHub(getHubConfig());
 
-        InstallInfo installInfo = dataHub.isInstalled();
+        InstallInfo installInfo = getDataHub().isInstalled();
         if (installInfo.isInstalled()) {
-            dataHub.uninstall();
+            uninstallHub();
         }
-        dataHub.initProject();
-        dataHub.install();
-    }
-
-    @AfterClass
-    public static void teardown() throws IOException {
-        uninstallHub();
+        installHub();
     }
 
     @Test

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

@@ -62,11 +62,6 @@ public static void setup() throws IOException {
         installModules(modules);
     }
 
-    @AfterClass
-    public static void teardown() throws IOException {
-        uninstallHub();
-    }
-
     @Test
     public void testGetEntities() {
         EntityManager fm = new EntityManager(stagingClient);

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

@@ -77,11 +77,6 @@ public static void setup() throws IOException {
         installModules(modules);
     }
 
-    @AfterClass
-    public static void teardown() throws IOException {
-        uninstallHub();
-    }
-
     @After
     public void afterEach() {
         finalDocMgr.delete("/employee1.xml");

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

@@ -217,16 +217,15 @@ protected static HubConfig getHubConfig(String projectDir) {
     }
 
     protected static void installHub() throws IOException {
+        File projectDir = new File(PROJECT_PATH);
+        if (!projectDir.isDirectory() || !projectDir.exists()) {
+            getDataHub().initProject();
+        }
+
         if (!isInstalled) {
             getDataHub().install();
             isInstalled = true;
         }
-        else {
-            File projectDir = new File(PROJECT_PATH);
-            if (!projectDir.isDirectory() || !projectDir.exists()) {
-                getDataHub().initProject();
-            }
-        }
     }
 
     protected static void uninstallHub() throws IOException {

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

@@ -30,11 +30,6 @@ public static void setup() throws IOException, URISyntaxException {
         dataHub.installUserModules(true);
      }
 
-    @AfterClass
-    public static void teardown() throws IOException {
-        uninstallHub();
-    }
-
     @Before
     public void beforeEach() {
         runInDatabase("cts:uris() ! xdmp:document-delete(.)", HubConfig.DEFAULT_FINAL_NAME);

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

@@ -14,12 +14,12 @@ class BaseTest extends Specification {
 
     public static boolean makeProperties = true;
 
-    final Logger log = LoggerFactory.getLogger(getClass())
-    @Rule final TemporaryFolder testProjectDir = new TemporaryFolder()
-    File buildFile
-    File propertiesFile
+    static final Logger log = LoggerFactory.getLogger(getClass())
+    static final TemporaryFolder testProjectDir = new TemporaryFolder()
+    static File buildFile
+    static File propertiesFile
 
-    BuildResult runTask(String... task) {
+    static BuildResult runTask(String... task) {
         log.info("DEBUG: running task " + task)
         return GradleRunner.create()
             .withProjectDir(testProjectDir.root)
@@ -46,7 +46,7 @@ class BaseTest extends Specification {
         return hubConfig.newStagingClient()
     }
 
-    void createBuildFile() {
+    static void createBuildFile() {
         String version = new HubConfig(testProjectDir.toString()) .getJarVersion()
         buildFile = testProjectDir.newFile('build.gradle')
         buildFile << """
@@ -56,7 +56,7 @@ class BaseTest extends Specification {
         """
     }
 
-    void createFullPropertiesFile() {
+    static void createFullPropertiesFile() {
         propertiesFile = testProjectDir.newFile('gradle.properties')
         propertiesFile << """
             mlHost=localhost
@@ -103,7 +103,8 @@ class BaseTest extends Specification {
         """
     }
 
-    def setup() {
+    def setupSpec() {
+        testProjectDir.create()
         createBuildFile()
         createFullPropertiesFile()
     }