Fix Test Failures

neo4j-contrib · Apr 17, 2019 · 3d0853f · 3d0853f
1 parent b656af1
commit 3d0853f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/main/java/apoc/periodic/Periodic.java b/src/main/java/apoc/periodic/Periodic.java
@@ -283,7 +283,7 @@ static String slottedRuntime(String cypherIterate) {
         if (RUNTIME_PATTERN.matcher(cypherIterate).find()) {
             return cypherIterate;
         }
-        Matcher matcher = CYPHER_PREFIX_PATTERN.matcher(cypherIterate.substring(0, 15));
+        Matcher matcher = CYPHER_PREFIX_PATTERN.matcher(cypherIterate.substring(0, Math.min(15, cypherIterate.length())));
         return matcher.find() ? CYPHER_PREFIX_PATTERN.matcher(cypherIterate).replaceFirst(CYPHER_RUNTIME_SLOTTED) : CYPHER_RUNTIME_SLOTTED + cypherIterate;
     }
 

diff --git a/src/test/java/apoc/periodic/PeriodicTest.java b/src/test/java/apoc/periodic/PeriodicTest.java
@@ -80,7 +80,7 @@ public void testSlottedRuntime() throws Exception {
     }
     @Test
     public void testTerminateCommit() throws Exception {
-        testTerminatePeriodicQuery("CALL apoc.periodic.commit('UNWIND range(0,1000) as id WITH id CREATE (:Foo {id: id}) limit 1000', {})");
+        testTerminatePeriodicQuery("CALL apoc.periodic.commit('UNWIND range(0,10000) as id WITH id LIMIT 10000 CREATE (:Foo {id: id})', {})");
     }
 
     @Test(expected = QueryExecutionException.class)
@@ -149,12 +149,12 @@ public void testTerminatePeriodicQuery(String periodicQuery) {
             "return killedId";
     public void killPeriodicQueryAsync() {
         new Thread(() -> {
-            int retries = 10;
+            int retries = 100;
             try {
                 while (retries-- > 0 && !db.execute(KILL_PERIODIC_QUERY).hasNext()) {
-                    Thread.sleep(10);
+                    Thread.sleep(1);
                 }
-            } catch (InterruptedException e) {
+            } catch (InterruptedException| DatabaseShutdownException e) {
                 // ignore
             }
         }).start();

diff --git a/src/test/java/apoc/util/TestUtil.java b/src/test/java/apoc/util/TestUtil.java
@@ -142,7 +142,11 @@ public static <T> T assertDuration(Matcher<? super Long> matcher, Supplier<T> fu
     }
 
     public static void assumeTravis() {
-        assumeFalse("we're running on travis, so skipping","true".equals(System.getenv("TRAVIS")));
+        assumeFalse("we're running on travis, so skipping", isTravis());
+    }
+
+    public static boolean isTravis() {
+        return "true".equals(System.getenv("TRAVIS"));
     }
 
     public static GraphDatabaseBuilder apocGraphDatabaseBuilder() {