Skip to content

Commit

Permalink
Make string comparisons more windows-newline-safe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mats-SX
Mats-SX committed Sep 2, 2017
1 parent 1a6fbf2 commit ea43bb5
Showing 1 changed file with 54 additions and 50 deletions.
104 changes: 54 additions & 50 deletions ...org/neo4j/cypher/internal/frontend/v3_3/ast/MultipleGraphClauseSemanticCheckingTest.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.neo4j.cypher.internal.frontend.v3_3.ast

import org.neo4j.cypher.internal.frontend.v3_3.helpers.StringHelper
import org.neo4j.cypher.internal.frontend.v3_3.parser.ParserTest
import org.neo4j.cypher.internal.frontend.v3_3.phases._
import org.neo4j.cypher.internal.frontend.v3_3.spi.MapToPublicExceptions
Expand All @@ -32,21 +33,21 @@ class MultipleGraphClauseSemanticCheckingTest
implicit val parser: Rule1[Query] = Query

test("GRAPHS * keeps existing graphs in scope (1)") {
parsing(strip(
parsing(
"""WITH 1 AS a GRAPH source AT 'src' >> GRAPH target AT 'tgt'
|RETURN * GRAPHS *
""")) shouldVerify { result: SemanticCheckResult =>
""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,ReturnItems(false,Vector(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(a)))),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
|source >> target
|// Return(false,ReturnItems(true,List()),Some(GraphReturnItems(true,List())),None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -60,26 +61,26 @@ class MultipleGraphClauseSemanticCheckingTest
| GRAPH source: 18
| GRAPH target: 43
| }
|}"""))
|}"""
}
}

test("GRAPHS * keeps existing graphs in scope (2)") {
parsing(strip(
parsing(
"""WITH 1 AS a GRAPH source AT 'src' >> GRAPH target AT 'tgt'
|RETURN GRAPHS *
""")) shouldVerify { result: SemanticCheckResult =>
""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,ReturnItems(false,Vector(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(a)))),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
|source >> target
|// Return(false,DiscardCardinality(),Some(GraphReturnItems(true,List())),None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -92,18 +93,18 @@ class MultipleGraphClauseSemanticCheckingTest
| GRAPH source: 18
| GRAPH target: 43
| }
|}"""))
|}"""
}
}

test("WITH * passes on whatever graphs are in scope") {
parsing(strip(
parsing(
"""WITH GRAPH source AT 'src' >> GRAPH target AT 'tgt'
|WITH 1 AS a
|RETURN * GRAPHS *
""")) shouldVerify { result: SemanticCheckResult =>
""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,DiscardCardinality(),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
Expand All @@ -113,8 +114,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(true,List()),Some(GraphReturnItems(true,List())),None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -132,26 +133,25 @@ class MultipleGraphClauseSemanticCheckingTest
| GRAPH source: 11
| GRAPH target: 36
| }
|}"""))
|}"""
}
}

test("WITH GRAPHS controls which graphs are in scope (1)") {
parsing(strip(
parsing(
"""WITH GRAPH source AT 'src' >> GRAPH target AT 'tgt'
|RETURN GRAPH foo AT 'url', GRAPH bar AT 'url'
""")) shouldVerify { result: SemanticCheckResult =>
|RETURN GRAPH foo AT 'url', GRAPH bar AT 'url'""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,DiscardCardinality(),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
|source >> target
|// Return(false,DiscardCardinality(),Some(GraphReturnItems(false,List(ReturnedGraph(GraphAtAs(GraphUrl(Right(StringLiteral(url))),Some(Variable(foo)))), ReturnedGraph(GraphAtAs(GraphUrl(Right(StringLiteral(url))),Some(Variable(bar))))))),None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -163,7 +163,7 @@ class MultipleGraphClauseSemanticCheckingTest
| GRAPH bar: 85
| GRAPH foo: 65
| }
|}"""))
|}"""
}
}

