From ea667639085a39bd63eed1ea9dc0910caba05a05 Mon Sep 17 00:00:00 2001
From: Guillaume Dufour <dufour@magillem.com>
Date: Mon, 31 Oct 2016 21:45:47 +0100
Subject: [PATCH 1/2] #221 Support Package

---
 lib/editors/genmymodel_parser.js        | 31 ++++++++-----
 lib/editors/modelio_parser.js           | 33 ++++++++------
 lib/editors/parser_helper.js            | 18 +++++++-
 lib/editors/umldesigner_parser.js       | 48 +++++++++++---------
 test/editors/genmymodel_parser_test.js  | 18 ++++++++
 test/editors/modelio_parser_test.js     |  2 +-
 test/editors/umldesigner_parser_test.js | 17 +++++++-
 test/xmi/genmymodel_package.xmi         | 58 +++++++++++++++++++++++++
 test/xmi/umldesigner_package.uml        | 33 ++++++++++++++
 9 files changed, 210 insertions(+), 48 deletions(-)
 create mode 100644 test/xmi/genmymodel_package.xmi
 create mode 100644 test/xmi/umldesigner_package.uml

diff --git a/lib/editors/genmymodel_parser.js b/lib/editors/genmymodel_parser.js
index 1478059..66bbea8 100644
--- a/lib/editors/genmymodel_parser.js
+++ b/lib/editors/genmymodel_parser.js
@@ -49,22 +49,31 @@ function initParser(args) {
   parsedData = new ParsedData();
 }
 
