Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Zarnekow2015-02-06 10:37:52 +0000
committerSebastian Zarnekow2015-02-06 12:37:50 +0000
commita9d57fe9661035b3ecd23deac8943f09edb59c03 (patch)
treed13b3d93b217f4ef351c39ed5be2c1f94b6f48b7 /tests/org.eclipse.emf.test.ecore.xcore
parent93159204732872e63e317094fbe03a7bcccaae4c (diff)
downloadorg.eclipse.emf-a9d57fe9661035b3ecd23deac8943f09edb59c03.tar.gz
org.eclipse.emf-a9d57fe9661035b3ecd23deac8943f09edb59c03.tar.xz
org.eclipse.emf-a9d57fe9661035b3ecd23deac8943f09edb59c03.zip
[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>
Diffstat (limited to 'tests/org.eclipse.emf.test.ecore.xcore')
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/.gitignore2
-rwxr-xr-xtests/org.eclipse.emf.test.ecore.xcore/build.properties3
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/XcoreEcoreTest.java2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore21
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/XcoreGenModelTest.java2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore25
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/XcoreScopingTest.java2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test11
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test19
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore)8
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore)8
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore)6
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore21
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test)4
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test11
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test)4
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test19
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test)6
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test)2
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test (renamed from tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test)2
47 files changed, 125 insertions, 127 deletions
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/.gitignore b/tests/org.eclipse.emf.test.ecore.xcore/.gitignore
index 6ca7db689..05805675c 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/.gitignore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/.gitignore
@@ -1,4 +1,4 @@
bin
*.java._trace
*.java_trace
-
+*.xtendbin \ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/build.properties b/tests/org.eclipse.emf.test.ecore.xcore/build.properties
index 0c8228573..732e3301e 100755
--- a/tests/org.eclipse.emf.test.ecore.xcore/build.properties
+++ b/tests/org.eclipse.emf.test.ecore.xcore/build.properties
@@ -5,7 +5,8 @@ bin.includes = META-INF/,\
about.ini,\
about.mappings,\
about.properties,\
- modeling32.png
+ modeling32.png,\
+ test-models/
src.includes = about.html
source.. = src/,\
src-gen/,\
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/XcoreEcoreTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/XcoreEcoreTest.java
index fec1be7d4..bfca16496 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/XcoreEcoreTest.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/XcoreEcoreTest.java
@@ -30,7 +30,7 @@ import com.google.inject.Inject;
@InjectWith(XcoreInjectorProvider.class)
@RunWith(ParameterizedXtextRunner.class)
-@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/ecore", fileExtensions = "xcore")
+@ResourceURIs(baseDir = "test-models/org/eclipse/emf/test/ecore/xcore/ecore", fileExtensions = "xcore")
public class XcoreEcoreTest
{
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore
deleted file mode 100644
index da7c0d731..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore
+++ /dev/null
@@ -1,21 +0,0 @@
-/* XPECT genBase ---
- GenPackage {
- prefix = 'Foo'
- disposableProviderFactory = 'true'
- ecorePackage -> EPackage foo
- genClasses = [
- GenClass {
- genPackage -> GenPackage foo.FooPackage
- ecoreClass -> EClass foo::Bar
- }
- ]
- genClassifiers -> [
- GenClass foo.Bar
- ]
- }
----
-*/
-
-package foo
-
-class Bar {} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/XcoreGenModelTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/XcoreGenModelTest.java
index 3e135df95..10184cbaf 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/XcoreGenModelTest.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/XcoreGenModelTest.java
@@ -31,7 +31,7 @@ import com.google.inject.Inject;
@InjectWith(XcoreInjectorProvider.class)
@RunWith(ParameterizedXtextRunner.class)
-@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/genmodel", fileExtensions = "xcore")
+@ResourceURIs(baseDir = "test-models/org/eclipse/emf/test/ecore/xcore/genmodel", fileExtensions = "xcore")
public class XcoreGenModelTest
{
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore
deleted file mode 100644
index cd8bef893..000000000
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore
+++ /dev/null
@@ -1,25 +0,0 @@
-package foo
-
-class Foo {}
-class Bar<T> {}
-class Baz {}
-
-// FIXME: these scopes should not contain EDataTypes
-/* XPECT scopeAllElements at Foo ---
-Bar, Baz, Class, Class1, Class2, Class3, Foo,
-foo.Bar, foo.Baz, foo.Class1, foo.Class2, foo.Class3, foo.Foo, ...
---- */
-class Class1 extends Foo {}
-
-
-/* XPECT scopeAllElements at Foo ---
-Bar, Baz, Class, Class1, Class2, Class3, Foo,
-foo.Bar, foo.Baz, foo.Class1, foo.Class2, foo.Class3, foo.Foo, ...
---- */
-class Class2 extends Bar<Foo> {}
-
-/* XPECT scopeAllElements at Foo ---
-Bar, Baz, Class, Class1, Class2, Class3, Foo,
-foo.Bar, foo.Baz, foo.Class1, foo.Class2, foo.Class3, foo.Foo, ...
---- */
-class Class3<T extends Foo> {} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/XcoreScopingTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/XcoreScopingTest.java
index bd74d3aa6..85a842534 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/XcoreScopingTest.java
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/XcoreScopingTest.java
@@ -37,7 +37,7 @@ import com.google.inject.Inject;
@InjectWith(XcoreInjectorProvider.class)
@RunWith(ParameterizedXtextRunner.class)
-@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/scoping", fileExtensions = "xcore")
+@ResourceURIs(baseDir = "test-models/org/eclipse/emf/test/ecore/xcore/scoping", fileExtensions = "xcore")
public class XcoreScopingTest
{
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/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/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
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore
index ce36e33b9..a77e049ff 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage1.xcore
@@ -1,8 +1,8 @@
/* XPECT eNamedElement ---
EPackage {
- name = 'foo'
- nsURI = 'foo'
- nsPrefix = 'foo'
+ name = 'ePackage1'
+ nsURI = 'ePackage1'
+ nsPrefix = 'ePackage1'
eFactoryInstance -> EFactory #//
eClassifiers = [
EClass {
@@ -46,7 +46,7 @@
---
*/
-package foo
+package ePackage1
class Class1 {}
class Class2 {}
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore
index 09a96839d..1ad2b938b 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/ecore/EPackage2.xcore
@@ -1,8 +1,8 @@
/* XPECT eNamedElement ---
EPackage {
- name = 'foo'
- nsURI = 'foo'
- nsPrefix = 'foo'
+ name = 'ePackage2'
+ nsURI = 'ePackage2'
+ nsPrefix = 'ePackage2'
eFactoryInstance -> EFactory #//
eClassifiers = [
EClass {
@@ -13,6 +13,6 @@
---
*/
-package foo
+package ePackage2
class Bar {} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore
index 2eed29ebd..b115d8bb6 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenFeatures1.xcore
@@ -1,4 +1,4 @@
-package foo
+package genFeatures1
class X
{
@@ -7,7 +7,7 @@ class X
notify = 'false'
createChild = 'false'
propertySortChoices = 'true'
- ecoreFeature -> EReference foo::X::x
+ ecoreFeature -> EReference genFeatures1::X::x
}
--- */
refers X x opposite y
@@ -17,7 +17,7 @@ class X
notify = 'false'
createChild = 'false'
propertySortChoices = 'true'
- ecoreFeature -> EReference foo::X::y
+ ecoreFeature -> EReference genFeatures1::X::y
}
--- */
refers X y opposite x
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore
new file mode 100644
index 000000000..904a6e589
--- /dev/null
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/genmodel/GenPackage1.xcore
@@ -0,0 +1,21 @@
+/* XPECT genBase ---
+ GenPackage {
+ prefix = 'GenPackage1'
+ disposableProviderFactory = 'true'
+ ecorePackage -> EPackage genPackage1
+ genClasses = [
+ GenClass {
+ genPackage -> GenPackage genPackage1.GenPackage1Package
+ ecoreClass -> EClass genPackage1::Bar
+ }
+ ]
+ genClassifiers -> [
+ GenClass genPackage1.Bar
+ ]
+ }
+---
+*/
+
+package genPackage1
+
+class Bar {} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore
index 1ab1bbb26..29d9227cb 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/Annotations.xcore
@@ -1,4 +1,4 @@
-package foo
+package annotations
annotation "http://example.org/" as myAnnotation
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore
new file mode 100644
index 000000000..961234a81
--- /dev/null
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/scoping/ClassExtends.xcore
@@ -0,0 +1,22 @@
+package classExtends
+
+class Foo {}
+class Bar<T> {}
+class Baz {}
+
+// FIXME: these scopes should not contain EDataTypes
+/* XPECT scopeAllElements at Foo ---
+Bar, Baz, Class, Class1, Class2, Class3, Foo, ...
+--- */
+class Class1 extends Foo {}
+
+
+/* XPECT scopeAllElements at Foo ---
+Bar, Baz, Class, Class1, Class2, Class3, Foo, ...
+--- */
+class Class2 extends Bar<Foo> {}
+
+/* XPECT scopeAllElements at Foo ---
+Bar, Baz, Class, Class1, Class2, Class3, Foo, ...
+--- */
+class Class3<T extends Foo> {} \ 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-AtMostOneID.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test
index 1ea421a81..419c033fb 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package atMostOneID
/* XPECT validationIssues ---
error at 'class C extends A, B { }' message 'The features 'id1' and 'id2' cannot both be IDs'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test
index bb5399d23..efdac6913 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore_test
@@ -1,7 +1,7 @@
-package foo
+package consistentSuperTypesConflict
/* 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 'consistentSuperTypesConflict.A' inconsistently'
--- */
class A<T>
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test
index de6a03023..18f30a230 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentSuperTypesDup
/* XPECT validationIssues ---
error at 'class B extends A, A { }' message 'The generic super types at index '1' and '0' must not be duplicates'
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test
new file mode 100644
index 000000000..06ccb465a
--- /dev/null
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore_test
@@ -0,0 +1,11 @@
+package disjointFeatures
+
+/* XPECT validationIssues ---
+error at 'class A { String a op String getA() }' message 'There may not be an operation 'disjointFeatures.A.getA' with the same signature as an accessor method for feature 'disjointFeatures.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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test
index 159afae9b..a32216cc7 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package circular
/* XPECT validationIssues ---
error at 'class A extends A { }' message 'A class may not be a super type of itself'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test
index 555a363a0..56a71529c 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueFeatureNames
/* XPECT validationIssues ---
error at 'class C extends A, B { }' message 'There may not be two features named 'a''
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test
index 836a05095..4fe19ff61 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore_test
@@ -1,7 +1,7 @@
-package foo
+package uniqueOperations
/* 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 'uniqueOperations.A.a' and 'uniqueOperations.A.a' with the same signature'
--- */
class A
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test
index 8b407ccc9..caa421660 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package wellformedMapEntryClass
/* XPECT validationIssues ---
error at 'class A wraps java.util.Map$Entry { }' message 'A map entry class must have a feature called 'key''
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test
index 44dd4159f..31b8f3339 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package wellformedMapEntryNoInstanceClass
/* 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''
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test
index a94827834..456f77a88 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueTypeParameterNames
/* XPECT validationIssues ---
error at 'class A<T, T> { }' message 'There may not be two type parameters named '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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test
index 758d88073..8cc923fb8 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueEnumLiterals
/* XPECT validationIssues ---
error at 'A as 'x'' message 'There may not be two enumerators with literal value '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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test
index 708b444d4..a9162a759 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueEnumNames
/* XPECT validationIssues ---
error at 'A ' message 'There may not be two enumerators named '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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test
index f4540db27..ca9739274 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package classNotPermitted
/* XPECT validationIssues ---
error at 'A' message 'The generic attribute type must not refer to a class'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test
index d21e830ae..33cf01a0b 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentArgsNonAllowed
/* 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)'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test
index 78226b81c..f7081445e 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentArgsIncorrectNumber
/* 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)'
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test
new file mode 100644
index 000000000..4b115fce8
--- /dev/null
+++ b/tests/org.eclipse.emf.test.ecore.xcore/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore_test
@@ -0,0 +1,19 @@
+
+package consistentArgsInvalidSubstitution
+
+/* XPECT validationIssues ---
+error at 'A<C>' message 'The generic type 'consistentArgsInvalidSubstitution.C' is not a valid substitution for type parameter 'consistentArgsInvalidSubstitution.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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test
index e401addf4..7cae8c611 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentArgsNone
/* 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 '
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test
index 2cbb94619..27079a940 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package datatypeNotPermitted
/* XPECT validationIssues ---
error at 'String' message 'The generic reference type must not refer to a data type'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test
index 529398c90..adc0c77fa 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package noClass
/* XPECT validationIssues ---
error at 'T' message 'A generic super type must refer to a class'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test
index ad2c493a1..18e5aeb33 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package primitivePermitted
/* XPECT validationIssues ---
error at 'int' message 'The primitive type 'int' can not be used in this context'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test
index 8de3716fe..ff800bff1 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package mapEntryUnique
/* 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'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test
index b426aa3b2..08790c785 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueParamNames
//TODO suppress duplicate local variable error message.
/* XPECT validationIssues ---
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test
index c1e291b37..b089a5d35 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueTypeParamNames
/* XPECT validationIssues ---
error at ' op <T, T> void foo()' message 'There may not be two type parameters named 'T''
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test
index 9f1375eab..be8112b22 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package uniqueClassifierNames
/* XPECT validationIssues ---
error at 'class A { }' message 'There may not be two classifiers named 'A''
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test
index 4dff5d6e9..648f559b5 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore_test
@@ -1,8 +1,8 @@
-package foo
+package consistentContainer
/* 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'
+error at 'contains A a oppos it e b' message 'A containment reference of a type with a container feature consistentContainer.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 consistentContainer.A.b that requires instances to be contained elsewhere cannot be populated'
--- */
class A
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test
index 8d14198f0..87a83059d 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentOppositeBadTransient
/* XPECT validationIssues ---
error at 'y' message 'The opposite of a transient reference must be transient if it is proxy resolving'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test
index e9c3532bf..f455a540d 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentOppositeBothContainment
/* XPECT validationIssues ---
error at ' y' message 'The opposite of a containment reference must not be a containment reference'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test
index 67d332f1b..c6f1de99b 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentOppositeNotMatching
/* XPECT validationIssues ---
error at ' y' message 'The opposite of the opposite may not be a reference different from this one'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test
index 0e1b90680..154e8b07a 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package singleContainer
/* XPECT validationIssues ---
error at ' [*]' message 'A container reference must have upper bound of 1 not -1'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test
index e927ce5a0..cbe0a9d9e 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package consistentBounds
/* XPECT validationIssues ---
error at '[2..1]' message 'The lower bound 2 must be less than or equal to the upper bound 1'
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/test-models/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test
index 2208de2ea..2bb2f3dbf 100644
--- 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/test-models/org/eclipse/emf/test/ecore/xcore/validation/Linking.xcore_test
@@ -1,4 +1,4 @@
-package foo
+package linking
/* XPECT validationIssues ---
error at 'baz' message 'Couldn't resolve reference to GenBase 'baz'.'

Back to the top