Expand All @@ -172,7 +172,7 @@ class MultipleGraphClauseSemanticCheckingTest
"""WITH 1 AS a GRAPH source AT 'src' >> GRAPH target AT 'tgt'
|RETURN a""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""
|// Start
|--
Expand All @@ -181,8 +181,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(false,List(AliasedReturnItem(Variable(a),Variable(a)))),None,None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -194,7 +194,7 @@ class MultipleGraphClauseSemanticCheckingTest
| {
| a: 10 66 67
| }
|}"""))
|}"""
}
}

Expand All @@ -204,7 +204,7 @@ class MultipleGraphClauseSemanticCheckingTest
|WITH a GRAPH source
|RETURN a""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,ReturnItems(false,Vector(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(a)))),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
Expand All @@ -214,8 +214,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(false,List(AliasedReturnItem(Variable(a),Variable(a)))),None,None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -231,7 +231,7 @@ class MultipleGraphClauseSemanticCheckingTest
| {
| a: 10 64 65 86 87
| }
|}"""))
|}"""
}
}

Expand All @@ -253,7 +253,7 @@ class MultipleGraphClauseSemanticCheckingTest
|MATCH (c)
|RETURN a, c""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.errors shouldBe empty
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""
|// Start
|--
Expand All @@ -268,8 +268,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(false,List(AliasedReturnItem(Variable(a),Variable(a)), AliasedReturnItem(Variable(c),Variable(c)))),None,None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -289,7 +289,7 @@ class MultipleGraphClauseSemanticCheckingTest
| a: 10 74 75 93 94
| c: 83 96 97
| }
|}"""))
|}"""
}
}

Expand All @@ -299,7 +299,7 @@ class MultipleGraphClauseSemanticCheckingTest
|FROM GRAPH new AT 'new'
|MATCH (b)
|RETURN a GRAPHS *""".stripMargin) shouldVerify { result: SemanticCheckResult =>
result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,ReturnItems(false,Vector(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(a)))),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
Expand All @@ -311,8 +311,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(false,List(AliasedReturnItem(Variable(a),Variable(a)))),Some(GraphReturnItems(true,List())),None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -334,7 +334,7 @@ class MultipleGraphClauseSemanticCheckingTest
| GRAPH source: 18
| GRAPH target: 43
| }
|}"""))
|}"""
}
}

Expand All @@ -344,7 +344,7 @@ class MultipleGraphClauseSemanticCheckingTest
|INTO GRAPH new AT 'new'
|RETURN a""".stripMargin) shouldVerify { result: SemanticCheckResult =>

result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,ReturnItems(false,Vector(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(a)))),GraphReturnItems(false,List(NewContextGraphs(GraphAtAs(GraphUrl(Right(StringLiteral(src))),Some(Variable(source))),Some(GraphAtAs(GraphUrl(Right(StringLiteral(tgt))),Some(Variable(target))))))),None,None,None,None)
Expand All @@ -354,8 +354,8 @@ class MultipleGraphClauseSemanticCheckingTest
|// Return(false,ReturnItems(false,List(AliasedReturnItem(Variable(a),Variable(a)))),None,None,None,None,Set())
|--
|// End
"""))
result.formattedScopes should equal(strip(
"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| }
Expand All @@ -373,7 +373,7 @@ class MultipleGraphClauseSemanticCheckingTest
| {
| a: 10 90 91
| }
|}"""))
|}"""
}
}

Expand All @@ -392,15 +392,15 @@ class MultipleGraphClauseSemanticCheckingTest
"""WITH GRAPHS foo >> bar
|RETURN 1""".stripMargin) shouldVerify { result: SemanticCheckResult =>

result.formattedContexts should equal(strip(
verify(result.formattedContexts) shouldEqualFixNewlines
"""// Start
|--
|// With(false,DiscardCardinality(),GraphReturnItems(false,List(NewContextGraphs(GraphAs(Variable(foo),Some(Variable(foo))),Some(GraphAs(Variable(bar),Some(Variable(bar))))))),None,None,None,None)
|foo >> bar
|// Return(false,ReturnItems(false,List(AliasedReturnItem(SignedDecimalIntegerLiteral(1),Variable(1)))),None,None,None,None,Set())
|--
|// End"""))
result.formattedScopes should equal(strip(
|// End"""
verify(result.formattedScopes) shouldEqualFixNewlines
"""{
| {
| GRAPH bar: 19
Expand All @@ -413,7 +413,7 @@ class MultipleGraphClauseSemanticCheckingTest
| {
| 1: 31
| }
|}"""))
|}"""
}
}

Expand All @@ -430,7 +430,11 @@ class MultipleGraphClauseSemanticCheckingTest
}
}

private def strip(text: String) = text.trim.stripMargin
implicit class verify(actual: String) {
def shouldEqualFixNewlines(expected: String): Unit = {
StringHelper.RichString(actual.trim.stripMargin).fixNewLines should equal(StringHelper.RichString(expected.trim.stripMargin).fixNewLines)
}
}

private def fullScopeTree(state: SemanticState): String = state.scopeTree.toStringWithoutId.trim

Expand Down

0 comments on commit ea43bb5

Please sign in to comment.