+
 function findElements() {
-  for (let i = 0; i < root.packagedElement.length; i++) {
-    let element = root.packagedElement[i];
+  findElementsInNode(root, []);
+}
+
+function findElementsInNode(node, path) {
+  for (let i = 0; i < node.packagedElement.length; i++) {
+    let element = node.packagedElement[i];
+    var indexInfo = {index: i, path: path};
     switch (element.$['xsi:type']) {
     case 'uml:PrimitiveType':
     case 'uml:DataType':
-      rawObjects.rawTypesIndexes.push(i);
+      rawObjects.rawTypesIndexes.push(indexInfo);
       break;
     case 'uml:Enumeration':
-      rawObjects.rawEnumsIndexes.push(i);
+      rawObjects.rawEnumsIndexes.push(indexInfo);
       break;
     case 'uml:Class':
-      rawObjects.rawClassesIndexes.push(i);
+      rawObjects.rawClassesIndexes.push(indexInfo);
       break;
     case 'uml:Association':
-      rawObjects.rawAssociationsIndexes.push(i);
+      rawObjects.rawAssociationsIndexes.push(indexInfo);
+      break;
+    case 'uml:Package':
+      findElementsInNode(element, _.concat(path,i));
       break;
     default:
     }
@@ -73,7 +82,7 @@ function findElements() {
 
 function fillTypes() {
   for (let i = 0; i < rawObjects.rawTypesIndexes.length; i++) {
-    addType(root.packagedElement[rawObjects.rawTypesIndexes[i]]);
+    addType(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawTypesIndexes, i));
   }
 }
 
@@ -96,7 +105,7 @@ function addType(typeElement) {
 
 function fillEnums() {
   for (let i = 0; i < rawObjects.rawEnumsIndexes.length; i++) {
-    addEnum(root.packagedElement[rawObjects.rawEnumsIndexes[i]]);
+    addEnum(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawEnumsIndexes, i));
   }
 }
 
@@ -130,7 +139,7 @@ function getEnumValues(enumElement) {
 
 function fillAssociations() {
   for (let i = 0; i < rawObjects.rawAssociationsIndexes.length; i++) {
-    addAssociation(root.packagedElement[rawObjects.rawAssociationsIndexes[i]]);
+    addAssociation(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawAssociationsIndexes, i));
   }
 }
 
@@ -181,7 +190,7 @@ function getAssociationComments(association) {
     commentInTo: ''
   };
   for (let i = 0; i < association.ownedEnd.length; i++) {
-    comments[(i === 0) ? 'commentInTo' : 'commentInFrom'] = 
+    comments[(i === 0) ? 'commentInTo' : 'commentInFrom'] =
       getComment(association.ownedEnd[i]);
   }
   return comments;
@@ -201,7 +210,7 @@ function getComment(ownedEnd) {
 
 function fillClassesAndFields() {
   for (let i = 0; i < rawObjects.rawClassesIndexes.length; i++) {
-    addClassAndFields(root.packagedElement[rawObjects.rawClassesIndexes[i]]);
+    addClassAndFields(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawClassesIndexes, i));
   }
 }
 
diff --git a/lib/editors/modelio_parser.js b/lib/editors/modelio_parser.js
index c78e2e2..670f8f9 100644
--- a/lib/editors/modelio_parser.js
+++ b/lib/editors/modelio_parser.js
@@ -46,30 +46,35 @@ function initParser(args) {
     rawClassesIndexes: [],
     rawAssociationsIndexes: [],
     rawValidationRulesIndexes: [],
-    rawPackagesIndexes: []
   };
   parsedData = new ParsedData();
 }
 
+
 function findElements() {
-  for (let i = 0; i < root.packagedElement.length; i++) {
-    let element = root.packagedElement[i];
+  findElementsInNode(root, []);
+}
+
+function findElementsInNode(node, path) {
+  for (let i = 0; i < node.packagedElement.length; i++) {
+    let element = node.packagedElement[i];
+    var indexInfo = {index: i, path: path};
     switch (element.$['xmi:type']) {
     case 'uml:PrimitiveType':
-      rawObjects.rawTypesIndexes.push(i);
+      rawObjects.rawTypesIndexes.push(indexInfo);
       break;
     case 'uml:Enumeration':
-      rawObjects.rawEnumsIndexes.push(i);
+      rawObjects.rawEnumsIndexes.push(indexInfo);
       break;
     case 'uml:Class':
-      rawObjects.rawClassesIndexes.push(i);
+      rawObjects.rawClassesIndexes.push(indexInfo);
       break;
     case 'uml:Association':
-      rawObjects.rawAssociationsIndexes.push(i);
-      break;
-    case 'uml:Package':
-      rawObjects.rawPackagesIndexes.push(i);
+      rawObjects.rawAssociationsIndexes.push(indexInfo);
       break;
+      case 'uml:Package':
+        findElementsInNode(element, _.concat(path,i));
+        break;
     default:
     }
   }
@@ -90,7 +95,7 @@ function findConstraints() {
 
 function fillTypes() {
   for (let i = 0; i < rawObjects.rawTypesIndexes.length; i++) {
-    addType(root.packagedElement[rawObjects.rawTypesIndexes[i]]);
+    addType(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawTypesIndexes, i));
   }
 }
 
@@ -113,7 +118,7 @@ function addType(typeElement) {
 
 function fillEnums() {
   for (let i = 0; i < rawObjects.rawEnumsIndexes.length; i++) {
-    addEnum(root.packagedElement[rawObjects.rawEnumsIndexes[i]]);
+    addEnum(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawEnumsIndexes, i));
   }
 }
 
@@ -147,7 +152,7 @@ function getEnumValues(enumElement) {
 
 function fillAssociations() {
   for (let i = 0; i < rawObjects.rawAssociationsIndexes.length; i++) {
-    addAssociation(root.packagedElement[rawObjects.rawAssociationsIndexes[i]]);
+    addAssociation(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawAssociationsIndexes, i));
   }
 }
 
@@ -176,7 +181,7 @@ function addAssociation(associationElement) {
 
 function fillClassesAndFields() {
   for (let i = 0; i < rawObjects.rawClassesIndexes.length; i++) {
-    addClassAndFields(root.packagedElement[rawObjects.rawClassesIndexes[i]]);
+    addClassAndFields(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawClassesIndexes, i));
   }
 }
 
diff --git a/lib/editors/parser_helper.js b/lib/editors/parser_helper.js
index 243907c..0c71a27 100644
--- a/lib/editors/parser_helper.js
+++ b/lib/editors/parser_helper.js
@@ -5,7 +5,8 @@ const _ = require('lodash');
 module.exports = {
   isAnId: isAnId,
   getTypeNameFromURL: getTypeNameFromURL,
-  extractClassName: extractClassName
+  extractClassName: extractClassName,
+  getXmlElementFromRawIndexes : getXmlElementFromRawIndexes
 };
 
 
@@ -47,3 +48,18 @@ function extractClassName(name) {
     ).toLowerCase()
   };
 }
+
+/**
+ * Extract indexInfo in rawIndexes array and use it to get the referenced element
+ * @param rawIndexes array of index info with path and the index in the leaf parent element to access to the element
+ * @param i index of element in rawIndexes
+ * @returns {Object} the xml element
+ */
+function getXmlElementFromRawIndexes(root, rawIndexes, i) {
+  var indexInfo = rawIndexes[i];
+  var parentPackage = root;
+  for (let j = 0; j < indexInfo.path.length; j++) {
+    parentPackage = parentPackage.packagedElement[indexInfo.path[j]];
+  }
+  return parentPackage.packagedElement[indexInfo.index];
+}
diff --git a/lib/editors/umldesigner_parser.js b/lib/editors/umldesigner_parser.js
index 214280c..fbc6b17 100644
--- a/lib/editors/umldesigner_parser.js
+++ b/lib/editors/umldesigner_parser.js
@@ -49,30 +49,38 @@ function initParser(args) {
 }
 
 function findElements() {
-  for (let i = 0; i < root.packagedElement.length; i++) {
-    let element = root.packagedElement[i];
+  findElementsInNode(root, []);
+}
+
+function findElementsInNode(node, path) {
+  for (let i = 0; i < node.packagedElement.length; i++) {
+    let element = node.packagedElement[i];
+    var indexInfo = {index: i, path: path};
     switch (element.$['xmi:type']) {
-    case 'uml:PrimitiveType':
-    case 'uml:DataType':
-      rawObjects.rawTypesIndexes.push(i);
-      break;
-    case 'uml:Enumeration':
-      rawObjects.rawEnumsIndexes.push(i);
-      break;
-    case 'uml:Class':
-      rawObjects.rawClassesIndexes.push(i);
-      break;
-    case 'uml:Association':
-      rawObjects.rawAssociationsIndexes.push(i);
-      break;
-    default:
+      case 'uml:PrimitiveType':
+      case 'uml:DataType':
+        rawObjects.rawTypesIndexes.push(indexInfo);
+        break;
+      case 'uml:Enumeration':
+        rawObjects.rawEnumsIndexes.push(indexInfo);
+        break;
+      case 'uml:Class':
+        rawObjects.rawClassesIndexes.push(indexInfo);
+        break;
+      case 'uml:Association':
+        rawObjects.rawAssociationsIndexes.push(indexInfo);
+        break;
+      case 'uml:Package':
+        findElementsInNode(element, _.concat(path,i));
+        break;
+      default:
     }
   }
 }
 
 function fillTypes() {
   for (let i = 0; i < rawObjects.rawTypesIndexes.length; i++) {
-    addType(root.packagedElement[rawObjects.rawTypesIndexes[i]]);
+      addType(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawTypesIndexes, i));
   }
 }
 
@@ -95,7 +103,7 @@ function addType(typeElement) {
 
 function fillEnums() {
   for (let i = 0; i < rawObjects.rawEnumsIndexes.length; i++) {
-    addEnum(root.packagedElement[rawObjects.rawEnumsIndexes[i]]);
+    addEnum(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawEnumsIndexes, i));
   }
 }
 
@@ -129,7 +137,7 @@ function getEnumValues(enumElement) {
 
 function fillClassesAndFields() {
   for (let i = 0; i < rawObjects.rawClassesIndexes.length; i++) {
-    addClassAndFields(root.packagedElement[rawObjects.rawClassesIndexes[i]]);
+    addClassAndFields(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawClassesIndexes, i));
   }
 }
 
@@ -223,7 +231,7 @@ function addRegularField(element, classId) {
 
 function fillAssociations() {
   for (let i = 0; i < rawObjects.rawAssociationsIndexes.length; i++) {
-    addAssociation(root.packagedElement[rawObjects.rawAssociationsIndexes[i]]);
+    addAssociation(parser_helper.getXmlElementFromRawIndexes(root, rawObjects.rawAssociationsIndexes, i));
   }
 }
 
diff --git a/test/editors/genmymodel_parser_test.js b/test/editors/genmymodel_parser_test.js
index 6884391..7f134ae 100644
--- a/test/editors/genmymodel_parser_test.js
+++ b/test/editors/genmymodel_parser_test.js
@@ -272,6 +272,24 @@ describe('GenMyModelParser', () => {
         });
       });
     });
