From 1add44adfb861c602c6b2c96c288b54f768b1d84 Mon Sep 17 00:00:00 2001 From: Moritz Eysholdt Date: Thu, 10 Nov 2011 11:31:39 +0100 Subject: [PATCH] [junit4/parameterized] use pipe insted of exclamation mark to match offsets (cherry picked from commit a38c8f4bc7c5feab7c80f63b733dc271865d1ffb) --- .../xtext/junit4/parameterized/XpectParameterProvider.java | 2 +- .../xtext/junit4/parameterized/ParameterizedXtextRunner.xtext | 4 ++-- .../junit4/parameterized/XpectParameterProviderTest.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProvider.java b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProvider.java index fc60a0358..8d3ece20e 100644 --- a/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProvider.java +++ b/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProvider.java @@ -196,7 +196,7 @@ public class XpectParameterProvider implements IParameterProvider { protected Iterable convertValue(XtextResource res, INode ctx, int offset, Token token, String value) { switch (token) { case OFFSET: - int add = value.indexOf('!'); + int add = value.indexOf('|'); if (add >= 0) value = value.substring(0, add) + value.substring(add + 1); else diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/ParameterizedXtextRunner.xtext b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/ParameterizedXtextRunner.xtext index 6f8891f07..47e2246ed 100644 --- a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/ParameterizedXtextRunner.xtext +++ b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/ParameterizedXtextRunner.xtext @@ -23,8 +23,8 @@ import "http://www.eclipse.org/emf/2002/Ecore" as ecore xxx yyy zzz --- */ - // XPECT select1 from fo!o to b!az --> o='val' bar='val1' b - // XPECT select2 from fo!o to b!az --> o='val' bar='val1' b + // XPECT select1 from fo|o to b|az --> o='val' bar='val1' b + // XPECT select2 from fo|o to b|az --> o='val' bar='val1' b Root: foo='val' bar='val1' baz='xxx' diff --git a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProviderTest.java b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProviderTest.java index 714e2b580..e63ba38d3 100644 --- a/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProviderTest.java +++ b/tests/org.eclipse.xtext.junit4.tests/src/org/eclipse/xtext/junit4/parameterized/XpectParameterProviderTest.java @@ -422,7 +422,7 @@ public class XpectParameterProviderTest @Test public void xpectMLOffsetParameter2() { - String model = "/* XPECT offsetMeth at fo!o --> exp \n*/ Bar: val='foo';"; + String model = "/* XPECT offsetMeth at fo|o --> exp \n*/ Bar: val='foo';"; Assert.assertEquals( "offsetMeth(myOffset='l='fo!o';\\n ', myOffset=157, offset=' \\n*/ !Bar: ', offset=145, resource)", params(model));