[NOID] changed apocConfig test handling

core/src/test/java/apoc/trigger/TriggerNewProceduresTest.java

@@ -27,6 +27,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
@@ -42,14 +43,12 @@
 import org.neo4j.test.TestDatabaseManagementServiceBuilder;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static apoc.ApocConfig.SUN_JAVA_COMMAND;
 import static apoc.trigger.TriggerNewProcedures.*;
 import static apoc.trigger.TriggerTestUtil.TIMEOUT;
 import static apoc.trigger.TriggerTestUtil.TRIGGER_DEFAULT_REFRESH;
@@ -75,18 +74,14 @@ public class TriggerNewProceduresTest {
     private static GraphDatabaseService db;
     private static DatabaseManagementService databaseManagementService;
 
-    @BeforeClass
-    public static void beforeClass() throws Exception {
-        // we cannot set via ApocConfig.apocConfig().setProperty("apoc.trigger.refresh", "2000") in `setUp`, because is too late
-        final File conf = new File(directory, "apoc.conf");
-        try (FileWriter writer = new FileWriter(conf)) {
-            writer.write(String.join("\n",
-                    "apoc.trigger.refresh=" + TRIGGER_DEFAULT_REFRESH,
-                    "apoc.trigger.enabled=true"));
-        }
+    // we cannot set via ApocConfig.apocConfig().setProperty("apoc.trigger.refresh", "2000") in `setUp`, because is too late
+    @ClassRule
+    public static final ProvideSystemProperty systemPropertyRule =
+            new ProvideSystemProperty("apoc.trigger.refresh", String.valueOf(TRIGGER_DEFAULT_REFRESH))
+                    .and("apoc.trigger.enabled", "true");
 
-        System.setProperty(SUN_JAVA_COMMAND, "config-dir=" + directory.getAbsolutePath());
-        
+    @BeforeClass
+    public static void beforeClass() {
         databaseManagementService = new TestDatabaseManagementServiceBuilder(storeDir.getRoot().toPath())
                 .setConfig(procedure_unrestricted, List.of("apoc*"))
                 .build();

core/src/test/java/apoc/trigger/TriggerRestartTest.java

@@ -22,21 +22,20 @@
 import apoc.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.test.TestDatabaseManagementServiceBuilder;
 
-import java.io.File;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
-import static apoc.ApocConfig.SUN_JAVA_COMMAND;
 import static apoc.trigger.TriggerTestUtil.TRIGGER_DEFAULT_REFRESH;
 import static apoc.trigger.TriggerTestUtil.awaitTriggerDiscovered;
 import static apoc.util.TestUtil.waitDbsAvailable;
@@ -51,14 +50,13 @@ public class TriggerRestartTest {
     private GraphDatabaseService sysDb;
     private DatabaseManagementService databaseManagementService;
 
+    // we cannot set via apocConfig().setProperty(apoc.trigger.refresh, ...) in `@Before`, because is too late
+    @ClassRule
+    public static final ProvideSystemProperty systemPropertyRule =
+            new ProvideSystemProperty("apoc.trigger.refresh", String.valueOf(TRIGGER_DEFAULT_REFRESH));
+
     @Before
     public void setUp() throws IOException {
-        final File conf = store_dir.newFile("apoc.conf");
-        try (FileWriter writer = new FileWriter(conf)) {
-            writer.write("apoc.trigger.refresh=" + TRIGGER_DEFAULT_REFRESH);
-        }
-        System.setProperty(SUN_JAVA_COMMAND, "config-dir=" + store_dir.getRoot().getAbsolutePath());
-
         databaseManagementService = new TestDatabaseManagementServiceBuilder(store_dir.getRoot().toPath()).build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);

full/src/test/java/apoc/config/ConfigTest.java

@@ -67,7 +67,7 @@ public class ConfigTest {
     );
 
     @Rule
-    public final ProvideSystemProperty systemPropertyRule 
+    public final ProvideSystemProperty systemPropertyRule
             = new ProvideSystemProperty("foo", "bar")
             .and("apoc.import.enabled", "true")
             .and("apoc.trigger.refresh", "2000")

full/src/test/java/apoc/trigger/TriggerNewProceduresExtendedTest.java

@@ -26,6 +26,7 @@
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
@@ -36,14 +37,12 @@
 import org.neo4j.test.TestDatabaseManagementServiceBuilder;
 
 import java.io.File;
-import java.io.FileWriter;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import static apoc.ApocConfig.SUN_JAVA_COMMAND;
 import static apoc.trigger.TriggerTestUtil.TIMEOUT;
 import static apoc.trigger.TriggerTestUtil.TRIGGER_DEFAULT_REFRESH;
 import static apoc.trigger.TriggerTestUtil.awaitTriggerDiscovered;
@@ -66,17 +65,14 @@ public class TriggerNewProceduresExtendedTest {
     private static GraphDatabaseService db;
     private static DatabaseManagementService databaseManagementService;
 
+    // we cannot set via ApocConfig.apocConfig().setProperty("apoc.trigger.refresh", "2000") in `@Before`, because is too late
+    @ClassRule
+    public static final ProvideSystemProperty systemPropertyRule =
+            new ProvideSystemProperty("apoc.trigger.refresh", String.valueOf(TRIGGER_DEFAULT_REFRESH))
+                    .and("apoc.trigger.enabled", "true");
+
     @BeforeClass
     public static void beforeClass() throws Exception {
-        // we cannot set via ApocConfig.apocConfig().setProperty("apoc.trigger.refresh", "2000") in `setUp`, because is too late
-        final File conf = new File(directory, "apoc.conf");
-        try (FileWriter writer = new FileWriter(conf)) {
-            writer.write(String.join("\n",
-                    "apoc.trigger.refresh=" + TRIGGER_DEFAULT_REFRESH,
-                    "apoc.trigger.enabled=true"));
-        }
-        System.setProperty(SUN_JAVA_COMMAND, "config-dir=" + directory.getAbsolutePath());
-
         databaseManagementService = new TestDatabaseManagementServiceBuilder(storeDir.getRoot().toPath())
                 .setConfig(procedure_unrestricted, List.of("apoc*"))
                 .build();

full/src/test/java/apoc/uuid/UUIDNewProceduresTest.java

@@ -24,6 +24,7 @@
 import apoc.util.Util;
 import org.hamcrest.Matchers;
 import org.junit.*;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
@@ -32,6 +33,7 @@
 import org.neo4j.graphdb.QueryExecutionException;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.graphdb.schema.ConstraintDefinition;
+import org.neo4j.test.TestDatabaseManagementServiceBuilder;
 
 import java.io.File;
 import java.util.List;
@@ -54,6 +56,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import static org.junit.jupiter.api.Assertions.fail;
+import static org.neo4j.configuration.GraphDatabaseSettings.procedure_unrestricted;
 import static org.neo4j.internal.helpers.collection.MapUtil.map;
 import static org.neo4j.test.assertion.Assert.assertEventually;
 
@@ -71,9 +74,15 @@ public class UUIDNewProceduresTest {
     private static GraphDatabaseService db;
     private static DatabaseManagementService databaseManagementService;
 
+    // we cannot set via apocConfig().setProperty(apoc.uuid.refresh, ...) in `@Before`, because is too late
+    @ClassRule
+    public static final ProvideSystemProperty systemPropertyRule = setUuidApocConfs();
+
     @BeforeClass
     public static void beforeClass() throws Exception {
-        databaseManagementService = startDbWithUuidApocConfs(storeDir);
+        databaseManagementService = new TestDatabaseManagementServiceBuilder(storeDir.getRoot().toPath())
+                .setConfig(procedure_unrestricted, List.of("apoc*"))
+                .build();
 
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);

full/src/test/java/apoc/uuid/UUIDRestartTest.java

@@ -22,19 +22,23 @@
 import apoc.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.graphdb.GraphDatabaseService;
 import org.neo4j.test.TestDatabaseManagementServiceBuilder;
 
 import java.io.IOException;
+import java.util.List;
 
 import static apoc.util.TestUtil.waitDbsAvailable;
 import static apoc.uuid.UUIDTestUtils.*;
 import static org.neo4j.configuration.GraphDatabaseSettings.DEFAULT_DATABASE_NAME;
 import static org.neo4j.configuration.GraphDatabaseSettings.SYSTEM_DATABASE_NAME;
+import static org.neo4j.configuration.GraphDatabaseSettings.procedure_unrestricted;
 
 public class UUIDRestartTest {
 
@@ -45,9 +49,15 @@ public class UUIDRestartTest {
     private GraphDatabaseService sysDb;
     private DatabaseManagementService databaseManagementService;
 
+    // we cannot set via apocConfig().setProperty(apoc.uuid.refresh, ...) in `@Before`, because is too late
+    @ClassRule
+    public static final ProvideSystemProperty systemPropertyRule = setUuidApocConfs();
+
     @Before
     public void setUp() throws IOException {
-        databaseManagementService = startDbWithUuidApocConfs(storeDir);
+        databaseManagementService = new TestDatabaseManagementServiceBuilder(storeDir.getRoot().toPath())
+                .setConfig(procedure_unrestricted, List.of("apoc*"))
+                .build();
 
         db = databaseManagementService.database(DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(SYSTEM_DATABASE_NAME);

full/src/test/java/apoc/uuid/UUIDTestUtils.java

@@ -19,15 +19,12 @@
 package apoc.uuid;
 
 import org.hamcrest.Matchers;
-import org.junit.rules.TemporaryFolder;
-import org.neo4j.dbms.api.DatabaseManagementService;
+import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.neo4j.graphdb.GraphDatabaseService;
 
-import java.io.IOException;
 import java.util.Map;
 
 import static apoc.ApocConfig.APOC_UUID_ENABLED;
-import static apoc.util.DbmsTestUtil.startDbWithApocConfs;
 import static apoc.util.SystemDbTestUtil.PROCEDURE_DEFAULT_REFRESH;
 import static apoc.util.SystemDbTestUtil.TIMEOUT;
 import static apoc.util.TestUtil.testCallEventually;
@@ -39,10 +36,9 @@
 import static org.junit.Assert.assertEquals;
 
 public class UUIDTestUtils {
-    public static DatabaseManagementService startDbWithUuidApocConfs(TemporaryFolder storeDir) throws IOException {
-        return startDbWithApocConfs(storeDir,
-                APOC_UUID_REFRESH + "=" + PROCEDURE_DEFAULT_REFRESH,
-                APOC_UUID_ENABLED +  "=true");
+    public static ProvideSystemProperty setUuidApocConfs() {
+        return new ProvideSystemProperty(APOC_UUID_REFRESH, String.valueOf(PROCEDURE_DEFAULT_REFRESH))
+                .and(APOC_UUID_ENABLED, "true");
     }
 
     public static void awaitUuidDiscovered(GraphDatabaseService db, String label) {