+    describe('with package', () => {
+      var parserData = ParserFactory.createParser({
+        file: './test/xmi/genmymodel_package.xmi',
+        databaseType: 'sql'
+      });
+      var parser = parserData.parser;
+      var parsedData = parser.parse(parserData.data);
+
+      it('parses it', () => {
+        expect(parsedData).not.to.be.null;
+      });
+      it('includes classes in package', () => {
+        expect(parsedData.classes['_54pHLZ-oEeawbN_F_HFDxg']).not.to.be.null;
+        expect(parsedData.classes['_54pHQJ-oEeawbN_F_HFDxg']).not.to.be.null;
+        expect(parsedData.classNames).to.deep.eq(['A','B']);
+      });
+    });
+
   });
   describe('when passing an invalid diagram', () => {
     describe('as a class has no name', () => {
diff --git a/test/editors/modelio_parser_test.js b/test/editors/modelio_parser_test.js
index f5c6205..0296ed1 100644
--- a/test/editors/modelio_parser_test.js
+++ b/test/editors/modelio_parser_test.js
@@ -290,7 +290,7 @@ describe('ModelioParser', () => {
         expect(parsedData).not.to.be.null;
       });
       it('works by adding all the classes', () => {
-        expect(parsedData.classNames).to.deep.eq(['Class2']);
+        expect(parsedData.classNames).to.deep.eq(['Class1', 'Class3', 'Class2']);
       });
     });
   });
diff --git a/test/editors/umldesigner_parser_test.js b/test/editors/umldesigner_parser_test.js
index caebba0..82591e2 100644
--- a/test/editors/umldesigner_parser_test.js
+++ b/test/editors/umldesigner_parser_test.js
@@ -19,7 +19,7 @@ describe('UMLDesignerParser', () => {
         root: getRootElement(readFileContent('./test/xmi/umldesigner.uml')),
         databaseTypes: initDatabaseTypeHolder(DatabaseTypes.sql)
       });
-      
+
       it('parses it', () => {
         expect(parsedData).not.to.be.null;
       });
