Merge remote-tracking branch 'upstream/3.1' into 3.2

neo4j · May 24, 2017 · a7ff98f · a7ff98f
1 parent 5f4da5f
commit a7ff98f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ernal/cypher/acceptance/TestFunction.java → ...ernal/cypher/acceptance/TestFunction.java b/...ernal/cypher/acceptance/TestFunction.java → ...ernal/cypher/acceptance/TestFunction.java
diff --git a/.../test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala b/.../test/scala/org/neo4j/internal/cypher/acceptance/PatternComprehensionAcceptanceTest.scala
@@ -56,7 +56,7 @@ class PatternComprehensionAcceptanceTest extends ExecutionEngineFunSuite with Ne
         | ][0..5] AS related
       """.stripMargin
 
-    val result = executeWithCostPlannerOnly(query)
+    val result = executeWithCostPlannerAndInterpretedRuntimeOnly(query)
     result.toList should equal(
       List(Map("related" -> List(Map("tagged" -> Vector(Map("owner" -> Map("name" -> "Michael Hunger"))))))))
   }
@@ -72,7 +72,7 @@ class PatternComprehensionAcceptanceTest extends ExecutionEngineFunSuite with Ne
                |WITH collect(t) AS tweets
                |RETURN test.toSet([ tweet IN tweets | [ (tweet)<-[:POSTED]-(user) | user] ]) AS users""".stripMargin
 
-    val result = executeWithCostPlannerOnly(query)
+    val result = executeWithCostPlannerAndInterpretedRuntimeOnly(query)
     result.toList should equal(List(Map("users" -> List(List(n2)))))
   }
 
@@ -88,7 +88,7 @@ class PatternComprehensionAcceptanceTest extends ExecutionEngineFunSuite with Ne
                   |WITH [ tweet IN tweets | [ (tweet)<-[:POSTED]-(user) | user] ] AS pattern
                   |RETURN test.toSet(pattern) AS users""".stripMargin
 
-    val result = executeWithCostPlannerOnly(query)
+    val result = executeWithCostPlannerAndInterpretedRuntimeOnly(query)
     result.toList should equal(List(Map("users" -> List(List(n2)))))
   }