Merge remote-tracking branch 'upstream/2.3' into 3.0

neo4j · Dec 4, 2015 · 61feb81 · 61feb81
2 parents 143b727 + 89575aa
commit 61feb81
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
@@ -286,9 +286,7 @@ with QueryStatisticsTestSupport with CreateTempFileTestSupport with NewPlannerTe
     for (i <- 1 to 10) createNode()
     val query = "match (pA) where id(pA) = {a} return pA"
 
-    intercept[CypherTypeException] {
-      executeWithAllPlanners(query, "a" -> "Andres").toList
-    }
+    executeWithAllPlanners(query, "a" -> "Andres") should be (empty)
   }
 
   test("shouldBeAbleToTakeParamsFromParsedStuff") {