@@ -356,6 +356,21 @@ This <b>sucks</b>.`
         }
       });
     });
+    describe('with a user package', () => {
+      var parsedData = UMLDesignerParser.parse({
+        root: getRootElement(readFileContent('./test/xmi/umldesigner_package.uml')),
+        databaseTypes: initDatabaseTypeHolder(DatabaseTypes.sql)
+      });
+
+      it('parses it', () => {
+        expect(parsedData).not.to.be.null;
+      });
+      it('includes classes in package', () => {
+        expect(parsedData.classes['_wx0Db4PVEeaFY_lPQPbINQ']).not.to.be.null;
+        expect(parsedData.classes['_wx0DdoPVEeaFY_lPQPbINQ']).not.to.be.null;
+        expect(parsedData.classNames).to.deep.eq(['A','B']);
+      });
+    });
   });
 });
 
diff --git a/test/xmi/genmymodel_package.xmi b/test/xmi/genmymodel_package.xmi
new file mode 100644
index 0000000..356b1a9
--- /dev/null
+++ b/test/xmi/genmymodel_package.xmi
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_54pHIJ-oEeawbN_F_HFDxg" name="model">
+  <eAnnotations xmi:id="_54pHIZ-oEeawbN_F_HFDxg" source="genmymodel">
+    <details xmi:id="_54pHIp-oEeawbN_F_HFDxg" key="uuid" value="_kYuB4J-oEeawbN_F_HFDxg"/>
+    <details xmi:id="_54pHI5-oEeawbN_F_HFDxg" key="author" value="Dufgui"/>
+  </eAnnotations>
+  <packageImport xmi:id="_54pHJJ-oEeawbN_F_HFDxg">
+    <eAnnotations xmi:id="_54pHJZ-oEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_54pHJp-oEeawbN_F_HFDxg" key="uuid" value="_kYuB4Z-oEeawbN_F_HFDxg"/>
+    </eAnnotations>
+    <importedPackage href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#/"/>
+  </packageImport>
+  <packageImport xmi:id="_54pHJ5-oEeawbN_F_HFDxg">
+    <eAnnotations xmi:id="_54pHKJ-oEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_54pHKZ-oEeawbN_F_HFDxg" key="uuid" value="_kYuo8J-oEeawbN_F_HFDxg"/>
+    </eAnnotations>
+    <importedPackage href="pathmap://GENMYMODEL_LIBRARIES/GenMyModelPrimitiveTypes.library.uml#/"/>
+  </packageImport>
+  <packagedElement xsi:type="uml:Package" xmi:id="_54pHKp-oEeawbN_F_HFDxg" name="jhipsterPackage">
+    <eAnnotations xmi:id="_54pHK5-oEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_54pHLJ-oEeawbN_F_HFDxg" key="uuid" value="_mTywsIHWEDSGzr-EIvwYWA"/>
+    </eAnnotations>
+    <packagedElement xsi:type="uml:Class" xmi:id="_54pHLZ-oEeawbN_F_HFDxg" name="A">
+      <eAnnotations xmi:id="_54pHLp-oEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_54pHL5-oEeawbN_F_HFDxg" key="uuid" value="_oVnegIHWEDSGzr-EIvwYWA"/>
+      </eAnnotations>
+    </packagedElement>
+    <packagedElement xsi:type="uml:Association" xmi:id="_54pHMJ-oEeawbN_F_HFDxg" name="A_B" memberEnd="_54pHOJ-oEeawbN_F_HFDxg _54pHM5-oEeawbN_F_HFDxg" navigableOwnedEnd="_54pHM5-oEeawbN_F_HFDxg _54pHOJ-oEeawbN_F_HFDxg">
+      <eAnnotations xmi:id="_54pHMZ-oEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_54pHMp-oEeawbN_F_HFDxg" key="uuid" value="_raCRwIHWEDSGzr-EIvwYWA"/>
+      </eAnnotations>
+      <ownedEnd xmi:id="_54pHM5-oEeawbN_F_HFDxg" name="b" type="_54pHQJ-oEeawbN_F_HFDxg" association="_54pHMJ-oEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_54pHNJ-oEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_54pHNZ-oEeawbN_F_HFDxg" key="uuid" value="_rZ-nYIHWEDSGzr-EIvwYWA"/>
+        </eAnnotations>
+        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_54pHNp-oEeawbN_F_HFDxg"/>
+        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_54pHN5-oEeawbN_F_HFDxg" value="*"/>
+      </ownedEnd>
+      <ownedEnd xmi:id="_54pHOJ-oEeawbN_F_HFDxg" name="a" type="_54pHLZ-oEeawbN_F_HFDxg" association="_54pHMJ-oEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_54pHOZ-oEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_54pHOp-oEeawbN_F_HFDxg" key="uuid" value="_raBDoIHWEDSGzr-EIvwYWA"/>
+        </eAnnotations>
+        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_54pHO5-oEeawbN_F_HFDxg"/>
+        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_54pHPJ-oEeawbN_F_HFDxg" value="1"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xsi:type="uml:Package" xmi:id="_54pHPZ-oEeawbN_F_HFDxg" name="mypackage">
+      <eAnnotations xmi:id="_54pHPp-oEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_54pHP5-oEeawbN_F_HFDxg" key="uuid" value="_u2xeYIHWEDSGzr-EIvwYWA"/>
+      </eAnnotations>
+      <packagedElement xsi:type="uml:Class" xmi:id="_54pHQJ-oEeawbN_F_HFDxg" name="B">
+        <eAnnotations xmi:id="_54pHQZ-oEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_54pHQp-oEeawbN_F_HFDxg" key="uuid" value="_pSpHcIHWEDSGzr-EIvwYWA"/>
+        </eAnnotations>
+      </packagedElement>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>
diff --git a/test/xmi/umldesigner_package.uml b/test/xmi/umldesigner_package.uml
new file mode 100644
index 0000000..3adb1fa
--- /dev/null
+++ b/test/xmi/umldesigner_package.uml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_wxy1EIPVEeaFY_lPQPbINQ" name="Model">
+  <packageImport xmi:id="_wxy1EYPVEeaFY_lPQPbINQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+  <packagedElement xmi:type="uml:Association" xmi:id="_BvBzYIS0Eea1grRuuvivtw" memberEnd="_BvBzYYS0Eea1grRuuvivtw _BvCacYS0Eea1grRuuvivtw" navigableOwnedEnd="_BvBzYYS0Eea1grRuuvivtw _BvCacYS0Eea1grRuuvivtw">
+    <name xsi:nil="true"/>
+    <ownedEnd xmi:id="_BvBzYYS0Eea1grRuuvivtw" name="a" type="_wx0Db4PVEeaFY_lPQPbINQ" association="_BvBzYIS0Eea1grRuuvivtw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BvBzYoS0Eea1grRuuvivtw" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BvCacIS0Eea1grRuuvivtw" value="1"/>
+    </ownedEnd>
+    <ownedEnd xmi:id="_BvCacYS0Eea1grRuuvivtw" name="bList" type="_wx0DdoPVEeaFY_lPQPbINQ" association="_BvBzYIS0Eea1grRuuvivtw">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BvCacoS0Eea1grRuuvivtw"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BvCac4S0Eea1grRuuvivtw" value="*"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_OkvVEJ7gEeaOIbkK8EIfDQ" name="JhipsterPackage">
+    <packagedElement xmi:type="uml:Class" xmi:id="_wx0Db4PVEeaFY_lPQPbINQ" name="A">
+      <ownedAttribute xmi:id="_wx0DcIPVEeaFY_lPQPbINQ" name="name" isOrdered="true">
+        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wx0DcYPVEeaFY_lPQPbINQ"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_YTipwJ7tEeaOQJvdF4PBWw" name="SubPackage">
+      <packagedElement xmi:type="uml:Class" xmi:id="_wx0DdoPVEeaFY_lPQPbINQ" name="B">
+        <ownedAttribute xmi:id="_wx0Dd4PVEeaFY_lPQPbINQ" name="name" isOrdered="true">
+          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#String"/>
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wx0DeIPVEeaFY_lPQPbINQ"/>
+        </ownedAttribute>
+      </packagedElement>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>

From fe33c71c11e90f4fdffaa7dafec34730143cf7ee Mon Sep 17 00:00:00 2001
From: Guillaume Dufour <dufour@magillem.com>
Date: Thu, 3 Nov 2016 00:32:28 +0100
Subject: [PATCH 2/2] #221 Support Package add unit test

---
 test/editors/genmymodel_parser_test.js  |  7 +-
 test/editors/modelio_parser_test.js     | 51 +++++++++++---
 test/editors/parser_helper_test.js      | 14 +++-
 test/editors/umldesigner_parser_test.js |  5 +-
 test/xmi/genmymodel_package.xmi         | 90 +++++++++++++++----------
 test/xmi/modelio_packages2.xmi          | 39 +++++++++++
 test/xmi/umldesigner_package.uml        | 56 +++++++--------
 7 files changed, 184 insertions(+), 78 deletions(-)
 create mode 100644 test/xmi/modelio_packages2.xmi

diff --git a/test/editors/genmymodel_parser_test.js b/test/editors/genmymodel_parser_test.js
index 7f134ae..4cfd47f 100644
--- a/test/editors/genmymodel_parser_test.js
+++ b/test/editors/genmymodel_parser_test.js
@@ -284,12 +284,13 @@ describe('GenMyModelParser', () => {
         expect(parsedData).not.to.be.null;
       });
       it('includes classes in package', () => {
-        expect(parsedData.classes['_54pHLZ-oEeawbN_F_HFDxg']).not.to.be.null;
-        expect(parsedData.classes['_54pHQJ-oEeawbN_F_HFDxg']).not.to.be.null;
+        expect(parsedData.classes['_z3DqLaFTEeawbN_F_HFDxg']).not.to.be.null;
+        expect(parsedData.classes['_z3DqQ6FTEeawbN_F_HFDxg']).not.to.be.null;
         expect(parsedData.classNames).to.deep.eq(['A','B']);
+        expect(parsedData.enums['_z3DqRqFTEeawbN_F_HFDxg']).not.to.be.null;
+        expect(parsedData.associations['_z3DqM6FTEeawbN_F_HFDxg']).not.to.be.null;
       });
     });
-
   });
   describe('when passing an invalid diagram', () => {
     describe('as a class has no name', () => {
diff --git a/test/editors/modelio_parser_test.js b/test/editors/modelio_parser_test.js
index 0296ed1..29b9444 100644
--- a/test/editors/modelio_parser_test.js
+++ b/test/editors/modelio_parser_test.js
@@ -279,18 +279,49 @@ describe('ModelioParser', () => {
       });
     });
     describe('with packages', () => {
-      var parserData = ParserFactory.createParser({
-        file: './test/xmi/modelio_packages.xmi',
-        databaseType: 'sql'
-      });
-      var parser = parserData.parser;
-      var parsedData = parser.parse(parserData.data);
+      describe('simple model', () => {
+        var parserData = ParserFactory.createParser({
+          file: './test/xmi/modelio_packages.xmi',
+          databaseType: 'sql'
+        });
+        var parser = parserData.parser;
+        var parsedData = parser.parse(parserData.data);
 
-      it('parses it', () => {
-        expect(parsedData).not.to.be.null;
+        it('parses it', () => {
+          expect(parsedData).not.to.be.null;
+        });
+        it('works by adding all the classes', () => {
+          expect(parsedData.classNames).to.deep.eq(['Class1', 'Class3', 'Class2']);
+          expect(parsedData.classes['_vC4sxHdfEeaWkfx80xqrTw']).not.to.be.null;
+          expect(parsedData.classes['_vC4syndfEeaWkfx80xqrTw']).not.to.be.null;
+          expect(parsedData.classes['_vC4sz3dfEeaWkfx80xqrTw']).not.to.be.null;
+          expect(parsedData.associations['_vC4sx3dfEeaWkfx80xqrTw']).not.to.be.null;
+          expect(parsedData.associations['_vC4szXdfEeaWkfx80xqrTw']).not.to.be.null;
+
+        });
       });
-      it('works by adding all the classes', () => {
-        expect(parsedData.classNames).to.deep.eq(['Class1', 'Class3', 'Class2']);
+      describe('more complex model', () => {
+        var parserData = ParserFactory.createParser({
+          file: './test/xmi/modelio_packages2.xmi',
+          databaseType: 'sql'
+        });
+        var parser = parserData.parser;
+        var parsedData = parser.parse(parserData.data);
+
+        it('parses it', () => {
+          expect(parsedData).not.to.be.null;
+        });
+        it('works by adding all the classes', () => {
+          expect(parsedData.classNames).to.deep.eq(['Class1', 'Class3', 'Class2']);
+          expect(parsedData.classes['_bYuIdaFSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.classes['_bYuviqFSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.classes['_bYuvj6FSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.enums['_bYuvi6FSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.associations['_bYuvhaFSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.associations['_bYuvg6FSEeaVvapPODu8lg']).not.to.be.null;
+          expect(parsedData.associations['_bYuvh6FSEeaVvapPODu8lg']).not.to.be.null;
+
+        });
       });
     });
   });
diff --git a/test/editors/parser_helper_test.js b/test/editors/parser_helper_test.js
index 4fb4817..0eaa3e7 100644
--- a/test/editors/parser_helper_test.js
+++ b/test/editors/parser_helper_test.js
@@ -2,7 +2,8 @@
 
 var expect = require('chai').expect,
     isAnId = require('../../lib/editors/parser_helper').isAnId,
-    extractClassName = require('../../lib/editors/parser_helper').extractClassName;
+    extractClassName = require('../../lib/editors/parser_helper').extractClassName,
+    getXmlElementFromRawIndexes = require('../../lib/editors/parser_helper').getXmlElementFromRawIndexes;
 
 describe('ParserHelper', () => {
   describe('#isAnId', () => {
@@ -37,4 +38,15 @@ describe('ParserHelper', () => {
       });
     });
   });
+  describe('#getXmlElementFromRawIndexes', () => {
+    var root = { packagedElement : [{dumb: 'dumb'}, { packagedElement: [{dumb: 'dumb'},{dumb: 'dumb'},{dumb: 'good'}]}]};
+    var rawIndexes = [{index: 2, path: [1]}];
+    var i = 0;
+    var xmlElt = getXmlElementFromRawIndexes(root, rawIndexes, i);
+
+    it('returns the right element', () => {
+      expect(xmlElt.dumb).to.eq('good');
+    });
+  });
+
 });
diff --git a/test/editors/umldesigner_parser_test.js b/test/editors/umldesigner_parser_test.js
index 82591e2..764d177 100644
--- a/test/editors/umldesigner_parser_test.js
+++ b/test/editors/umldesigner_parser_test.js
@@ -368,7 +368,10 @@ This <b>sucks</b>.`
       it('includes classes in package', () => {
         expect(parsedData.classes['_wx0Db4PVEeaFY_lPQPbINQ']).not.to.be.null;
         expect(parsedData.classes['_wx0DdoPVEeaFY_lPQPbINQ']).not.to.be.null;
-        expect(parsedData.classNames).to.deep.eq(['A','B']);
+        expect(parsedData.classNames).to.deep.eq(['B','A']);
+        expect(parsedData.enums['_dRpdIKFLEeaWHdu8QjKipg']).not.to.be.null;
+        expect(parsedData.associations['_vB6ZwKFLEeaWHdu8QjKipg']).not.to.be.null;
+        expect(parsedData.associations['_9ZrJgKFLEeaWHdu8QjKipg']).not.to.be.null;
       });
     });
   });
