summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoritz Eysholdt2011-08-17 05:08:04 (EDT)
committer Ed Merks2011-08-17 05:08:04 (EDT)
commitf8f127b1d3994a26a2dbfbbb7428df6aeb930c76 (patch)
tree5bdd1223ce1c4d60d801ed13e04fc41b054f4510
parentf0dba83165e77178551d235b9a22a93f6d565151 (diff)
downloadorg.eclipse.emf-f8f127b1d3994a26a2dbfbbb7428df6aeb930c76.zip
org.eclipse.emf-f8f127b1d3994a26a2dbfbbb7428df6aeb930c76.tar.gz
org.eclipse.emf-f8f127b1d3994a26a2dbfbbb7428df6aeb930c76.tar.bz2
fixed some validation tests
-rw-r--r--org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-DisjointFeatureAndOperationSignatures.xcore6
-rw-r--r--org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryClass.xcore8
-rw-r--r--org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore5
3 files changed, 4 insertions, 15 deletions
diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-DisjointFeatureAndOperationSignatures.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
index 822f316..71abafc 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-DisjointFeatureAndOperationSignatures.xcore
@@ -1,11 +1,7 @@
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' '
+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
diff --git a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryClass.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryClass.xcore
index f88b757..2d07d98 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryClass.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryClass.xcore
@@ -1,12 +1,8 @@
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''
+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/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
index 0b8a111..e5716eb 100644
--- a/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
+++ b/org.eclipse.emf.ecore.xcore.tests/src/org/eclipse/emf/ecore/xcore/tests/validation/EClass-WellformedMapEntryNoInstanceClassName.xcore
@@ -1,10 +1,7 @@
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
-''
+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