Skip to content

Commit 103e5bd

Browse files
scinnamondscinnamond
committed
additional tests in support of issues 9, 22
1 parent 2117488 commit 103e5bd

6 files changed

Lines changed: 51 additions & 13 deletions

File tree

‎org.modeldriven.fuml/doc/release-notes/fuml-1.1.0c.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
### fUML Reference Implementation
2+
### v1.1.0c Release Notes
3+
4+
This is a production maintenance release of the fUML Reference Implementation.
5+
6+
### fUML Execution Engine
7+
8+
The current base release for the fUML Execution Engine is v1.1.0, conforming to v1.1 of the [fUML Specification](http://www.omg.org/spec/FUML/1.1). The v1.1.0c maintenance release builds on the v1.1.0a maintenance release, which includes preliminary implementation of resolutions to the certain OMG issues currently under consideration by the fUML 1.2 Revision Task Force (see the [v1.1.0a Release Notes](./fuml-1.1.0a.md)). No further changes to the fUML Execution Engine have been made in this maintenance release.
9+
10+
The full list of open fUML issues is available at http://solitaire.omg.org/issues/task-force/FUML12.
11+
12+
### XMI Loader/Infrastructure
13+
14+
This maintenance release resolves the following issues related to the XMI Loader and other Reference Implementation infrastructure capabilities, as tracked in our issue management system on GitHub (see https://github.com/ModelDriven/fUML-Reference-Implementation/issues).
15+
16+
#### Improvements
17+
18+
[Issue #9] - Add Support For Papyrus Models
19+
[Issue #22] - Add Support for Papyrus Libraries
20+

‎org.modeldriven.fuml/pom.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<artifactId>fuml</artifactId>
66
<packaging>jar</packaging>
77
<name>FUML Reference Implementation</name>
8-
<version>1.1.0b</version>
8+
<version>1.1.0c</version>
99
<description>This open source software is a reference implementation, consisting of software and related files, for the OMG specification called the Semantics of a Foundational Subset for Executable UML Models (fUML). The reference implementation is intended to implement the execution semantics of UML activity models, accepting an XMI file from a conformant UML model as its input and providing an execution trace of the selected activity model(s) as its output. The core execution engine, which is directly generated from the normative syntactic and semantic models for fUML, may also be used as a library implementation of fUML in other software.</description>
1010
<url>http://maven.apache.org</url>
1111
<licenses>
@@ -296,6 +296,7 @@
296296
</execution>
297297
</executions>
298298
</plugin>
299+
299300
<plugin>
300301
<groupId>org.apache.maven.plugins</groupId>
301302
<artifactId>maven-javadoc-plugin</artifactId>
@@ -308,6 +309,7 @@
308309
</execution>
309310
</executions>
310311
</plugin>
312+
311313
<plugin>
312314
<groupId>org.codehaus.mojo</groupId>
313315
<artifactId>build-helper-maven-plugin</artifactId>
@@ -351,6 +353,7 @@
351353
<excludes>
352354
<exclude>**/load/profile/**</exclude> <!-- these are helper classes not tests and JUnit will try to run them if not excluded -->
353355
<!-- <exclude>**/load/**</exclude> -->
356+
<exclude>**/load/*MagicDrawProfile*</exclude> <!-- needs work -->
354357
<exclude>**/builtin/*LoopNode*</exclude>
355358
<!-- <exclude>**/model/**</exclude> -->
356359
<!-- <exclude>**/builtin/**</exclude> -->
@@ -395,7 +398,7 @@
395398
Comment out the below GPG plugin if not set up with GPG
396399
and just want to install local locally.
397400
-->
398-
<!--
401+
399402
<plugin>
400403
<groupId>org.apache.maven.plugins</groupId>
401404
<artifactId>maven-gpg-plugin</artifactId>
@@ -410,7 +413,7 @@
410413
</execution>
411414
</executions>
412415
</plugin>
413-
-->
416+
414417
<!--
415418
Release Plugin (Update version in POM before/after release, create
416419
tag, deploy) to try: mvn release:prepare -DdryRun=true && mvn

‎org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/model/InMemoryMapping.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,24 +214,23 @@ public void mapPackage(Package p, String currentPackageName, RepositoryArtifact
214214
String qualifiedName = null;
215215
if (currentPackageName != null)
216216
qualifiedName = currentPackageName + "." + p.name;
217-
//else
218-
// qualifiedName = p.name;
219217

220218
if (log.isDebugEnabled())
221-
log.debug("mapping package, " + artifact.getURN() + "#" + p.name);
222-
219+
log.debug("mapping package, " + artifact.getURN() + "#" + p.name + "(" + currentPackageName + ")");
223220

224221
org.modeldriven.fuml.repository.Package pkg = new org.modeldriven.fuml.repository.model.Package(p, artifact);
225222

223+
// NOTE: This is to provide a consistent way to resolve library element
224+
// names, for add-on functionality.
226225
if (qualifiedName != null) {
226+
227+
if (log.isDebugEnabled())
228+
log.debug("mapping package, " + artifact.getURN() + "#" + p.name + " by package qualified name: " + qualifiedName);
227229
if (qualifiedPackageNameToPackageMap.get(qualifiedName) != null)
228230
throw new RepositorylException("found existing package, '"
229231
+ qualifiedName + ".");
230232
qualifiedPackageNameToPackageMap.put(qualifiedName, pkg);
231233
}
232-
// NOTE: This is to provide a consistent way to resolve library element
233-
// names, for add-on functionality.
234-
qualifiedElementNameToElementMap.put(qualifiedName, pkg);
235234

236235
List<org.modeldriven.fuml.repository.Package> artifactPackages = artifactURIToPackagesMap.get(artifact.getURN());
237236
if (artifactPackages == null)

‎org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/load/LoadMagicDrawProfileTestCase.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,18 @@ public void testLoadProfileApplication() throws Exception {
8686
NAMESPACE_URI, stream);
8787
Fuml.load(artifact);
8888

89-
Classifier nodeClassifier = Repository.INSTANCE.findClassifier(
89+
// test package qualified name
90+
Classifier nodeClassifier = Repository.INSTANCE.findClassifier("model.org.modeldriven.test.data.Node");
91+
assertTrue(nodeClassifier != null);
92+
assertTrue(nodeClassifier instanceof Class_);
93+
94+
// test uri qualified name
95+
nodeClassifier = Repository.INSTANCE.findClassifier(
9096
NAMESPACE_URI + "#" + "Node");
9197
assertTrue(nodeClassifier != null);
9298
assertTrue(nodeClassifier instanceof Class_);
99+
100+
93101
Class_ nodeClass = (Class_)nodeClassifier;
94102
Property stringsFieldProp = nodeClass.getProperty("stringsField");
95103
assertTrue(stringsFieldProp != null);
@@ -107,6 +115,8 @@ public void testLoadProfileApplication() throws Exception {
107115
assertTrue(repoEnum != null);
108116
assertTrue("TestValues".equals(repoEnum.getName()));
109117
assertTrue(repoEnum.getOwnedLiteral() != null);
118+
119+
110120
}
111121

112122
private boolean hasStereotype(Element elem, Class<?> stereotypeClass) {

‎org.modeldriven.fuml/src/test/resources/mdxml/TestProfileApplication.mdxml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
<packagedElement xmi:type='uml:Package' xmi:id='_17_0_2_1707042cx_1339189431129_892808_1671_923824' name='org' visibility='public'>
2424
<packagedElement xmi:type='uml:Package' xmi:id='_17_0_2_1707042cx_1339189439444_460321_16_923842' name='modeldriven' visibility='public'>
2525
<packagedElement xmi:type='uml:Package' xmi:id='_17_0_2_1707042cx_1349976943610_90008_1912' name='test' visibility='public'>
26-
<packagedElement xmi:type='uml:Package' xmi:id='_17_0_2_1707042cx_1339189629566_657525_1679_992234' name='datatypes' visibility='public'>
26+
27+
<packagedElement xmi:type='uml:Package' xmi:id='_17_0_2_1707042cx_1339189629566_657525_1679_992234' name='data' visibility='public'>
2728

2829
<packagedElement xmi:type='uml:Enumeration' xmi:id='a2f944df-73ba-48e6-9e44-acabd5b9a376' name='TestValues' visibility='public'>
2930
<ownedLiteral xmi:type='uml:EnumerationLiteral' xmi:id='9252e0d8-f15f-4f9a-94b1-f459f9025fb1' name='a' visibility='public'/>

‎org.modeldriven.fuml/src/test/resources/uml/TestPapyrusProfileApplication.uml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:TestProfile="http:///schemas/TestProfile/_Cvni8DqeEeSIqNFH5qbSSw/28" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xsi:schemaLocation="http:///schemas/TestProfile/_Cvni8DqeEeSIqNFH5qbSSw/28 pathmap://TEST_PROFILES/Test.profile.uml#_Cvr0YDqeEeSIqNFH5qbSSw">
2+
<xmi:XMI xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xmlns:TestProfile="http:///schemas/TestProfile/_Cvni8DqeEeSIqNFH5qbSSw/28"
5+
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
6+
xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML"
7+
xsi:schemaLocation="http:///schemas/TestProfile/_Cvni8DqeEeSIqNFH5qbSSw/28 pathmap://TEST_PROFILES/Test.profile.uml#_Cvr0YDqeEeSIqNFH5qbSSw">
38
<uml:Model xmi:id="xxxxxx_Z68-YCG2EeSfsoM4aIlAPw" name="model">
49
<packageImport xmi:type="uml:PackageImport" xmi:id="_XBzlEDSQEeSBasb0GALRCA">
510
<importedPackage xmi:type="uml:Profile" href="pathmap://TEST_PROFILES/Test.profile.uml#_NlmngCJUEeSXvPZh3aumVA"/>

0 commit comments

Comments
 (0)