diff --git a/test/xmi/genmymodel_package.xmi b/test/xmi/genmymodel_package.xmi
index 356b1a9..2aad860 100644
--- a/test/xmi/genmymodel_package.xmi
+++ b/test/xmi/genmymodel_package.xmi
@@ -1,58 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_54pHIJ-oEeawbN_F_HFDxg" name="model">
-  <eAnnotations xmi:id="_54pHIZ-oEeawbN_F_HFDxg" source="genmymodel">
-    <details xmi:id="_54pHIp-oEeawbN_F_HFDxg" key="uuid" value="_kYuB4J-oEeawbN_F_HFDxg"/>
-    <details xmi:id="_54pHI5-oEeawbN_F_HFDxg" key="author" value="Dufgui"/>
+<uml:Model xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_z3DqIKFTEeawbN_F_HFDxg" name="model">
+  <eAnnotations xmi:id="_z3DqIaFTEeawbN_F_HFDxg" source="genmymodel">
+    <details xmi:id="_z3DqIqFTEeawbN_F_HFDxg" key="uuid" value="_kYuB4J-oEeawbN_F_HFDxg"/>
+    <details xmi:id="_z3DqI6FTEeawbN_F_HFDxg" key="author" value="Dufgui"/>
   </eAnnotations>
-  <packageImport xmi:id="_54pHJJ-oEeawbN_F_HFDxg">
-    <eAnnotations xmi:id="_54pHJZ-oEeawbN_F_HFDxg" source="genmymodel">
-      <details xmi:id="_54pHJp-oEeawbN_F_HFDxg" key="uuid" value="_kYuB4Z-oEeawbN_F_HFDxg"/>
+  <packageImport xmi:id="_z3DqJKFTEeawbN_F_HFDxg">
+    <eAnnotations xmi:id="_z3DqJaFTEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_z3DqJqFTEeawbN_F_HFDxg" key="uuid" value="_kYuB4Z-oEeawbN_F_HFDxg"/>
     </eAnnotations>
     <importedPackage href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#/"/>
   </packageImport>
