[459287] Use unique package names in tests

Also moved the xcore test files to an own non-source folder
to prevent them from being loaded twice during the tests.

Preparation for the new UniqueClassNameValidation in Xtext

Change-Id: Ie99d0a92398167b8056465bad2d324c50e5ac2f6
Signed-off-by: Sebastian Zarnekow <Sebastian.Zarnekow@itemis.de>

32 files changed, 1 insertions, 380 deletions

diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test
deleted file mode 100644
index 1ea421a81..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test
+++ /dev/null
@@ -1,19 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class C extends A, B { }' message 'The features 'id1' and 'id2' cannot both be IDs'
---- */
-
-class A
-{
-  id String id1
-}
-
-class B
-{
-  id String id2
-}
-
-class C extends A, B
-{
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test
deleted file mode 100644
index bb5399d23..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test
+++ /dev/null
@@ -1,21 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class D extends B, C { }' message 'The generic super types instantiate 'foo.A' inconsistently'
---- */
-
-class A<T>
-{
-} 
-
-class B extends A<String>
-{
-}
-
-class C extends A<Integer>
-{
-}
-
-class D extends B, C
-{
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test
deleted file mode 100644
index de6a03023..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test
+++ /dev/null
@@ -1,13 +0,0 @@
-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'
---- */
-
-class A
-{
-} 
-
-class B extends A, A
-{
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test
deleted file mode 100644
index c7e54b4b7..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A { String a op String getA() }' message 'There may not be an operation 'foo.A.getA' with the same signature as an accessor method for feature 'foo.A.a''
---- */
-
-class A
-{
-  String a
-  op String getA()
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test
deleted file mode 100644
index 159afae9b..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A extends A { }' message 'A class may not be a super type of itself'
---- */
-
-class A extends A
-{
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test
deleted file mode 100644
index 555a363a0..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test
+++ /dev/null
@@ -1,19 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class C extends A, B { }' message 'There may not be two features named 'a''
---- */
-
-class A
-{
-  String a
-}
-
-class B
-{
-  String a
-}
-
-class C extends A, B
-{
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test
deleted file mode 100644
index 836a05095..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-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'
---- */
-
-class A
-{
-  op String a()
-  op String a()
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test
deleted file mode 100644
index 8b407ccc9..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A wraps java.util.Map$Entry { }' message 'A map entry class must have a feature called 'key''
-error at 'class A wraps java.util.Map$Entry { }' message 'A map entry class must have a feature called 'value''
---- */
-
-class A wraps java.util.Map$Entry
-{
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test
deleted file mode 100644
index 44dd4159f..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test
+++ /dev/null
@@ -1,15 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class B extends A { }' message 'A class that inherits from a map entry class must have instance class name 'java.util.Map$Entry''
---- */
-
-class A wraps java.util.Map$Entry
-{
-  String key
-  String value
-}
-
-class B extends A
-{
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test
deleted file mode 100644
index a94827834..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A<T, T> { }' message 'There may not be two type parameters named 'T''
---- */
-
-class A<T, T>
-{
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test
deleted file mode 100644
index 758d88073..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A as 'x'' message 'There may not be two enumerators with literal value 'x''
---- */
-
-enum A
-{
-  A as 'x'
-  B as 'x'
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test
deleted file mode 100644
index 708b444d4..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A ' message 'There may not be two enumerators named 'A''
---- */
-
-enum A
-{
-  A
-  A
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test
deleted file mode 100644
index f4540db27..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A' message 'The generic attribute type must not refer to a class'
---- */
-
-class A
-{
-	A a
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test
deleted file mode 100644
index d21e830ae..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A<?>' message 'The generic type associated with the 'A' classifier must not have 1 argument(s) when the classifier has 0 type parameter(s)'
---- */
-
-class A
-{
-	refers A<?>  a 
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test
deleted file mode 100644
index 78226b81c..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A<String>' message 'The generic type associated with the 'A' classifier must not have 1 argument(s) when the classifier has 2 type parameter(s)'
---- */
-
-class A<T, U>
-{
-	refers A<String> a 
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test
deleted file mode 100644
index 957f7c104..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test
+++ /dev/null
@@ -1,19 +0,0 @@
-
-package foo
-
-/* XPECT validationIssues ---
-error at 'A<C>' message 'The generic type 'foo.C' is not a valid substitution for type parameter 'foo.A.T''
---- */
-
-class A<T extends B>
-{
-	refers A<C>  a 
-}
-
-class B
-{
-}
-
-class C
-{
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test
deleted file mode 100644
index e401addf4..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-warning at 'A' message 'The generic type associated with the 'A' classifier should have 1 type argument(s) to match the number of type parameter (s) of the classifier '
---- */
-
-class A<T>
-{
-	refers A  a 
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test
deleted file mode 100644
index 2cbb94619..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'String' message 'The generic reference type must not refer to a data type'
---- */
-
-class A
-{
-  refers String a
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test
deleted file mode 100644
index 529398c90..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'T' message 'A generic super type must refer to a class'
-error at 'String' message 'A generic super type must refer to a class'
---- */
-
-class A<T> extends T, String
-{
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test
deleted file mode 100644
index ad2c493a1..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'int' message 'The primitive type 'int' can not be used in this context'
---- */
-
-class A<T>
-{
-  refers A<int> a
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test
deleted file mode 100644
index 8de3716fe..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'x='x'' message 'The feature 'details' has a map entry at index 1 with a key that collides with that of the map entry at index 0'
---- */
-
-annotation "Foo" as Foo
-
-@Foo(x='x', x='x')
-class A
-{
-} 
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test
deleted file mode 100644
index b426aa3b2..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test
+++ /dev/null
@@ -1,13 +0,0 @@
-package foo
-
-//TODO suppress duplicate local variable error message.
-/* XPECT validationIssues ---
-error at 'a' message 'Duplicate local variable a'
-error at 'a' message 'Duplicate local variable a'
-error at 'op void foo(A a, A a)' message 'There may not be two parameters named 'a''
---- */
-
-class A
-{
-	op void foo(A a, A a)
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test
deleted file mode 100644
index c1e291b37..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at ' op <T, T> void foo()' message 'There may not be two type parameters named 'T''
---- */
-
-class A
-{
-	op <T, T> void foo()
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test
deleted file mode 100644
index 9f1375eab..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A { }' message 'There may not be two classifiers named 'A''
---- */
-
-class A
-{
-}
-
-type A wraps java.lang.String
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test
deleted file mode 100644
index 4dff5d6e9..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test
+++ /dev/null
@@ -1,22 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'contains A a oppos it e b' message 'A containment reference of a type with a container feature foo.A.c that requires instances to be contained elsewhere cannot be populated'
-error at 'contains A a opposite c' message 'A containment reference of a type with a container feature foo.A.b that requires instances to be contained elsewhere cannot be populated'
---- */
-
-class A
-{
-  container B [1] b opposite a
-  container C [1] c opposite a
-} 
-
-class B
-{
-  contains A a opposite b
-}
-
-class C
-{
-  contains A a opposite c
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test
deleted file mode 100644
index 8d14198f0..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'y' message 'The opposite of a transient reference must be transient if it is proxy resolving'
---- */
-
-class A
-{
-	refers transient A x opposite y
-	refers A y opposite x
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test
deleted file mode 100644
index e9c3532bf..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test
+++ /dev/null
@@ -1,12 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at ' y' message 'The opposite of a containment reference must not be a containment reference'
-error at ' x' message 'The opposite of a containment reference must not be a containment reference'
---- */
-
-class A
-{
-	contains A x opposite y
-	contains A y opposite x
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test
deleted file mode 100644
index 67d332f1b..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at ' y' message 'The opposite of the opposite may not be a reference different from this one'
---- */
-
-class A
-{
-	refers A x opposite y
-	refers A y
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test
deleted file mode 100644
index 0e1b90680..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test
+++ /dev/null
@@ -1,11 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at ' [*]' message 'A container reference must have upper bound of 1 not -1'
---- */
-
-class A
-{
-	contains A x opposite y
-	container A [*] y opposite x
-} 
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test
deleted file mode 100644
index e927ce5a0..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test
+++ /dev/null
@@ -1,10 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at '[2..1]' message 'The lower bound 2 must be less than or equal to the upper bound 1'
---- */
-
-class A
-{
-	String [2..1] a 
-}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test
deleted file mode 100644
index 2208de2ea..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test
+++ /dev/null
@@ -1,8 +0,0 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'baz' message 'Couldn't resolve reference to GenBase 'baz'.'
-error at 'baz' message 'A generic super type must refer to a class'
---- */
-
-class bar extends baz {}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
index 9998c2c28..3242be49e 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
@@ -55,7 +55,7 @@ import com.google.inject.Inject;
  */
 @InjectWith(XcoreInjectorProvider.class)
 @RunWith(XcoreParameterizedTestRunner.class)
-@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/validation", fileExtensions = "xcore_test")
+@ResourceURIs(baseDir = "test-models/org/eclipse/emf/test/ecore/xcore/validation", fileExtensions = "xcore_test")
 public class XcoreValidationTest
 {
   @InjectParameter