From 1b6a71b2e627ab03fe7538700edb64ffed8832eb Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 6 Aug 2015 13:25:07 +0200 Subject: [PATCH] [xtext.xtext][serializer] Updated several test expectations. the new serializer... - doesn't loose optional parenthesis anymore - produces text replacements starting at node.getTotalOffset() (the PTC produced them for node.getOffset()). Signed-off-by: Moritz Eysholdt --- .../xtext/parsetree/formatter/XtextFormatterExpected.xtext | 2 +- .../eclipse/xtext/xtext/XtextGrammarSerializationTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext index 00cc4122d..4641f93b8 100755 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/parsetree/formatter/XtextFormatterExpected.xtext @@ -35,7 +35,7 @@ terminal ID2: '^'? ('a'..'z' | 'A'..'Z' | '_') ('a'..'z' | 'A'..'Z' | '_' | '0'..'9')*; terminal INT2 returns ecore::EInt: - '0'..'9'+; + ('0'..'9')+; terminal STRING2: '"' ('\\' ('b' | 't' | 'n' | 'f' | 'r' | '"' | "'" | '\\') | !('\\' | '"'))* '"' | diff --git a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java index 7828d6faf..a7dcd6302 100644 --- a/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java +++ b/tests/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/XtextGrammarSerializationTest.java @@ -47,7 +47,7 @@ public class XtextGrammarSerializationTest extends AbstractXtextTests { final String model = "grammar foo with org.eclipse.xtext.common.Terminals\n" + "generate mm \"http://bar\" as fooMM\n" + "StartRule returns fooMM::T: (name+=ID?)+;"; final String expectedModel = "grammar foo with org.eclipse.xtext.common.Terminals\n\ngenerate " - + "mm \"http://bar\" as fooMM\n\nStartRule returns fooMM::T:\n name+=ID*;"; + + "mm \"http://bar\" as fooMM\n\nStartRule returns fooMM::T:\n (name+=ID)*;"; doTestSerialization(model, expectedModel); } @@ -70,7 +70,7 @@ public class XtextGrammarSerializationTest extends AbstractXtextTests { + "MyRule returns xtext::ParserRule : name=ID;"; final String expectedModel = "grammar foo with org.eclipse.xtext.common.Terminals\n\n" + "import \"http://www.eclipse.org/2008/Xtext\" as xtext\n" + "generate mm \"http://bar\" as fooMM\n\n" - + "Foo returns fooMM::Foo:\n name=ID nameRefs+=NameRef*;\n\n" + + "Foo returns fooMM::Foo:\n name=ID (nameRefs+=NameRef)*;\n\n" + "NameRef returns xtext::RuleCall:\n rule=[xtext::ParserRule];\n\n" + "MyRule returns xtext::ParserRule:\n name=ID;"; doTestSerialization(model, expectedModel);