-  <packageImport xmi:id="_54pHJ5-oEeawbN_F_HFDxg">
-    <eAnnotations xmi:id="_54pHKJ-oEeawbN_F_HFDxg" source="genmymodel">
-      <details xmi:id="_54pHKZ-oEeawbN_F_HFDxg" key="uuid" value="_kYuo8J-oEeawbN_F_HFDxg"/>
+  <packageImport xmi:id="_z3DqJ6FTEeawbN_F_HFDxg">
+    <eAnnotations xmi:id="_z3DqKKFTEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_z3DqKaFTEeawbN_F_HFDxg" key="uuid" value="_kYuo8J-oEeawbN_F_HFDxg"/>
     </eAnnotations>
     <importedPackage href="pathmap://GENMYMODEL_LIBRARIES/GenMyModelPrimitiveTypes.library.uml#/"/>
   </packageImport>
-  <packagedElement xsi:type="uml:Package" xmi:id="_54pHKp-oEeawbN_F_HFDxg" name="jhipsterPackage">
-    <eAnnotations xmi:id="_54pHK5-oEeawbN_F_HFDxg" source="genmymodel">
-      <details xmi:id="_54pHLJ-oEeawbN_F_HFDxg" key="uuid" value="_mTywsIHWEDSGzr-EIvwYWA"/>
+  <packagedElement xsi:type="uml:Package" xmi:id="_z3DqKqFTEeawbN_F_HFDxg" name="jhipsterPackage">
+    <eAnnotations xmi:id="_z3DqK6FTEeawbN_F_HFDxg" source="genmymodel">
+      <details xmi:id="_z3DqLKFTEeawbN_F_HFDxg" key="uuid" value="_mTywsIHWEDSGzr-EIvwYWA"/>
     </eAnnotations>
-    <packagedElement xsi:type="uml:Class" xmi:id="_54pHLZ-oEeawbN_F_HFDxg" name="A">
-      <eAnnotations xmi:id="_54pHLp-oEeawbN_F_HFDxg" source="genmymodel">
-        <details xmi:id="_54pHL5-oEeawbN_F_HFDxg" key="uuid" value="_oVnegIHWEDSGzr-EIvwYWA"/>
+    <packagedElement xsi:type="uml:Class" xmi:id="_z3DqLaFTEeawbN_F_HFDxg" name="A">
+      <eAnnotations xmi:id="_z3DqLqFTEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_z3DqL6FTEeawbN_F_HFDxg" key="uuid" value="_oVnegIHWEDSGzr-EIvwYWA"/>
       </eAnnotations>
+      <ownedAttribute xmi:id="_z3DqMKFTEeawbN_F_HFDxg" name="testEnum" type="_z3DqRqFTEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_z3DqMaFTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqMqFTEeawbN_F_HFDxg" key="uuid" value="_r1o6oIOBEDS157ozcj18oQ"/>
+        </eAnnotations>
+      </ownedAttribute>
     </packagedElement>
-    <packagedElement xsi:type="uml:Association" xmi:id="_54pHMJ-oEeawbN_F_HFDxg" name="A_B" memberEnd="_54pHOJ-oEeawbN_F_HFDxg _54pHM5-oEeawbN_F_HFDxg" navigableOwnedEnd="_54pHM5-oEeawbN_F_HFDxg _54pHOJ-oEeawbN_F_HFDxg">
-      <eAnnotations xmi:id="_54pHMZ-oEeawbN_F_HFDxg" source="genmymodel">
-        <details xmi:id="_54pHMp-oEeawbN_F_HFDxg" key="uuid" value="_raCRwIHWEDSGzr-EIvwYWA"/>
+    <packagedElement xsi:type="uml:Association" xmi:id="_z3DqM6FTEeawbN_F_HFDxg" name="A_B" memberEnd="_z3DqNqFTEeawbN_F_HFDxg _z3DqO6FTEeawbN_F_HFDxg" navigableOwnedEnd="_z3DqNqFTEeawbN_F_HFDxg _z3DqO6FTEeawbN_F_HFDxg">
+      <eAnnotations xmi:id="_z3DqNKFTEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_z3DqNaFTEeawbN_F_HFDxg" key="uuid" value="_raCRwIHWEDSGzr-EIvwYWA"/>
       </eAnnotations>
-      <ownedEnd xmi:id="_54pHM5-oEeawbN_F_HFDxg" name="b" type="_54pHQJ-oEeawbN_F_HFDxg" association="_54pHMJ-oEeawbN_F_HFDxg">
-        <eAnnotations xmi:id="_54pHNJ-oEeawbN_F_HFDxg" source="genmymodel">
-          <details xmi:id="_54pHNZ-oEeawbN_F_HFDxg" key="uuid" value="_rZ-nYIHWEDSGzr-EIvwYWA"/>
+      <ownedEnd xmi:id="_z3DqNqFTEeawbN_F_HFDxg" name="b" type="_z3DqQ6FTEeawbN_F_HFDxg" association="_z3DqM6FTEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_z3DqN6FTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqOKFTEeawbN_F_HFDxg" key="uuid" value="_rZ-nYIHWEDSGzr-EIvwYWA"/>
         </eAnnotations>
-        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_54pHNp-oEeawbN_F_HFDxg"/>
-        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_54pHN5-oEeawbN_F_HFDxg" value="*"/>
+        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_z3DqOaFTEeawbN_F_HFDxg"/>
+        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3DqOqFTEeawbN_F_HFDxg" value="*"/>
       </ownedEnd>
-      <ownedEnd xmi:id="_54pHOJ-oEeawbN_F_HFDxg" name="a" type="_54pHLZ-oEeawbN_F_HFDxg" association="_54pHMJ-oEeawbN_F_HFDxg">
-        <eAnnotations xmi:id="_54pHOZ-oEeawbN_F_HFDxg" source="genmymodel">
-          <details xmi:id="_54pHOp-oEeawbN_F_HFDxg" key="uuid" value="_raBDoIHWEDSGzr-EIvwYWA"/>
+      <ownedEnd xmi:id="_z3DqO6FTEeawbN_F_HFDxg" name="a" type="_z3DqLaFTEeawbN_F_HFDxg" association="_z3DqM6FTEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_z3DqPKFTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqPaFTEeawbN_F_HFDxg" key="uuid" value="_raBDoIHWEDSGzr-EIvwYWA"/>
         </eAnnotations>
-        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_54pHO5-oEeawbN_F_HFDxg"/>
-        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_54pHPJ-oEeawbN_F_HFDxg" value="1"/>
+        <lowerValue xsi:type="uml:LiteralInteger" xmi:id="_z3DqPqFTEeawbN_F_HFDxg"/>
+        <upperValue xsi:type="uml:LiteralUnlimitedNatural" xmi:id="_z3DqP6FTEeawbN_F_HFDxg" value="1"/>
       </ownedEnd>
     </packagedElement>
