[NOID] Cleans up resources after the tests

neo4j · Sep 15, 2023 · ef5ca0e · ef5ca0e
1 parent dc54bdf
commit ef5ca0e
Show file tree

Hide file tree

Showing 51 changed files with 288 additions and 7 deletions.
diff --git a/core/src/test/java/apoc/export/BigGraphTest.java b/core/src/test/java/apoc/export/BigGraphTest.java
@@ -30,6 +30,7 @@
 import apoc.refactor.rename.Rename;
 import apoc.util.TestUtil;
 import apoc.util.Util;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -75,6 +76,11 @@ public static void setUp() {
         IntStream.range(0, 10000).forEach(__-> db.executeTransactionally(query));
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testTerminateExportCsv() {
         checkTerminationGuard(db, "CALL apoc.export.csv.all('testTerminate.csv',{bulkImport: true})");

diff --git a/core/src/test/java/apoc/export/ExportCoreSecurityTest.java b/core/src/test/java/apoc/export/ExportCoreSecurityTest.java
@@ -27,6 +27,7 @@
 import apoc.util.TestUtil;
 import apoc.util.Util;
 import com.nimbusds.jose.util.Pair;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -91,6 +92,11 @@ public static void setUp() {
         TestUtil.registerProcedure(db, ExportCSV.class, ExportJson.class, ExportGraphML.class, ExportCypher.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     public static void setFileExport(boolean allowed) {
         ApocConfig.apocConfig().setProperty(ApocConfig.APOC_EXPORT_FILE_ENABLED, allowed);
     }

diff --git a/core/src/test/java/apoc/export/ImportAndLoadCoreSecurityTest.java b/core/src/test/java/apoc/export/ImportAndLoadCoreSecurityTest.java
@@ -31,6 +31,7 @@
 import inet.ipaddr.IPAddressString;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.assertj.core.api.Assertions;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -149,7 +150,11 @@ public static void setUp() {
                 // load procedures (Xml contains both `apoc.load.xml` and `apoc.import.xml` procedures)
                 LoadJson.class, LoadArrow.class);
     }
-
+
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
 
     @Test
     public void testIllegalFSAccessWithDifferentApocConfs() {

diff --git a/core/src/test/java/apoc/export/arrow/ArrowTest.java b/core/src/test/java/apoc/export/arrow/ArrowTest.java
@@ -24,6 +24,7 @@
 import apoc.util.JsonUtil;
 import apoc.util.TestUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -116,6 +117,11 @@ public static void beforeClass() {
         TestUtil.registerProcedure(db, ExportArrow.class, LoadArrow.class, Graphs.class, Meta.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     @Before
     public void before() {
         apocConfig().setProperty(APOC_IMPORT_FILE_ENABLED, true);

diff --git a/core/src/test/java/apoc/export/arrow/ExportArrowSecurityTest.java b/core/src/test/java/apoc/export/arrow/ExportArrowSecurityTest.java
@@ -24,6 +24,7 @@
 import apoc.util.TestUtil;
 import apoc.util.Util;
 import com.nimbusds.jose.util.Pair;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -93,6 +94,11 @@ public static void setUp() {
         TestUtil.registerProcedure(db, ExportArrow.class, Meta.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     private static Collection<Object[]> getParameterData(List<Pair<String, Consumer<Map>>> fileAndErrors) {
         return ExportCoreSecurityTest.getParameterData(fileAndErrors, EXPORT_PROCEDURES, APOC_EXPORT_PROCEDURE_NAME);
     }

diff --git a/core/src/test/java/apoc/export/csv/ExportCsvNeo4jAdminTest.java b/core/src/test/java/apoc/export/csv/ExportCsvNeo4jAdminTest.java
@@ -25,6 +25,7 @@
 import apoc.util.Util;
 import apoc.util.collection.Iterators;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -115,6 +116,11 @@ public void before() {
         db.executeTransactionally("CREATE (a:Types {date: date('2018-10-30'), localDateTime: localdatetime('20181030T19:32:24'), dateTime: datetime('2018-10-30T12:50:35.556+0100'), localtime: localtime('12:50:35.556'), duration: duration('P5M1DT12H'), time: time('125035.556+0100'), born_2D: point({ x: 2.3, y: 4.5 }), born_3D:point({ longitude: 56.7, latitude: 12.78, height: 100 })})");
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testCypherExportCsvForAdminNeo4jImportWithCompressionNone() {
         String fileBaseName = "query_nodes_no_compress_and_Ext";

diff --git a/core/src/test/java/apoc/export/csv/ExportCsvTest.java b/core/src/test/java/apoc/export/csv/ExportCsvTest.java
@@ -27,6 +27,7 @@
 import apoc.util.TestUtil;
 import apoc.util.Util;
 import apoc.util.collection.Iterators;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -158,6 +159,11 @@ public static void setUp() {
         db.executeTransactionally("CREATE (f:Address1:Address {name:'Andrea', city: 'Milano', street:'Via Garibaldi, 7'})-[:NEXT_DELIVERY]->(a:Address {name: 'Bar Sport'}), (b:Address {street: 'via Benni'})");
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     private String readFile(String fileName) {
         return readFile(fileName, UTF_8, CompressionAlgo.NONE);
     }

diff --git a/core/src/test/java/apoc/export/csv/ImportCsvLdbcTest.java b/core/src/test/java/apoc/export/csv/ImportCsvLdbcTest.java
@@ -20,6 +20,7 @@
 
 import apoc.csv.CsvTestUtil;
 import apoc.util.TestUtil;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -146,6 +147,11 @@ public void setUp() throws Exception {
         apocConfig().setProperty(APOC_EXPORT_FILE_ENABLED, true);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testLdbc() {
         final List<Map<String, Object>> nodes = new ArrayList<>();

diff --git a/core/src/test/java/apoc/export/csv/ImportCsvTest.java b/core/src/test/java/apoc/export/csv/ImportCsvTest.java
@@ -22,6 +22,7 @@
 import apoc.util.CompressionAlgo;
 import apoc.util.TestUtil;
 import org.apache.commons.io.FileUtils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -254,6 +255,11 @@ public void setUp() throws IOException {
         apocConfig().setProperty(APOC_IMPORT_FILE_ENABLED, true);
         apocConfig().setProperty(APOC_EXPORT_FILE_ENABLED, true);
     }
+
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
 
     @Test
     public void testImportCsvLargeFile() {

diff --git a/core/src/test/java/apoc/export/cypher/ExportCypherMultiRelTest.java b/core/src/test/java/apoc/export/cypher/ExportCypherMultiRelTest.java
@@ -21,6 +21,7 @@
 import apoc.cypher.Cypher;
 import apoc.util.TestUtil;
 import apoc.util.collection.Iterators;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -80,7 +81,12 @@ public void setUp() {
                 "(pers)-[:IS_TEAM_MEMBER_OF {name: 'eee'}]->(:Team {name: 'two'})");
 
     }
-
+
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void updateAllOptimizationNone() {
         String expectedCypherStatement = NODES_MULTI_RELS + SCHEMA_WITH_UNIQUE_IMPORT_ID + RELS_MULTI_RELS + CLEANUP_SMALL_BATCH;

diff --git a/core/src/test/java/apoc/export/cypher/ExportCypherTest.java b/core/src/test/java/apoc/export/cypher/ExportCypherTest.java
@@ -24,6 +24,7 @@
 import apoc.util.MapUtil;
 import apoc.util.TestUtil;
 import apoc.util.Util;
+import org.junit.After;
 import org.junit.Assert;
 
 import java.util.ArrayList;
@@ -105,6 +106,11 @@ public void setUp() {
         ExportCypherTestUtils.setUp(db, testName);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testRoundTripCypherExportAll() {
         final String cypherStatements = Util.readResourceFile("exportAll.cypher");

diff --git a/core/src/test/java/apoc/export/graphml/ExportGraphMLTest.java b/core/src/test/java/apoc/export/graphml/ExportGraphMLTest.java
@@ -27,6 +27,7 @@
 import junit.framework.TestCase;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -109,6 +110,11 @@ public void setUp() {
         setUpGraphMl(db, testName);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testImportGraphML() throws Exception {
         db.executeTransactionally("MATCH (n) DETACH DELETE n");

diff --git a/core/src/test/java/apoc/export/json/ExportJsonTest.java b/core/src/test/java/apoc/export/json/ExportJsonTest.java
@@ -24,6 +24,7 @@
 import apoc.util.FileTestUtil;
 import apoc.util.TestUtil;
 import apoc.util.Util;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -99,6 +100,11 @@ public void setup() {
                         """);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testExportAllJson() {
         String filename = "all.json";

diff --git a/core/src/test/java/apoc/export/json/ImportJsonTest.java b/core/src/test/java/apoc/export/json/ImportJsonTest.java
@@ -28,6 +28,7 @@
 import junit.framework.TestCase;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import apoc.util.Utils;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -88,7 +89,12 @@ public void setUp() {
         TestUtil.registerProcedure(db, ImportJson.class, Schemas.class, Utils.class);
         apocConfig().setProperty(APOC_IMPORT_FILE_ENABLED, true);
     }
-
+
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void shouldImportAllJsonWithoutImportId() {
         shouldImportAllCommon(map("cleanup", true), 8, 0L);

diff --git a/core/src/test/java/apoc/graph/GraphsTest.java b/core/src/test/java/apoc/graph/GraphsTest.java
@@ -25,6 +25,7 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -93,6 +94,11 @@ public void setUp() {
                 });
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testFromData() {
         TestUtil.testCall(db,"MATCH (n)-[r]->(m) CALL apoc.graph.fromData([n,m],[r],'test',{answer:42}) YIELD graph RETURN *",

diff --git a/core/src/test/java/apoc/hashing/FingerprintingTest.java b/core/src/test/java/apoc/hashing/FingerprintingTest.java
@@ -23,6 +23,7 @@
 import apoc.util.TestUtil;
 import apoc.util.Util;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -55,6 +56,11 @@ public void setup() {
         TestUtil.registerProcedure(db, Fingerprinting.class, Graphs.class, Coll.class);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void fingerprintScalars() {
 

diff --git a/core/src/test/java/apoc/help/HelpTest.java b/core/src/test/java/apoc/help/HelpTest.java
@@ -23,6 +23,7 @@
 import apoc.create.Create;
 import apoc.diff.Diff;
 import apoc.util.TestUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -48,6 +49,11 @@ public void setUp() {
         TestUtil.registerProcedure(db, Help.class, BitwiseOperations.class, Coll.class, Diff.class, Create.class);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void info() {
         TestUtil.testCall(db,"CALL apoc.help($text)",map("text","bitwise"), (row) -> {

diff --git a/core/src/test/java/apoc/index/SchemaIndexTest.java b/core/src/test/java/apoc/index/SchemaIndexTest.java
@@ -19,6 +19,7 @@
 package apoc.index;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -108,6 +109,11 @@ public static void setUp() {
         }
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testDistinctPropertiesOnFirstIndex() {
         testCall(db,"CALL apoc.schema.properties.distinct($label, $key)",

diff --git a/core/src/test/java/apoc/label/LabelTest.java b/core/src/test/java/apoc/label/LabelTest.java
@@ -19,6 +19,7 @@
 package apoc.label;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -38,6 +39,11 @@ public static void setUp() {
         TestUtil.registerProcedure(db, Label.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testVerifyNodeLabelExistence() {
 

diff --git a/core/src/test/java/apoc/load/LoadJsonTest.java b/core/src/test/java/apoc/load/LoadJsonTest.java
@@ -105,6 +105,7 @@ public static void stopServer() {
     @After
     public void cleanup() {
         server.stop(0);
+        db.shutdown();
     }
 
     @Test public void testLoadJson() {