From 62cafe9c55570a0edc2112407fae5d5f8a977c1a Mon Sep 17 00:00:00 2001 From: Dimitry Solovyov Date: Mon, 4 Jun 2018 13:47:27 +0300 Subject: [PATCH] Rebase fixes Signed-off-by: Dimitry Solovyov --- .../ir/rewrite/SimplifyRenamedAliases.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/translation/src/test/java/org/opencypher/gremlin/translation/ir/rewrite/SimplifyRenamedAliases.java b/translation/src/test/java/org/opencypher/gremlin/translation/ir/rewrite/SimplifyRenamedAliases.java index 3e305777..9584e592 100644 --- a/translation/src/test/java/org/opencypher/gremlin/translation/ir/rewrite/SimplifyRenamedAliases.java +++ b/translation/src/test/java/org/opencypher/gremlin/translation/ir/rewrite/SimplifyRenamedAliases.java @@ -43,8 +43,14 @@ public void whereMatchPattern() { )) .withFlavor(flavor) .rewritingWith(SimplifyRenamedAliases$.MODULE$) - .removes(__().V().as(" GENERATED1").where(__().select(" GENERATED1").where(P.isEq("n"))).outE()) - .adds(__().select("n").outE()); + .removes( + __().V().as(" GENERATED1") + .where(__().select(" GENERATED1").where(P.isEq("n"))) + .as(" cypher.path.start.GENERATED2")) + .adds( + __().select("n") + .as(" cypher.path.start.GENERATED2") + ); } @Test @@ -56,7 +62,12 @@ public void whereNonStartMatchPattern() { )) .withFlavor(flavor) .rewritingWith(SimplifyRenamedAliases$.MODULE$) - .removes(__().V().as(" GENERATED1").where(__().select(" GENERATED1").where(P.isEq("m"))).outE()) - .adds(__().select("m").is(P.neq(NULL)).outE()); + .removes( + __().V().as(" GENERATED2") + .where(__().select(" GENERATED2").where(P.isEq("m"))) + .as(" cypher.path.start.GENERATED3")) + .adds( + __().select("m").is(P.neq(NULL)) + .as(" cypher.path.start.GENERATED3")); } }