-    <packagedElement xsi:type="uml:Package" xmi:id="_54pHPZ-oEeawbN_F_HFDxg" name="mypackage">
-      <eAnnotations xmi:id="_54pHPp-oEeawbN_F_HFDxg" source="genmymodel">
-        <details xmi:id="_54pHP5-oEeawbN_F_HFDxg" key="uuid" value="_u2xeYIHWEDSGzr-EIvwYWA"/>
+    <packagedElement xsi:type="uml:Package" xmi:id="_z3DqQKFTEeawbN_F_HFDxg" name="mypackage">
+      <eAnnotations xmi:id="_z3DqQaFTEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_z3DqQqFTEeawbN_F_HFDxg" key="uuid" value="_u2xeYIHWEDSGzr-EIvwYWA"/>
       </eAnnotations>
-      <packagedElement xsi:type="uml:Class" xmi:id="_54pHQJ-oEeawbN_F_HFDxg" name="B">
-        <eAnnotations xmi:id="_54pHQZ-oEeawbN_F_HFDxg" source="genmymodel">
-          <details xmi:id="_54pHQp-oEeawbN_F_HFDxg" key="uuid" value="_pSpHcIHWEDSGzr-EIvwYWA"/>
+      <packagedElement xsi:type="uml:Class" xmi:id="_z3DqQ6FTEeawbN_F_HFDxg" name="B">
+        <eAnnotations xmi:id="_z3DqRKFTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqRaFTEeawbN_F_HFDxg" key="uuid" value="_pSpHcIHWEDSGzr-EIvwYWA"/>
         </eAnnotations>
       </packagedElement>
     </packagedElement>
+    <packagedElement xsi:type="uml:Enumeration" xmi:id="_z3DqRqFTEeawbN_F_HFDxg" name="MyEnumeration">
+      <eAnnotations xmi:id="_z3DqR6FTEeawbN_F_HFDxg" source="genmymodel">
+        <details xmi:id="_z3DqSKFTEeawbN_F_HFDxg" key="uuid" value="_iUVjgIOBEDS157ozcj18oQ"/>
+      </eAnnotations>
+      <ownedLiteral xmi:id="_z3DqSaFTEeawbN_F_HFDxg" name="TOTO" classifier="_z3DqRqFTEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_z3DqSqFTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqS6FTEeawbN_F_HFDxg" key="uuid" value="_ji5oYIOBEDS157ozcj18oQ"/>
+        </eAnnotations>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_z3DqTKFTEeawbN_F_HFDxg" name="TITI" classifier="_z3DqRqFTEeawbN_F_HFDxg">
+        <eAnnotations xmi:id="_z3DqTaFTEeawbN_F_HFDxg" source="genmymodel">
+          <details xmi:id="_z3DqTqFTEeawbN_F_HFDxg" key="uuid" value="_kd9icIOBEDS157ozcj18oQ"/>
+        </eAnnotations>
+      </ownedLiteral>
+    </packagedElement>
   </packagedElement>
 </uml:Model>
