[580143] Diverse ecore/omg/uml tests
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143.ocl
deleted file mode 100644
index ffea757..0000000
--- a/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143.ocl
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore'
-import 'platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore'
-
-package UML
-
-context Operation
-
-def: hasCreateStereo(): Boolean = self.extension_Create->notEmpty()
-
-endpackage
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143ecore.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143ecore.ocl
new file mode 100644
index 0000000..09fe324
--- /dev/null
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143ecore.ocl
@@ -0,0 +1,11 @@
+import 'platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore'
+import 'platform:/plugin/org.eclipse.uml2.uml.profile.standard/model/Standard.ecore'
+
+package UML
+
+context Operation
+
+--def: hasCreateStereo(): Boolean = self.extension_Create->notEmpty()
+def: hasCreateStereo(): Boolean = self.oclExtensions(Standard::Create)->notEmpty()
+
+endpackage
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143omg.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143omg.ocl
new file mode 100644
index 0000000..c5a0f7a
--- /dev/null
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143omg.ocl
@@ -0,0 +1,13 @@
+--import 'http://www.omg.org/spec/UML/20131001/UML.xmi'
+--import 'http://www.omg.org/spec/UML/20131001/StandardProfile.xmi'
+import 'platform:/plugin/org.eclipse.uml2/model/UML.xmi'
+import 'platform:/plugin/org.eclipse.uml2/model/StandardProfile.xmi'
+
+package UML
+
+context Operation
+
+--def: hasCreateStereo(): Boolean = self.extension_Create->notEmpty()
+def: hasCreateStereo(): Boolean = self.oclExtensions(StandardProfile::Create)->notEmpty()
+
+endpackage
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143uml.ocl b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143uml.ocl
new file mode 100644
index 0000000..7927b12
--- /dev/null
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/models/uml/Bug580143uml.ocl
@@ -0,0 +1,11 @@
+import 'http://www.eclipse.org/uml2/5.0.0/UML'
+import 'http://www.eclipse.org/uml2/5.0.0/UML/Profile/Standard'
+
+package UML
+
+context Operation
+
+--def: hasCreateStereo(): Boolean = self.extension_Create->notEmpty()
+def: hasCreateStereo(): Boolean = self.oclExtensions(Standard::Create)->notEmpty()
+
+endpackage
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
index 3b828c8..c0aa6f4 100644
--- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
+++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/test/xtext/LoadTests.java
@@ -1212,11 +1212,33 @@
assertFalse("Bug535712.ocl.oclas should not exist", testFileC2.getFile().exists());
}
- public void testLoad_Bug580143_ocl() throws IOException, InterruptedException {
+ /*
+ * Supporting Stereotypes on Ecore models is an enthusiasm too far.
+ *
+ public void testLoad_Bug580143ecore_ocl() throws IOException, InterruptedException {
UMLStandaloneSetup.init();
OCL ocl = createOCLWithProjectMap();
UMLPackage.eINSTANCE.getClass();
- doLoad(ocl, getTestModelURI("models/uml/Bug580143.ocl"));
+ doLoad(ocl, getTestModelURI("models/uml/Bug580143ecore.ocl"));
+ ocl.dispose();
+ } */
+
+ /*
+ * FIXME we really ought to sort out why UML model names are not redirected to their local models.
+ *
+ public void testLoad_Bug580143omg_ocl() throws IOException, InterruptedException {
+ UMLStandaloneSetup.init();
+ OCL ocl = createOCLWithProjectMap();
+ UMLPackage.eINSTANCE.getClass();
+ doLoad(ocl, getTestModelURI("models/uml/Bug580143omg.ocl"));
+ ocl.dispose();
+ } */
+
+ public void testLoad_Bug580143uml_ocl() throws IOException, InterruptedException {
+ UMLStandaloneSetup.init();
+ OCL ocl = createOCLWithProjectMap();
+ UMLPackage.eINSTANCE.getClass();
+ doLoad(ocl, getTestModelURI("models/uml/Bug580143uml.ocl"));
ocl.dispose();
}
