test: verify multiple inheritance conflict resolution

Outlines solution to #36

test/fixtures/model/multiple-inheritance/base.json

@@ -0,0 +1,17 @@
+{
+  "name": "Multiple Inheritance Base",
+  "uri": "http://multiple-inheritance-base",
+  "prefix": "b",
+  "types": [
+    {
+      "name": "Element",
+      "properties": [
+        { "name": "ownedElement", "type": "b:Element", "isMany": true }
+      ]
+    },
+    {
+      "name": "PackageableElement",
+      "superClass": [ "b:Element" ]
+    }
+  ]
+}

test/fixtures/model/multiple-inheritance/glue.json

@@ -0,0 +1,16 @@
+{
+  "name": "Multiple Inheritance Glue",
+  "uri": "http://multiple-inheritance-glue",
+  "prefix": "g",
+  "types": [
+    {
+      "name": "Diagram",
+      "superClass": [
+        "b:PackageableElement"
+      ],
+      "extends": [
+        "o:Diagram"
+      ]
+    }
+  ]
+}

test/fixtures/model/multiple-inheritance/other.json

@@ -0,0 +1,19 @@
+{
+  "name": "Multiple Inheritance Other",
+  "uri": "http://multiple-inheritance-other",
+  "prefix": "o",
+  "types": [
+    {
+      "name": "DiagramElement",
+      "properties": [
+        { "name": "ownedElement", "type": "DiagramElement", "isMany": true }
+      ]
+    },
+    {
+      "name": "Diagram",
+      "superClass": [
+        "DiagramElement"
+      ]
+    }
+  ]
+}

test/spec/extension.js

@@ -212,6 +212,34 @@ describe('extension', function() {
 
     });
 
+
+    describe('name clashes', function() {
+
+      var model = createModel([
+        'multiple-inheritance/base',
+        'multiple-inheritance/other',
+        'multiple-inheritance/glue'
+      ]);
+
+
+      it('should handle multiple inheritance through virtual package', function() {
+
+        var baseElement = model.create('b:Element');
+
+        var otherElement = model.create('o:DiagramElement');
+
+        var diagram = model.create('o:Diagram', {
+          'b:ownedElement': [ baseElement ],
+          ownedElement: [ otherElement ]
+        });
+
+        // then
+        expect(diagram.$instanceOf('b:Element')).to.be.true;
+        expect(diagram.$instanceOf('o:DiagramElement')).to.be.true;
+      });
+
+    });
+
   });