diff --git a/test/xmi/modelio_packages2.xmi b/test/xmi/modelio_packages2.xmi
new file mode 100644
index 0000000..35a8ca8
--- /dev/null
+++ b/test/xmi/modelio_packages2.xmi
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:uml="http://www.eclipse.org/uml2/3.0.0/UML" xmi:id="_bYuIcKFSEeaVvapPODu8lg" name="project1">
+  <eAnnotations xmi:id="_bYuIcaFSEeaVvapPODu8lg" source="Objing">
+    <contents xmi:type="uml:Property" xmi:id="_bYuIcqFSEeaVvapPODu8lg" name="exporterVersion">
+      <defaultValue xmi:type="uml:LiteralString" xmi:id="_bYuIc6FSEeaVvapPODu8lg" value="3.0.0"/>
+    </contents>
+  </eAnnotations>
+  <packagedElement xmi:type="uml:Package" xmi:id="_bYuIdKFSEeaVvapPODu8lg" name="mypackage">
+    <packagedElement xmi:type="uml:Class" xmi:id="_bYuIdaFSEeaVvapPODu8lg" name="Class1">
+      <ownedAttribute xmi:id="_bYuIdqFSEeaVvapPODu8lg" name="class2" visibility="public" type="_bYuvj6FSEeaVvapPODu8lg" aggregation="composite" association="_bYuvg6FSEeaVvapPODu8lg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bYuId6FSEeaVvapPODu8lg"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_bYuIeKFSEeaVvapPODu8lg" name="class3" visibility="public" type="_bYuviqFSEeaVvapPODu8lg" aggregation="composite" association="_bYuvhaFSEeaVvapPODu8lg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bYuvgKFSEeaVvapPODu8lg"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_bYuvgaFSEeaVvapPODu8lg" name="enumeration1" visibility="public" type="_bYuvi6FSEeaVvapPODu8lg" aggregation="composite" association="_bYuvh6FSEeaVvapPODu8lg">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_bYuvgqFSEeaVvapPODu8lg"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_bYuvg6FSEeaVvapPODu8lg" memberEnd="_bYuIdqFSEeaVvapPODu8lg _bYuvhKFSEeaVvapPODu8lg">
+      <ownedEnd xmi:id="_bYuvhKFSEeaVvapPODu8lg" visibility="public" type="_bYuIdaFSEeaVvapPODu8lg" association="_bYuvg6FSEeaVvapPODu8lg"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_bYuvhaFSEeaVvapPODu8lg" memberEnd="_bYuIeKFSEeaVvapPODu8lg _bYuvhqFSEeaVvapPODu8lg">
+      <ownedEnd xmi:id="_bYuvhqFSEeaVvapPODu8lg" visibility="public" type="_bYuIdaFSEeaVvapPODu8lg" association="_bYuvhaFSEeaVvapPODu8lg"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_bYuvh6FSEeaVvapPODu8lg" memberEnd="_bYuvgaFSEeaVvapPODu8lg _bYuviKFSEeaVvapPODu8lg">
+      <ownedEnd xmi:id="_bYuviKFSEeaVvapPODu8lg" visibility="public" type="_bYuIdaFSEeaVvapPODu8lg" association="_bYuvh6FSEeaVvapPODu8lg"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Package" xmi:id="_bYuviaFSEeaVvapPODu8lg" name="myotherpackage">
+      <packagedElement xmi:type="uml:Class" xmi:id="_bYuviqFSEeaVvapPODu8lg" name="Class3"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_bYuvi6FSEeaVvapPODu8lg" name="Enumeration1">
+      <ownedLiteral xmi:id="_bYuvjKFSEeaVvapPODu8lg" name="TOTO"/>
+      <ownedLiteral xmi:id="_bYuvjaFSEeaVvapPODu8lg" name="TATA"/>
+      <ownedLiteral xmi:id="_bYuvjqFSEeaVvapPODu8lg" name="TITI"/>
+    </packagedElement>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_bYuvj6FSEeaVvapPODu8lg" name="Class2"/>
+</uml:Model>
diff --git a/test/xmi/umldesigner_package.uml b/test/xmi/umldesigner_package.uml
index 3adb1fa..ae004dc 100644
--- a/test/xmi/umldesigner_package.uml
+++ b/test/xmi/umldesigner_package.uml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_wxy1EIPVEeaFY_lPQPbINQ" name="Model">
-  <packageImport xmi:id="_wxy1EYPVEeaFY_lPQPbINQ">
-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#_0"/>
-  </packageImport>
-  <packagedElement xmi:type="uml:Association" xmi:id="_BvBzYIS0Eea1grRuuvivtw" memberEnd="_BvBzYYS0Eea1grRuuvivtw _BvCacYS0Eea1grRuuvivtw" navigableOwnedEnd="_BvBzYYS0Eea1grRuuvivtw _BvCacYS0Eea1grRuuvivtw">
-    <name xsi:nil="true"/>
-    <ownedEnd xmi:id="_BvBzYYS0Eea1grRuuvivtw" name="a" type="_wx0Db4PVEeaFY_lPQPbINQ" association="_BvBzYIS0Eea1grRuuvivtw">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BvBzYoS0Eea1grRuuvivtw" value="1"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BvCacIS0Eea1grRuuvivtw" value="1"/>
-    </ownedEnd>
-    <ownedEnd xmi:id="_BvCacYS0Eea1grRuuvivtw" name="bList" type="_wx0DdoPVEeaFY_lPQPbINQ" association="_BvBzYIS0Eea1grRuuvivtw">
-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_BvCacoS0Eea1grRuuvivtw"/>
-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_BvCac4S0Eea1grRuuvivtw" value="*"/>
-    </ownedEnd>
-  </packagedElement>
-  <packagedElement xmi:type="uml:Package" xmi:id="_OkvVEJ7gEeaOIbkK8EIfDQ" name="JhipsterPackage">
-    <packagedElement xmi:type="uml:Class" xmi:id="_wx0Db4PVEeaFY_lPQPbINQ" name="A">
-      <ownedAttribute xmi:id="_wx0DcIPVEeaFY_lPQPbINQ" name="name" isOrdered="true">
-        <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#String"/>
-        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wx0DcYPVEeaFY_lPQPbINQ"/>
-      </ownedAttribute>
-    </packagedElement>
-    <packagedElement xmi:type="uml:Package" xmi:id="_YTipwJ7tEeaOQJvdF4PBWw" name="SubPackage">
-      <packagedElement xmi:type="uml:Class" xmi:id="_wx0DdoPVEeaFY_lPQPbINQ" name="B">
-        <ownedAttribute xmi:id="_wx0Dd4PVEeaFY_lPQPbINQ" name="name" isOrdered="true">
-          <type xmi:type="uml:PrimitiveType" href="pathmap://UML_LIBRARIES/XMLPrimitiveTypes.library.uml#String"/>
-          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wx0DeIPVEeaFY_lPQPbINQ"/>
-        </ownedAttribute>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_703kUKFKEeaWHdu8QjKipg" name="Temp">
+  <packagedElement xmi:type="uml:Package" xmi:id="_R0caAKFLEeaWHdu8QjKipg" name="MainPackage">
+    <packagedElement xmi:type="uml:Package" xmi:id="_VJvh4KFLEeaWHdu8QjKipg" name="SubPackage">
+      <packagedElement xmi:type="uml:Class" xmi:id="_acP9UKFLEeaWHdu8QjKipg" name="B"/>
+      <packagedElement xmi:type="uml:Enumeration" xmi:id="_dRpdIKFLEeaWHdu8QjKipg" name="C">
+        <ownedLiteral xmi:id="_jv-ygKFLEeaWHdu8QjKipg" name="TOTO"/>
+        <ownedLiteral xmi:id="_mbxqYKFLEeaWHdu8QjKipg" name="TATA"/>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_vB6ZwKFLEeaWHdu8QjKipg" memberEnd="_vB6ZwaFLEeaWHdu8QjKipg _vB6ZxKFLEeaWHdu8QjKipg" navigableOwnedEnd="_vB6ZwaFLEeaWHdu8QjKipg _vB6ZxKFLEeaWHdu8QjKipg">
+        <ownedEnd xmi:id="_vB6ZwaFLEeaWHdu8QjKipg" name="cValue" type="_dRpdIKFLEeaWHdu8QjKipg" association="_vB6ZwKFLEeaWHdu8QjKipg">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vB6ZwqFLEeaWHdu8QjKipg" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vB6Zw6FLEeaWHdu8QjKipg" value="1"/>
+        </ownedEnd>
+        <ownedEnd xmi:id="_vB6ZxKFLEeaWHdu8QjKipg" name="bs" type="_acP9UKFLEeaWHdu8QjKipg" association="_vB6ZwKFLEeaWHdu8QjKipg">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_vB6ZxaFLEeaWHdu8QjKipg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_vB6ZxqFLEeaWHdu8QjKipg" value="*"/>
+        </ownedEnd>
+      </packagedElement>
+      <packagedElement xmi:type="uml:Association" xmi:id="_9ZrJgKFLEeaWHdu8QjKipg" memberEnd="_9ZrJgaFLEeaWHdu8QjKipg _9ZrJhKFLEeaWHdu8QjKipg" navigableOwnedEnd="_9ZrJgaFLEeaWHdu8QjKipg _9ZrJhKFLEeaWHdu8QjKipg">
+        <ownedEnd xmi:id="_9ZrJgaFLEeaWHdu8QjKipg" name="bValue" type="_acP9UKFLEeaWHdu8QjKipg" association="_9ZrJgKFLEeaWHdu8QjKipg">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9ZrJgqFLEeaWHdu8QjKipg" value="1"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9ZrJg6FLEeaWHdu8QjKipg" value="1"/>
+        </ownedEnd>
+        <ownedEnd xmi:id="_9ZrJhKFLEeaWHdu8QjKipg" name="as" type="_Y9NMcKFLEeaWHdu8QjKipg" association="_9ZrJgKFLEeaWHdu8QjKipg">
+          <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_9ZrJhaFLEeaWHdu8QjKipg"/>
+          <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_9ZrJhqFLEeaWHdu8QjKipg" value="*"/>
+        </ownedEnd>
       </packagedElement>
     </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_Y9NMcKFLEeaWHdu8QjKipg" name="A"/>
   </packagedElement>
 </uml:Model>