adopted files to latest changes in test framework

10 files changed, 12 insertions, 29 deletions

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/ecore/XcoreEcoreTest.java b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/ecore/XcoreEcoreTest.java
index 898cde0..400de87 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/ecore/XcoreEcoreTest.java
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/ecore/XcoreEcoreTest.java
@@ -9,8 +9,8 @@ import org.eclipse.emf.ecore.xcore.tests.GenModelFormatter;
 import org.eclipse.xtext.junit4.InjectWith;
 import org.eclipse.xtext.junit4.parameterized.AbstractParameterizedXtextTest;
 import org.eclipse.xtext.junit4.parameterized.ResourceURIs;
+import org.eclipse.xtext.junit4.parameterized.TestAsString;
 import org.eclipse.xtext.resource.XtextResource;
-import org.junit.Test;
 
 import com.google.inject.Inject;
 
@@ -27,7 +27,7 @@ public class XcoreEcoreTest extends AbstractParameterizedXtextTest
 	@Inject
 	private XcoreMapper mapper;
 
-	@Test
+	@TestAsString
 	public String eNamedElement()
 	{
 		EcoreUtil.resolveAll(resource);
diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/genmodel/XcoreGenModelTest.java b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/genmodel/XcoreGenModelTest.java
index 7351dd2..a2430ea 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/genmodel/XcoreGenModelTest.java
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/genmodel/XcoreGenModelTest.java
@@ -9,8 +9,8 @@ import org.eclipse.emf.ecore.xcore.tests.GenModelFormatter;
 import org.eclipse.xtext.junit4.InjectWith;
 import org.eclipse.xtext.junit4.parameterized.AbstractParameterizedXtextTest;
 import org.eclipse.xtext.junit4.parameterized.ResourceURIs;
+import org.eclipse.xtext.junit4.parameterized.TestAsString;
 import org.eclipse.xtext.resource.XtextResource;
-import org.junit.Test;
 
 import com.google.inject.Inject;
 
@@ -27,7 +27,7 @@ public class XcoreGenModelTest extends AbstractParameterizedXtextTest
 	@Inject
 	private XcoreMapper mapper;
 
-	@Test
+	@TestAsString
 	public String genBase()
 	{
 		EcoreUtil.resolveAll(resource);
diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-AtMostOneID.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-AtMostOneID.xcore
index f5489a7..2c2ba80 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-AtMostOneID.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-AtMostOneID.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at 'class C extends A, B

-{

-}' message 'The features 'id1' and 'id2' cannot both be IDs'

+error at 'class C extends A, B { }' message 'The features 'id1' and 'id2' cannot both be IDs'

 --- */

 

 class A

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesConflict.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesConflict.xcore
index 62fc1d5..1755145 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesConflict.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesConflict.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class D extends B, C

-{

-}' message 'The generic super types instantiate 'foo.A' inconsistently'

+error at 'class D extends B, C { }' message 'The generic super types instantiate 'foo.A' inconsistently'

 --- */

 

 class A<T>

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesDuplicate.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesDuplicate.xcore
index a270939..6e9ede6 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesDuplicate.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-ConsistentSuperTypesDuplicate.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class B extends A, A

-{

-}' message 'The generic super types at index '1' and '0' must not be duplicates'

+error at 'class B extends A, A { }' message 'The generic super types at index '1' and '0' must not be duplicates'

 --- */

 

 class A

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-NoCircularSuperTypes.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-NoCircularSuperTypes.xcore
index 32fdce3..352e55d 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-NoCircularSuperTypes.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-NoCircularSuperTypes.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class A extends A

-{

-}' message 'A class may not be a super type of itself'

+error at 'class A extends A { }' message 'A class may not be a super type of itself'

 --- */

 

 class A extends A

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueFeatureNames.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueFeatureNames.xcore
index 34aa976..bae231e 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueFeatureNames.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueFeatureNames.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class C extends A, B

-{

-}' message 'There may not be two features named 'a''

+error at 'class C extends A, B { }' message 'There may not be two features named 'a''

 --- */

 

 class A

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueOperationSignatures.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueOperationSignatures.xcore
index cb29091..26d6f3a 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueOperationSignatures.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-UniqueOperationSignatures.xcore
@@ -1,11 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class A

-{

-  op String a()

-  op String a()

-}' message 'There may not be two operations 'foo.A.a' and 'foo.A.a' with the same signature'

+error at 'class A { op String a() op String a() }' message 'There may not be two operations 'foo.A.a' and 'foo.A.a' with the same signature'

 --- */

 

 class A

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClassifier-UniqueTypeParameterNames.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClassifier-UniqueTypeParameterNames.xcore
index b67df85..6f4830f 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClassifier-UniqueTypeParameterNames.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClassifier-UniqueTypeParameterNames.xcore
@@ -1,8 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at ' class A <T, T> {

-}' message 'There may not be two type parameters named 'T''

+error at 'class A<T, T> { }' message 'There may not be two type parameters named 'T''

 --- */

 

 class A<T, T>

diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EPackage-UniqueClassifierNames.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EPackage-UniqueClassifierNames.xcore
index bd8e1af..019828e 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EPackage-UniqueClassifierNames.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EPackage-UniqueClassifierNames.xcore
@@ -1,9 +1,7 @@
 package foo

 

 /* XPECT validationIssues ---

-error at 'class A

-{

-}' message 'There may not be two classifiers named 'A''

+error at 'class A { }' message 'There may not be two classifiers named 'A''

 --- */

 

 class A