fixes 1217: Fix Pre Relase Tests (#1218)

neo4j-contrib · May 29, 2019 · 08c476c · 08c476c
1 parent 0ee0e84
commit 08c476c
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 21 deletions.
diff --git a/src/test/java/apoc/bolt/BoltTest.java b/src/test/java/apoc/bolt/BoltTest.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static apoc.util.TestContainerUtil.cleanBuild;
 import static apoc.util.TestUtil.isTravis;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeFalse;
@@ -60,7 +61,7 @@ public static void tearDown() {
             neo4jContainer.close();
             db.shutdown();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test

diff --git a/src/test/java/apoc/custom/CypherProceduresClusterTest.java b/src/test/java/apoc/custom/CypherProceduresClusterTest.java
@@ -24,7 +24,7 @@ public class CypherProceduresClusterTest {
     @BeforeClass
     public static void setupCluster() {
         assumeFalse(isTravis());
-        executeGradleTasks("shadow");
+        executeGradleTasks("clean", "shadow");
         TestUtil.ignoreException(() ->  cluster = TestContainerUtil
                 .createEnterpriseCluster(3, 1, Util.map("apoc.custom.procedures.refresh", 100)),
                 Exception.class);
@@ -36,7 +36,7 @@ public static void bringDownCluster() {
         if (cluster != null) {
             cluster.close();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test

diff --git a/src/test/java/apoc/date/DateTest.java b/src/test/java/apoc/date/DateTest.java
@@ -1,5 +1,18 @@
 package apoc.date;
 
+import apoc.util.TestUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.Node;
+import org.neo4j.graphdb.QueryExecutionException;
+import org.neo4j.graphdb.Transaction;
+import org.neo4j.helpers.collection.Iterators;
+import org.neo4j.test.TestGraphDatabaseFactory;
+
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -12,15 +25,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.stream.Stream;
-import apoc.util.TestUtil;
-import org.junit.*;
-import org.junit.rules.ExpectedException;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.QueryExecutionException;
-import org.neo4j.graphdb.Transaction;
-import org.neo4j.helpers.collection.Iterators;
-import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestUtil.testCall;
@@ -407,7 +411,7 @@ public void testConvertFormats() throws Exception {
 		String isoDateTime = "2019-05-14T14:52:06-04:00";
 		Map<String, Object> params = new HashMap<>();
 		params.put("rfcDateTime", rfcDateTime);
-		testCall(db, "RETURN apoc.date.convertFormats($rfcDateTime, 'rfc_1123_date_time', 'iso_date_time') as convertedTime", params, row -> assertEquals(isoDateTime, row.get("convertedTime")));
+		testCall(db, "RETURN apoc.date.convertFormat($rfcDateTime, 'rfc_1123_date_time', 'iso_date_time') as convertedTime", params, row -> assertEquals(isoDateTime, row.get("convertedTime")));
 	}
 
 	private SimpleDateFormat formatInUtcZone(final String pattern) {

diff --git a/src/test/java/apoc/export/csv/ExportCsvIT.java b/src/test/java/apoc/export/csv/ExportCsvIT.java
@@ -30,7 +30,7 @@ public class ExportCsvIT {
     public static void beforeAll() {
         assumeFalse(isTravis());
         TestUtil.ignoreException(() -> {
-            executeGradleTasks("shadow");
+            executeGradleTasks("clean", "shadow");
             neo4jContainer = createEnterpriseDB(true);
             neo4jContainer.start();
         }, Exception.class);
@@ -43,7 +43,7 @@ public static void afterAll() {
         if (neo4jContainer != null) {
             neo4jContainer.close();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test

diff --git a/src/test/java/apoc/export/cypher/ExportCypherEnterpriseFeaturesTest.java b/src/test/java/apoc/export/cypher/ExportCypherEnterpriseFeaturesTest.java
@@ -32,7 +32,7 @@ public static void beforeAll() {
         assumeFalse(isTravis());
         TestUtil.ignoreException(() -> {
             // We build the project, the artifact will be placed into ./build/libs
-            executeGradleTasks("shadow");
+            executeGradleTasks("clean", "shadow");
             neo4jContainer = createEnterpriseDB(!TestUtil.isTravis())
                     .withInitScript("init_neo4j_export_csv.cypher");
             neo4jContainer.start();
@@ -46,7 +46,7 @@ public static void afterAll() {
         if (neo4jContainer != null) {
             neo4jContainer.close();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test

diff --git a/src/test/java/apoc/metrics/MetricsTest.java b/src/test/java/apoc/metrics/MetricsTest.java
@@ -33,7 +33,7 @@ public class MetricsTest {
     public static void beforeAll() {
         assumeFalse(isTravis());
         TestUtil.ignoreException(() -> {
-            executeGradleTasks("shadow");
+            executeGradleTasks("clean", "shadow");
             neo4jContainer = createEnterpriseDB(true)
                 .withNeo4jConfig("apoc.import.file.enabled", "true");
             neo4jContainer.start();
@@ -47,7 +47,7 @@ public static void afterAll() {
         if (neo4jContainer != null) {
             neo4jContainer.close();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test

diff --git a/src/test/java/apoc/schema/SchemasEnterpriseFeaturesTest.java b/src/test/java/apoc/schema/SchemasEnterpriseFeaturesTest.java
@@ -31,7 +31,7 @@ public class SchemasEnterpriseFeaturesTest {
     @BeforeClass
     public static void beforeAll() {
         assumeFalse(isTravis());
-        executeGradleTasks("shadow");
+        executeGradleTasks("clean", "shadow");
         TestUtil.ignoreException(() -> {
             // We build the project, the artifact will be placed into ./build/libs
             neo4jContainer = createEnterpriseDB(!TestUtil.isTravis());
@@ -47,7 +47,7 @@ public static void afterAll() {
             session.close();
             neo4jContainer.close();
         }
-        // cleanBuild();
+        cleanBuild();
     }
 
     @Test