From a342c45ff0637ce44941e5c2a3b524a5952231e5 Mon Sep 17 00:00:00 2001 From: sefftinge Date: Thu, 9 Oct 2008 12:55:46 +0000 Subject: [PATCH] applied patch from bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=248463 --- tests/org.eclipse.xtext.generator.tests/.classpath | 2 +- .../src/log4j.properties | 7 +++++++ .../parsetree/reconstr/ComplexReconstrTest.java | 7 ++----- .../parsetree/reconstr/ComplexReconstrTest.xtext | 12 ++++++------ .../parsetree/reconstr/SimpleReconstrTest.java | 6 ++---- .../reconstr/WhitespacePreservingCallbackTest.java | 14 ++++++++------ 6 files changed, 26 insertions(+), 22 deletions(-) create mode 100644 tests/org.eclipse.xtext.generator.tests/src/log4j.properties diff --git a/tests/org.eclipse.xtext.generator.tests/.classpath b/tests/org.eclipse.xtext.generator.tests/.classpath index d4da2f887..04fe1774c 100644 --- a/tests/org.eclipse.xtext.generator.tests/.classpath +++ b/tests/org.eclipse.xtext.generator.tests/.classpath @@ -1,8 +1,8 @@ + - diff --git a/tests/org.eclipse.xtext.generator.tests/src/log4j.properties b/tests/org.eclipse.xtext.generator.tests/src/log4j.properties new file mode 100644 index 000000000..7f26667d7 --- /dev/null +++ b/tests/org.eclipse.xtext.generator.tests/src/log4j.properties @@ -0,0 +1,7 @@ +log4j.rootLogger=debug, default + +log4j.appender.default=org.apache.log4j.ConsoleAppender +log4j.appender.default.layout=org.apache.log4j.PatternLayout +log4j.appender.default.layout.ConversionPattern=%-4r [%t] %-5p %35.35c %x - %m%n + +log4j.logger.org.eclipse=INFO \ No newline at end of file diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java index 4ed33f20b..e6a6dca2a 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.java @@ -9,12 +9,12 @@ package org.eclipse.xtext.parsetree.reconstr; import java.io.ByteArrayOutputStream; +import java.util.Collections; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.xtext.ParserRule; -import org.eclipse.xtext.parsetree.reconstr.callbacks.WhitespacePreservingCallback; import org.eclipse.xtext.resource.XtextResourceSet; import org.eclipse.xtext.tests.AbstractGeneratorTest; import org.eclipse.xtext.tests.EcoreModelComparator; @@ -40,7 +40,6 @@ public class ComplexReconstrTest extends AbstractGeneratorTest { System.out.println(EmfFormater.objToStr(pr, "")); } } - } public void testSimple() throws Exception { @@ -58,9 +57,7 @@ public class ComplexReconstrTest extends AbstractGeneratorTest { System.out.println(EmfFormater.objToStr(result, "")); IParseTreeConstructor con = getParseTreeConstructor(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - WhitespacePreservingCallback callback = new WhitespacePreservingCallback(out, - getValueConverterService()); - con.update(result, callback); + con.serialize(out, result, Collections.emptyMap()); return out.toString(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xtext b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xtext index 8ab0286cd..0bf7cedc9 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xtext +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/ComplexReconstrTest.xtext @@ -28,20 +28,20 @@ StrangeStuff : */ -TrickyA returns TypeA1: TrickyA1 (name += ID)* ({TypeB.x=current} 'x' | {TypeC.x=current} 'y')? name+=STRING; +TrickyA returns TypeA1: 'TA' TrickyA1 (name += ID)* ({TypeB.x=current} 'x' | {TypeC.x=current} 'y')? name+=STRING; TrickyA1 returns TypeD: name+=ID; -TrickyB : (name = ID type += INT)? (type += ID)*; +TrickyB : 'TB' (name = ID type += INT)? (type += ID)*; -TrickyC : name = ID ({C1.x=current} 'x')? ({C2.y=current} 'y')? ({C3.z=current} 'z')?; +TrickyC : 'TC' name = ID ({C1.x=current} 'x')? ({C2.y=current} 'y')? ({C3.z=current} 'z')?; -TrickyD: (name += INT foo = STRING type += ID)? (name += INT type += ID)? (type += ID)*; +TrickyD: 'TD' (name += INT foo = STRING type += ID)? (name += INT type += ID)? (type += ID)*; // 34 "abc" XX 123 "de" YY x 34 DD 45 CC -TrickyE: (name+=INT foo+=STRING type+=ID)* 'x' (name+=INT type+=ID)*; +TrickyE: 'TE' (name+=INT foo+=STRING type+=ID)* 'x' (name+=INT type+=ID)*; // -TrickyF: (name+=ID type+=INT)* (name+=ID | type+=INT); +TrickyF: 'TF' (name+=ID type+=INT)* (name+=ID | type+=INT); // TrickyG: TrickyG1 | TrickyG2; diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java index 92c6397c3..adf07550c 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/SimpleReconstrTest.java @@ -9,10 +9,10 @@ package org.eclipse.xtext.parsetree.reconstr; import java.io.ByteArrayOutputStream; +import java.util.Collections; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.parsetree.NodeUtil; -import org.eclipse.xtext.parsetree.reconstr.callbacks.WhitespacePreservingCallback; import org.eclipse.xtext.testlanguages.SimpleExpressionsStandaloneSetup; import org.eclipse.xtext.tests.AbstractGeneratorTest; import org.eclipse.xtext.util.EmfFormater; @@ -49,9 +49,7 @@ public class SimpleReconstrTest extends AbstractGeneratorTest { IParseTreeConstructor con = getParseTreeConstructor(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - WhitespacePreservingCallback callback = new WhitespacePreservingCallback(out, - getValueConverterService()); - con.update(result, callback); + con.serialize(out, result, Collections.emptyMap()); return out.toString(); } diff --git a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java index 1a3c4e51d..9bdea879b 100644 --- a/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java +++ b/tests/org.eclipse.xtext.generator.tests/src/org/eclipse/xtext/parsetree/reconstr/WhitespacePreservingCallbackTest.java @@ -1,10 +1,9 @@ package org.eclipse.xtext.parsetree.reconstr; import java.io.ByteArrayOutputStream; +import java.util.Collections; import org.eclipse.emf.ecore.EObject; -import org.eclipse.xtext.parser.IAstFactory; -import org.eclipse.xtext.parsetree.reconstr.callbacks.WhitespacePreservingCallback; import org.eclipse.xtext.tests.AbstractGeneratorTest; public class WhitespacePreservingCallbackTest extends AbstractGeneratorTest { @@ -65,10 +64,14 @@ public class WhitespacePreservingCallbackTest extends AbstractGeneratorTest { } private String serialize(EObject result) { +// IParseTreeConstructor con = getParseTreeConstructor(); +// ByteArrayOutputStream out = new ByteArrayOutputStream(); +// WhitespacePreservingCallback cb = new WhitespacePreservingCallback(out,getValueConverterService()); +// con.update(result, cb); +// return out.toString(); IParseTreeConstructor con = getParseTreeConstructor(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - WhitespacePreservingCallback cb = new WhitespacePreservingCallback(out,getValueConverterService()); - con.update(result, cb); + con.serialize(out, result, Collections.emptyMap()); return out.toString(); } @@ -76,8 +79,7 @@ public class WhitespacePreservingCallbackTest extends AbstractGeneratorTest { try { IParseTreeConstructor con = getParseTreeConstructor(); ByteArrayOutputStream out = new ByteArrayOutputStream(); - WhitespacePreservingCallback cb = new WhitespacePreservingCallback(out,getValueConverterService()); - con.update(o, cb); + con.serialize(out, o, Collections.emptyMap()); fail("Should fail with "+clazz.getSimpleName()); } catch (RuntimeException e) { if (!clazz.isInstance(e)) {