Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Merks2012-09-11 13:03:54 +0000
committerEd Merks2012-09-11 13:03:54 +0000
commit94a6c74e259d14ac81c90a75f8c5d20f9b7ef37a (patch)
tree654101432538874162137c0acdf7b87ec8ad52d9 /tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation
parent87762970bca247ee50356461d0735a04f24216ca (diff)
downloadorg.eclipse.emf-94a6c74e259d14ac81c90a75f8c5d20f9b7ef37a.tar.gz
org.eclipse.emf-94a6c74e259d14ac81c90a75f8c5d20f9b7ef37a.tar.xz
org.eclipse.emf-94a6c74e259d14ac81c90a75f8c5d20f9b7ef37a.zip
[389245] Fix line endings in repo
Diffstat (limited to 'tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation')
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore36
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore42
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore24
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore18
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore36
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore30
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore18
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore36
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore44
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore24
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore22
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore20
-rw-r--r--tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java192
31 files changed, 456 insertions, 456 deletions
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore
index 2c2ba80f1..1ea421a81 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-AtMostOneID.xcore
@@ -1,19 +1,19 @@
-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
-{
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore
index 17551456f..bb5399d23 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesConflict.xcore
@@ -1,21 +1,21 @@
-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
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore
index 6e9ede673..de6a03023 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-ConsistentSuperTypesDuplicate.xcore
@@ -1,13 +1,13 @@
-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
-{
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
index 71abafcfe..c7e54b4b7 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
@@ -1,11 +1,11 @@
-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()
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore
index 352e55d4a..159afae9b 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-NoCircularSuperTypes.xcore
@@ -1,9 +1,9 @@
-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
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore
index bae231ec9..555a363a0 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueFeatureNames.xcore
@@ -1,19 +1,19 @@
-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
-{
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore
index 26d6f3a2b..836a05095 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-UniqueOperationSignatures.xcore
@@ -1,11 +1,11 @@
-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()
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore
index 2d07d9878..8b407ccc9 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryClass.xcore
@@ -1,10 +1,10 @@
-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
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
index e5716ebd8..44dd4159f 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
@@ -1,15 +1,15 @@
-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
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore
index 6f4830fdd..a94827834 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EClassifier-UniqueTypeParameterNames.xcore
@@ -1,9 +1,9 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A<T, T> { }' message 'There may not be two type parameters named 'T''
---- */
-
-class A<T, T>
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore
index 1ac698de9..758d88073 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorLiterals.xcore
@@ -1,11 +1,11 @@
-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'
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore
index 63ca5e7c3..708b444d4 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EEnum-UniqueEnumeratorNames.xcore
@@ -1,11 +1,11 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A ' message 'There may not be two enumerators named 'A''
---- */
-
-enum A
-{
- A
- A
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore
index cfdc2250e..f4540db27 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ClassNotPermitted.xcore
@@ -1,10 +1,10 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'A' message 'The generic attribute type must not refer to a class'
---- */
-
-class A
-{
- A a
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore
index 4f9f97c65..d21e830ae 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentNoneAllowed.xcore
@@ -1,10 +1,10 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore
index 6db4aed57..78226b81c 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsIncorrectNumber.xcore
@@ -1,10 +1,10 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore
index 931c0b642..957f7c104 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsInvalidSubstitution.xcore
@@ -1,19 +1,19 @@
-
-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
-{
+
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore
index 61ed378b0..e401addf4 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-ConsistentArgumentsNone.xcore
@@ -1,10 +1,10 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore
index 0ccbd4b03..2cbb94619 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-DataTypeNotPermitted.xcore
@@ -1,10 +1,10 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'String' message 'The generic reference type must not refer to a data type'
---- */
-
-class A
-{
- refers String a
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore
index 88fbcb09b..529398c90 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-NoClass.xcore
@@ -1,10 +1,10 @@
-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
-{
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore
index e224fe792..ad2c493a1 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EGenericType-PrimitiveTypePermitted.xcore
@@ -1,10 +1,10 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore
index ddacf6afb..8de3716fe 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EObject-EveryMapEntryUnique.xcore
@@ -1,12 +1,12 @@
-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
-{
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore
index 0a4d621b8..160a744ea 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueParameterNames.xcore
@@ -1,10 +1,10 @@
-package foo
-
-/* XPECT validationIssues ---
-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)
-}
+package foo
+
+/* XPECT validationIssues ---
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore
index 1a5649355..c1e291b37 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EOperation-UniqueTypeParameterNames.xcore
@@ -1,10 +1,10 @@
-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()
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore
index 019828ee3..9f1375eab 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EPackage-UniqueClassifierNames.xcore
@@ -1,11 +1,11 @@
-package foo
-
-/* XPECT validationIssues ---
-error at 'class A { }' message 'There may not be two classifiers named 'A''
---- */
-
-class A
-{
-}
-
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore
index 85d743493..4dff5d6e9 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentContainer.xcore
@@ -1,22 +1,22 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore
index 2b5598a39..8d14198f0 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBadTransient.xcore
@@ -1,11 +1,11 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore
index 6ba281027..e9c3532bf 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeBothContainment.xcore
@@ -1,12 +1,12 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore
index 33306aec5..67d332f1b 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-ConsistentOppositeNotMatching.xcore
@@ -1,11 +1,11 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore
index 3260a0652..0e1b90680 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/EReference-SingleContainer.xcore
@@ -1,11 +1,11 @@
-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
-}
+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 b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore
index 2bacdd0a0..e927ce5a0 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore
+++ b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/ETypedElement-ConsistentBounds.xcore
@@ -1,10 +1,10 @@
-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
-}
+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/XcoreValidationTest.java b/tests/org.eclipse.emf.test.ecore.xcore/src/org/eclipse/emf/test/ecore/xcore/validation/XcoreValidationTest.java
index ab5fa7a7a..55c003fbb 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
@@ -1,96 +1,96 @@
-/**
- * Copyright (c) 2011-2012 Eclipse contributors and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.emf.test.ecore.xcore.validation;
-
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.util.EcoreValidator;
-import org.eclipse.emf.ecore.xcore.XcoreInjectorProvider;
-import org.eclipse.xtext.junit4.InjectWith;
-import org.eclipse.xtext.junit4.parameterized.InjectParameter;
-import org.eclipse.xtext.junit4.parameterized.ParameterizedXtextRunner;
-import org.eclipse.xtext.junit4.parameterized.ResourceURIs;
-import org.eclipse.xtext.junit4.parameterized.XpectLines;
-import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.util.CancelIndicator;
-import org.eclipse.xtext.validation.CheckMode;
-import org.eclipse.xtext.validation.IResourceValidator;
-import org.eclipse.xtext.validation.Issue;
-import org.junit.runner.RunWith;
-
-import com.google.common.collect.Lists;
-import com.google.inject.Inject;
-
-
-/**
- * There are cases not covered because the grammar doesn't allow it, i.e.,
- * {@link EcoreValidator#CONSISTENT_BOUNDS_NOT_ALLOWED},
- * {@link EcoreValidator#CONSISTENT_BOUNDS_NO_BOUNDS_WITH_TYPE_PARAMETER_OR_CLASSIFIER}
- * , {@link EcoreValidator#CONSISTENT_BOUNDS_NO_LOWER_AND_UPPER},
- * {@link EcoreValidator#CONSISTENT_TYPE_NO_TYPE_PARAMETER_AND_CLASSIFIER},
- * {@link EcoreValidator#CONSISTENT_TYPE_WILDCARD_NOT_PERMITTED},
- * {@link EcoreValidator#INTERFACE_IS_ABSTRACT},
- * {@link EcoreValidator#NO_REPEATING_VOID},
- * {@link EcoreValidator#UNIQUE_NS_URIS},
- * {@link EcoreValidator#UNIQUE_SUBPACKAGE_NAMES},
- * {@link EcoreValidator#VALID_LOWER_BOUND}, {@link EcoreValidator#VALID_TYPE},
- * {@link EcoreValidator#VALID_UPPER_BOUND},
- * {@link EcoreValidator#WELL_FORMED_INSTANCE_TYPE_NAME}, or the scoping rules
- * won't resolve that way, i.e., {@link EcoreValidator#CONSISTENT_KEYS},
- * {@link EcoreValidator#CONSISTENT_OPPOSITE_NOT_FROM_TYPE},
- * {@link EcoreValidator#CONSISTENT_TYPE_TYPE_PARAMETER_NOT_IN_SCOPE},
- * {@link EcoreValidator#WELL_FORMED_NAME}, or we don't set the flags yet, i.e.,
- * {@link EcoreValidator#CONSISTENT_TRANSIENT}, or we can't get into that state,
- * i.e., {@link EcoreValidator#VALID_DEFAULT_VALUE_LITERAL},
- * {@link EcoreValidator#CONSISTENT_UNIQUE}, or are TODO items
- * {@link EcoreValidator#WELL_FORMED_NS_PREFIX},
- * {@link EcoreValidator#WELL_FORMED_NS_URI},
- * {@link EcoreValidator#WELL_FORMED_SOURCE_URI},
- *
- */
-@SuppressWarnings("restriction")
-@InjectWith(XcoreInjectorProvider.class)
-@RunWith(ParameterizedXtextRunner.class)
-@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/validation", fileExtensions = "xcore")
-public class XcoreValidationTest
-{
-
- @InjectParameter
- private XtextResource resource;
-
- @Inject
- private IResourceValidator validator;
-
- protected String formatIssue(Issue issue)
- {
- StringBuilder result = new StringBuilder();
- result.append(issue.getSeverity().name().toLowerCase());
- if (issue.getOffset() != null && issue.getLength() != null)
- {
- result.append(" at '");
- result.append(resource.getParseResult().getRootNode().getText().substring(issue.getOffset(), issue.getOffset() + issue.getLength()));
- result.append("' ");
- }
- else
- result.append(" ");
- result.append("message '");
- result.append(issue.getMessage());
- result.append("'");
- return result.toString();
- }
-
- @XpectLines()
- public List<String> validationIssues()
- {
- List<String> result = Lists.newArrayList();
- for (Issue issue : validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl))
- result.add(formatIssue(issue));
- return result;
- }
-}
+/**
+ * Copyright (c) 2011-2012 Eclipse contributors and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.emf.test.ecore.xcore.validation;
+
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.util.EcoreValidator;
+import org.eclipse.emf.ecore.xcore.XcoreInjectorProvider;
+import org.eclipse.xtext.junit4.InjectWith;
+import org.eclipse.xtext.junit4.parameterized.InjectParameter;
+import org.eclipse.xtext.junit4.parameterized.ParameterizedXtextRunner;
+import org.eclipse.xtext.junit4.parameterized.ResourceURIs;
+import org.eclipse.xtext.junit4.parameterized.XpectLines;
+import org.eclipse.xtext.resource.XtextResource;
+import org.eclipse.xtext.util.CancelIndicator;
+import org.eclipse.xtext.validation.CheckMode;
+import org.eclipse.xtext.validation.IResourceValidator;
+import org.eclipse.xtext.validation.Issue;
+import org.junit.runner.RunWith;
+
+import com.google.common.collect.Lists;
+import com.google.inject.Inject;
+
+
+/**
+ * There are cases not covered because the grammar doesn't allow it, i.e.,
+ * {@link EcoreValidator#CONSISTENT_BOUNDS_NOT_ALLOWED},
+ * {@link EcoreValidator#CONSISTENT_BOUNDS_NO_BOUNDS_WITH_TYPE_PARAMETER_OR_CLASSIFIER}
+ * , {@link EcoreValidator#CONSISTENT_BOUNDS_NO_LOWER_AND_UPPER},
+ * {@link EcoreValidator#CONSISTENT_TYPE_NO_TYPE_PARAMETER_AND_CLASSIFIER},
+ * {@link EcoreValidator#CONSISTENT_TYPE_WILDCARD_NOT_PERMITTED},
+ * {@link EcoreValidator#INTERFACE_IS_ABSTRACT},
+ * {@link EcoreValidator#NO_REPEATING_VOID},
+ * {@link EcoreValidator#UNIQUE_NS_URIS},
+ * {@link EcoreValidator#UNIQUE_SUBPACKAGE_NAMES},
+ * {@link EcoreValidator#VALID_LOWER_BOUND}, {@link EcoreValidator#VALID_TYPE},
+ * {@link EcoreValidator#VALID_UPPER_BOUND},
+ * {@link EcoreValidator#WELL_FORMED_INSTANCE_TYPE_NAME}, or the scoping rules
+ * won't resolve that way, i.e., {@link EcoreValidator#CONSISTENT_KEYS},
+ * {@link EcoreValidator#CONSISTENT_OPPOSITE_NOT_FROM_TYPE},
+ * {@link EcoreValidator#CONSISTENT_TYPE_TYPE_PARAMETER_NOT_IN_SCOPE},
+ * {@link EcoreValidator#WELL_FORMED_NAME}, or we don't set the flags yet, i.e.,
+ * {@link EcoreValidator#CONSISTENT_TRANSIENT}, or we can't get into that state,
+ * i.e., {@link EcoreValidator#VALID_DEFAULT_VALUE_LITERAL},
+ * {@link EcoreValidator#CONSISTENT_UNIQUE}, or are TODO items
+ * {@link EcoreValidator#WELL_FORMED_NS_PREFIX},
+ * {@link EcoreValidator#WELL_FORMED_NS_URI},
+ * {@link EcoreValidator#WELL_FORMED_SOURCE_URI},
+ *
+ */
+@SuppressWarnings("restriction")
+@InjectWith(XcoreInjectorProvider.class)
+@RunWith(ParameterizedXtextRunner.class)
+@ResourceURIs(baseDir = "src/org/eclipse/emf/test/ecore/xcore/validation", fileExtensions = "xcore")
+public class XcoreValidationTest
+{
+
+ @InjectParameter
+ private XtextResource resource;
+
+ @Inject
+ private IResourceValidator validator;
+
+ protected String formatIssue(Issue issue)
+ {
+ StringBuilder result = new StringBuilder();
+ result.append(issue.getSeverity().name().toLowerCase());
+ if (issue.getOffset() != null && issue.getLength() != null)
+ {
+ result.append(" at '");
+ result.append(resource.getParseResult().getRootNode().getText().substring(issue.getOffset(), issue.getOffset() + issue.getLength()));
+ result.append("' ");
+ }
+ else
+ result.append(" ");
+ result.append("message '");
+ result.append(issue.getMessage());
+ result.append("'");
+ return result.toString();
+ }
+
+ @XpectLines()
+ public List<String> validationIssues()
+ {
+ List<String> result = Lists.newArrayList();
+ for (Issue issue : validator.validate(resource, CheckMode.ALL, CancelIndicator.NullImpl))
+ result.add(formatIssue(issue));
+ return result;
+ }
+}

Back to the top