[NOID] Cleans up resources after the tests

neo4j-contrib · Aug 8, 2023 · a98ff43 · a98ff43
1 parent 289b6fc
commit a98ff43
Show file tree

Hide file tree

Showing 161 changed files with 1,428 additions and 994 deletions.
diff --git a/core-it/src/test/java/apoc/core/it/ExportCsvS3Test.java b/core-it/src/test/java/apoc/core/it/ExportCsvS3Test.java
@@ -22,6 +22,7 @@
 import apoc.graph.Graphs;
 import apoc.util.TestUtil;
 import apoc.util.s3.S3BaseTest;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -52,6 +53,11 @@ public static void setUp() throws Exception{
         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 static final String EXPECTED_QUERY_NODES = String.format("\"u\"%n" +
             "\"{\"\"id\"\":0,\"\"labels\"\":[\"\"User\"\",\"\"User1\"\"],\"\"properties\"\":{\"\"name\"\":\"\"foo\"\",\"\"male\"\":true,\"\"age\"\":42,\"\"kids\"\":[\"\"a\"\",\"\"b\"\",\"\"c\"\"]}}\"%n" +
             "\"{\"\"id\"\":1,\"\"labels\"\":[\"\"User\"\"],\"\"properties\"\":{\"\"name\"\":\"\"bar\"\",\"\"age\"\":42}}\"%n" +

diff --git a/core-it/src/test/java/apoc/core/it/ExportCypherS3Test.java b/core-it/src/test/java/apoc/core/it/ExportCypherS3Test.java
@@ -22,6 +22,7 @@
 import apoc.util.TestUtil;
 import apoc.util.s3.S3BaseTest;
 import apoc.util.s3.S3TestUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -51,6 +52,11 @@ public void setUp() {
       ExportCypherTestUtils.setUp( db, testName);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     // -- Whole file test -- //
     @Test
     public void testExportAllCypherDefault() {

diff --git a/core-it/src/test/java/apoc/core/it/ExportGraphMLS3Test.java b/core-it/src/test/java/apoc/core/it/ExportGraphMLS3Test.java
@@ -20,6 +20,7 @@
 
 import apoc.util.TestUtil;
 import apoc.util.s3.S3BaseTest;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -55,6 +56,11 @@ public void setUp() throws Exception {
         setUpGraphMl(db, testName);
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testExportAllGraphML() throws Exception {
         String fileName = "all.graphml";

diff --git a/core-it/src/test/java/apoc/core/it/ExportJsonS3Test.java b/core-it/src/test/java/apoc/core/it/ExportJsonS3Test.java
@@ -23,6 +23,7 @@
 import apoc.graph.Graphs;
 import apoc.util.TestUtil;
 import apoc.util.s3.S3BaseTest;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -51,6 +52,11 @@ public void setUp() throws Exception {
         db.executeTransactionally("CREATE (f:User {name:'Adam',age:42,male:true,kids:['Sam','Anna','Grace'], born:localdatetime('2015185T19:32:24'), place:point({latitude: 13.1, longitude: 33.46789})})-[:KNOWS {since: 1993, bffSince: duration('P5M1.5D')}]->(b:User {name:'Jim',age:42}),(c:User {age:12})");
     }
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testExportAllJson() throws Exception {
         String filename = "all.json";

diff --git a/core/src/test/java/apoc/agg/CollAggregationTest.java b/core/src/test/java/apoc/agg/CollAggregationTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -39,6 +40,11 @@ public static void setUp() {
         TestUtil.registerProcedure(db, CollAggregation.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testNth() throws Exception {
         testCall(db, "UNWIND RANGE(0,10) as value RETURN apoc.agg.nth(value, 0) as first, apoc.agg.nth(value, 3) as third,apoc.agg.nth(value, -1) as last",

diff --git a/core/src/test/java/apoc/agg/GraphAggregationTest.java b/core/src/test/java/apoc/agg/GraphAggregationTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -48,6 +49,11 @@ public class GraphAggregationTest {
         db.executeTransactionally("CREATE (a:A {id:'a'})-[:AB {id:'ab'}]->(b:B {id:'b'})-[:BC {id:'bc'}]->(c:C {id:'c'}),(a)-[:AC {id:'ac'}]->(c)");
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testGraph() throws Exception {
         Map<String, Entity> pcs = db.executeTransactionally("MATCH (n) RETURN n.id as id, n UNION ALL MATCH ()-[n]->() RETURN n.id as id, n", Collections.emptyMap(),

diff --git a/core/src/test/java/apoc/agg/MedianTest.java b/core/src/test/java/apoc/agg/MedianTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -37,6 +38,11 @@ public class MedianTest {
         TestUtil.registerProcedure(db, Median.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testMedian() throws Exception {
         testCall(db, "UNWIND [] as value RETURN apoc.agg.median(value) as p",

diff --git a/core/src/test/java/apoc/agg/PercentilesTest.java b/core/src/test/java/apoc/agg/PercentilesTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -41,6 +42,11 @@ public class PercentilesTest {
         TestUtil.registerProcedure(db, Percentiles.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testPercentiles() throws Exception {
         testCall(db, "UNWIND [] as value RETURN apoc.agg.percentiles(value) as p",

diff --git a/core/src/test/java/apoc/agg/ProductAggregationTest.java b/core/src/test/java/apoc/agg/ProductAggregationTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -37,6 +38,11 @@ public class ProductAggregationTest {
         TestUtil.registerProcedure(db, Product.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testProduct() throws Exception {
         testCall(db, "UNWIND [] as value RETURN apoc.agg.product(value) as p",

diff --git a/core/src/test/java/apoc/agg/StatisticsTest.java b/core/src/test/java/apoc/agg/StatisticsTest.java
@@ -19,6 +19,7 @@
 package apoc.agg;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -41,6 +42,11 @@ public static void setUp() throws Exception {
         TestUtil.registerProcedure(db, Statistics.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testStatistics() throws Exception {
         testCall(db, "UNWIND [] as value RETURN apoc.agg.statistics(value) as p",

diff --git a/core/src/test/java/apoc/algo/CoverTest.java b/core/src/test/java/apoc/algo/CoverTest.java
@@ -19,6 +19,7 @@
 package apoc.algo;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -42,6 +43,11 @@ public static void setUp() throws Exception {
         db.executeTransactionally("CREATE (a)-[:X]->(b)-[:X]->(c)-[:X]->(d)");
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     @Test
     public void testCover() throws Exception {
         TestUtil.testCall(db,

diff --git a/core/src/test/java/apoc/algo/PathFindingTest.java b/core/src/test/java/apoc/algo/PathFindingTest.java
@@ -19,6 +19,7 @@
 package apoc.algo;
 
 import apoc.util.TestUtil;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -73,6 +74,11 @@ public void setUp() throws Exception {
    		TestUtil.registerProcedure(db, PathFinding.class);
    	}
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
     @Test
     public void testAStar() {
         db.executeTransactionally(SETUP_GEO);

diff --git a/core/src/test/java/apoc/atomic/AtomicTest.java b/core/src/test/java/apoc/atomic/AtomicTest.java
@@ -22,6 +22,7 @@
 import org.apache.commons.lang.ArrayUtils;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -54,6 +55,11 @@ public class AtomicTest {
 		TestUtil.registerProcedure(db, Atomic.class);
 	}
 
+    @After
+    public void teardown() {
+        db.shutdown();
+    }
+
 	@Test
 	public void testAddAndSubInteger(){
 		db.executeTransactionally("CREATE (p:Person {name:'Tom'})");

diff --git a/core/src/test/java/apoc/bitwise/BitwiseOperationsTest.java b/core/src/test/java/apoc/bitwise/BitwiseOperationsTest.java
@@ -19,6 +19,7 @@
 package apoc.bitwise;
 
 import apoc.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -45,6 +46,11 @@ public static void setUp() throws Exception {
         TestUtil.registerProcedure(db, BitwiseOperations.class);
     }
 
+    @AfterClass
+    public static void teardown() {
+       db.shutdown();
+    }
+
     public void testOperation(String op, long expected) {
         Map<String, Object> params = map("a", a, "op", op, "b", b);
         testCall(db, BITWISE_CALL, params,