[kAAv6pCq] Cherry pick test fixes to 4.4 (#3784)

neo4j-contrib · Oct 2, 2023 · 03f19a1 · 03f19a1
1 parent f822db1
commit 03f19a1
Show file tree

Hide file tree

Showing 54 changed files with 1,390 additions and 2,282 deletions.
diff --git a/core-it/src/test/java/apoc/core/it/CollEnterpriseTest.java b/core-it/src/test/java/apoc/core/it/CollEnterpriseTest.java
@@ -30,11 +30,7 @@
 import org.neo4j.driver.Session;
 
 import static apoc.util.TestContainerUtil.createEnterpriseDB;
-import static apoc.util.TestUtil.isRunningInCI;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
 public class CollEnterpriseTest {
 
@@ -43,35 +39,27 @@ public class CollEnterpriseTest {
 
     @BeforeAll
     public static void beforeAll() {
-        assumeFalse(isRunningInCI());
-        TestUtil.ignoreException(() -> {
-            // We build the project, the artifact will be placed into ./build/libs
-            neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI());
-            neo4jContainer.start();
-        }, Exception.class);
-        assumeTrue(neo4jContainer.isRunning());
-        assumeNotNull(neo4jContainer);
-        assumeTrue("Neo4j Instance should be up-and-running", neo4jContainer.isRunning());
+        // We build the project, the artifact will be placed into ./build/libs
+        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI());
+        neo4jContainer.start();
         session = neo4jContainer.getSession();
     }
 
     @AfterAll
     public static void afterAll() {
-        if (neo4jContainer != null && neo4jContainer.isRunning()) {
-            session.close();
-            neo4jContainer.close();
-        }
+        session.close();
+        neo4jContainer.close();
     }
 
     @RepeatedTest(50)
-    public void testMin() throws Exception {
+    public void testMin() {
         assertEquals(1L, session.run("RETURN apoc.coll.min([1,2]) as value").next().get("value").asLong());
         assertEquals(1L, session.run("RETURN apoc.coll.min([1,2,3]) as value").next().get("value").asLong());
         assertEquals(0.5D, session.run("RETURN apoc.coll.min([0.5,1,2.3]) as value").next().get("value").asDouble(), 0.1);
     }
 
     @RepeatedTest(50)
-    public void testMax() throws Exception {
+    public void testMax() {
         assertEquals(3L, session.run("RETURN apoc.coll.max([1,2,3]) as value").next().get("value").asLong());
         assertEquals(2.3D, session.run("RETURN apoc.coll.max([0.5,1,2.3]) as value").next().get("value").asDouble(), 0.1);
     }

diff --git a/core-it/src/test/java/apoc/core/it/CypherEnterpriseTest.java b/core-it/src/test/java/apoc/core/it/CypherEnterpriseTest.java
@@ -1,6 +1,7 @@
 package apoc.core.it;
 
 import apoc.util.Neo4jContainerExtension;
+import apoc.util.TestUtil;
 import org.assertj.core.api.Assertions;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -31,7 +32,7 @@ public class CypherEnterpriseTest {
 
     @BeforeClass
     public static void beforeAll() {
-        neo4jContainer = createEnterpriseDB(List.of(ApocPackage.CORE), true);
+        neo4jContainer = createEnterpriseDB(List.of(ApocPackage.CORE), !TestUtil.isRunningInCI());
         neo4jContainer.start();
         session = neo4jContainer.getSession();
     }

diff --git a/core-it/src/test/java/apoc/core/it/ExportCsvIT.java b/core-it/src/test/java/apoc/core/it/ExportCsvIT.java
@@ -36,9 +36,6 @@
 import static apoc.util.TestUtil.isRunningInCI;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
 /**
  * @author as
@@ -51,25 +48,19 @@ public class ExportCsvIT {
 
     @BeforeClass
     public static void beforeAll() {
-        assumeFalse(isRunningInCI());
-        TestUtil.ignoreException(() -> {
-            neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), true);
-            neo4jContainer.start();
-        }, Exception.class);
-        assumeNotNull(neo4jContainer);
-        assumeTrue("Neo4j Instance should be up-and-running", neo4jContainer.isRunning());
+        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !isRunningInCI());
+        neo4jContainer.start();
         session = neo4jContainer.getSession();
     }
 
     @AfterClass
-    public static void afterAll() throws IOException, InterruptedException {
-        if (neo4jContainer != null && neo4jContainer.isRunning()) {
-            neo4jContainer.close();
-        }
+    public static void afterAll() {
+        session.close();
+        neo4jContainer.close();
     }
 
     @Test
-    public void testExportQueryCsvIssue1188() throws Exception {
+    public void testExportQueryCsvIssue1188() {
         String copyright = "\n" +
                 "(c) 2018 Hovsepian, Albanese, et al. \"\"ASCB(r),\"\" \"\"The American Society for Cell Biology(r),\"\" and \"\"Molecular Biology of the Cell(r)\"\" are registered trademarks of The American Society for Cell Biology.\n" +
                 "2018\n" +

diff --git a/core-it/src/test/java/apoc/core/it/ExportCypherEnterpriseFeaturesTest.java b/core-it/src/test/java/apoc/core/it/ExportCypherEnterpriseFeaturesTest.java
@@ -19,7 +19,6 @@
 package apoc.core.it;
 
 import apoc.util.Neo4jContainerExtension;
-import apoc.util.TestContainerUtil;
 import apoc.util.TestUtil;
 import apoc.util.Util;
 import org.hamcrest.MatcherAssert;
@@ -37,13 +36,9 @@
 import static apoc.export.cypher.ExportCypherTest.ExportCypherResults.*;
 import static apoc.util.MapUtil.map;
 import static apoc.util.TestContainerUtil.*;
-import static apoc.util.TestUtil.isRunningInCI;
 import static apoc.util.TestUtil.readFileToString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
 /**
  * @author as
@@ -56,23 +51,15 @@ public class ExportCypherEnterpriseFeaturesTest {
 
     @BeforeClass
     public static void beforeAll() {
-        assumeFalse(isRunningInCI());
-        TestUtil.ignoreException(() -> {
-            // We build the project, the artifact will be placed into ./build/libs
-            neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI())
-                    .withInitScript("init_neo4j_export_csv.cypher");
-            neo4jContainer.start();
-        }, Exception.class);
-        assumeNotNull(neo4jContainer);
-        assumeTrue("Neo4j Instance should be up-and-running", neo4jContainer.isRunning());
+        neo4jContainer = createEnterpriseDB(List.of(ApocPackage.CORE), !TestUtil.isRunningInCI()).withInitScript("init_neo4j_export_csv.cypher");
+        neo4jContainer.start();
         session = neo4jContainer.getSession();
     }
 
     @AfterClass
     public static void afterAll() {
-        if (neo4jContainer != null && neo4jContainer.isRunning()) {
-            neo4jContainer.close();
-        }
+        session.close();
+        neo4jContainer.close();
     }
 
     private static void beforeTwoLabelsWithOneCompoundConstraintEach() {

diff --git a/core-it/src/test/java/apoc/core/it/GraphRefactoringEnterpriseTest.java b/core-it/src/test/java/apoc/core/it/GraphRefactoringEnterpriseTest.java
@@ -34,12 +34,8 @@
 import static apoc.refactor.GraphRefactoringTest.EXTRACT_QUERY;
 import static apoc.util.TestContainerUtil.createEnterpriseDB;
 import static apoc.util.TestContainerUtil.testCall;
-import static apoc.util.TestUtil.isRunningInCI;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
 public class GraphRefactoringEnterpriseTest {
     private static final String CREATE_REL_FOR_EXTRACT_NODE = "CREATE (:Start)-[r:TO_MOVE {name: 'foobar', surname: 'baz'}]->(:End)";
@@ -49,22 +45,15 @@ public class GraphRefactoringEnterpriseTest {
 
     @BeforeClass
     public static void beforeAll() {
-        assumeFalse(isRunningInCI());
-        TestUtil.ignoreException(() -> {
-            neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), true);
-            neo4jContainer.start();
-        }, Exception.class);
-        assumeNotNull(neo4jContainer);
-        assumeTrue("Neo4j Instance should be up-and-running", neo4jContainer.isRunning());
+        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI());
+        neo4jContainer.start();
         session = neo4jContainer.getSession();
     }
 
     @AfterClass
     public static void afterAll() {
-        if (neo4jContainer != null && neo4jContainer.isRunning()) {
-            session.close();
-            neo4jContainer.close();
-        }
+        session.close();
+        neo4jContainer.close();
     }
 
     @Test

diff --git a/core-it/src/test/java/apoc/core/it/LoadCoreEnterpriseTest.java b/core-it/src/test/java/apoc/core/it/LoadCoreEnterpriseTest.java
@@ -21,6 +21,7 @@
 import apoc.util.CompressionAlgo;
 import apoc.util.Neo4jContainerExtension;
 import apoc.util.TestContainerUtil;
+import apoc.util.TestUtil;
 import org.apache.commons.io.FileUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
@@ -65,7 +66,7 @@ public class LoadCoreEnterpriseTest {
     }
 
     private static Neo4jContainerExtension createNeo4jWithMaxCompressionRatio(int ratio) {
-        Neo4jContainerExtension container = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), true)
+        Neo4jContainerExtension container = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI())
                 .withNeo4jConfig("dbms.memory.heap.max_size", "1GB")
                 .withEnv(APOC_MAX_DECOMPRESSION_RATIO, String.valueOf(ratio));
         container.start();

diff --git a/core-it/src/test/java/apoc/core/it/MetaEnterpriseFeaturesTest.java b/core-it/src/test/java/apoc/core/it/MetaEnterpriseFeaturesTest.java
@@ -34,12 +34,8 @@
 
 import static apoc.util.TestContainerUtil.createEnterpriseDB;
 import static apoc.util.TestContainerUtil.testResult;
-import static apoc.util.TestUtil.isRunningInCI;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
 /**
  * @author as
@@ -52,21 +48,16 @@ public class MetaEnterpriseFeaturesTest {
 
     @BeforeClass
     public static void beforeAll() {
-        assumeFalse(isRunningInCI());
         // We build the project, the artifact will be placed into ./build/libs
         neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI());
         neo4jContainer.start();
-        assumeNotNull(neo4jContainer);
-        assumeTrue("Neo4j Instance should be up-and-running", neo4jContainer.isRunning());
         session = neo4jContainer.getSession();
     }
 
     @AfterClass
     public static void afterAll() {
-        if (neo4jContainer != null && neo4jContainer.isRunning()) {
-            session.close();
-            neo4jContainer.close();
-        }
+        session.close();
+        neo4jContainer.close();
     }
 
     public static boolean hasRecordMatching(List<Map<String,Object>> records, Predicate<Map<String,Object>> predicate) {

diff --git a/core-it/src/test/java/apoc/core/it/SchemasEnterpriseFeaturesTest.java b/core-it/src/test/java/apoc/core/it/SchemasEnterpriseFeaturesTest.java
@@ -20,6 +20,7 @@
 
 import apoc.util.Neo4jContainerExtension;
 import apoc.util.TestContainerUtil;
+import apoc.util.TestUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.Assertions;
 import org.junit.AfterClass;
@@ -55,7 +56,7 @@ public class SchemasEnterpriseFeaturesTest {
 
     @BeforeClass
     public static void beforeAll() {
-        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), true);
+        neo4jContainer = createEnterpriseDB(List.of(TestContainerUtil.ApocPackage.CORE), !TestUtil.isRunningInCI());
         neo4jContainer.start();
         session = neo4jContainer.getSession();
     }