[aWY2zoX5] Replaced testTerminatePeriodicQuery with testTerminateWith…

…Command (#672)
neo4j · Oct 24, 2024 · 8dc2a91 · 8dc2a91
1 parent 4234bb2
commit 8dc2a91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/core/src/test/java/apoc/periodic/PeriodicTest.java b/core/src/test/java/apoc/periodic/PeriodicTest.java
@@ -279,9 +279,10 @@ public void testSlottedRuntime() {
 
     @Test
     public void testTerminateCommit() {
-        PeriodicTestUtils.testTerminatePeriodicQuery(
+        PeriodicTestUtils.testTerminateWithCommand(
                 db,
-                "CALL apoc.periodic.commit('UNWIND range(0,1000) as id WITH id CREATE (n:Foo {id: id}) WITH n limit 1000 RETURN COUNT(n)', {})");
+                "CALL apoc.periodic.commit('UNWIND range(0,1000) as id WITH id CREATE (n:Foo {id: id}) WITH n limit 1000 RETURN COUNT(n)', {})",
+                "UNWIND range(0,1000) as id WITH id CREATE (n:Foo {id: id}) WITH n limit 1000 RETURN COUNT(n)");
     }
 
     @Test
@@ -350,15 +351,18 @@ private void assertError(Map<String, Long> errors, String expectedPattern, Long
 
     @Test
     public void testTerminateIterate() {
-        PeriodicTestUtils.testTerminatePeriodicQuery(
+        PeriodicTestUtils.testTerminateWithCommand(
                 db,
-                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:1,parallel:true})");
-        PeriodicTestUtils.testTerminatePeriodicQuery(
+                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:1,parallel:true})",
+                "UNWIND range(0,1000) as id RETURN id");
+        PeriodicTestUtils.testTerminateWithCommand(
                 db,
-                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:10,iterateList:true})");
-        PeriodicTestUtils.testTerminatePeriodicQuery(
+                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:10,iterateList:true})",
+                "UNWIND range(0,1000) as id RETURN id");
+        PeriodicTestUtils.testTerminateWithCommand(
                 db,
-                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:10,iterateList:false})");
+                "CALL apoc.periodic.iterate('UNWIND range(0,1000) as id RETURN id', 'WITH $id as id CREATE (:Foo {id: $id})', {batchSize:10,iterateList:false})",
+                "UNWIND range(0,1000) as id RETURN id");
     }
 
     @Test

diff --git a/test-utils/src/main/java/apoc/periodic/PeriodicTestUtils.java b/test-utils/src/main/java/apoc/periodic/PeriodicTestUtils.java
@@ -59,11 +59,6 @@ public static boolean terminateQuery(String pattern, GraphDatabaseAPI db) {
         return numberOfKilledTransactions > 0;
     }
 
-    public static void testTerminatePeriodicQuery(DbmsRule db, String periodicQuery) {
-        killPeriodicQueryAsync(db);
-        checkPeriodicTerminated(db, periodicQuery);
-    }
-
     public static void testTerminateWithCommand(DbmsRule db, String periodicQuery, String iterateQuery) {
         long timeBefore = System.currentTimeMillis();
         TransactionTestUtil.terminateTransactionAsync(db, 10L, iterateQuery);