FUML15-28 Added tests to demonstrate associations with non-owned ends.

- Updated creation of feature values for structural features to skip
association ends.

Author: seidewitz

org.modeldriven.fuml/pom.xml

@@ -5,7 +5,7 @@
 	<artifactId>fuml</artifactId>
 	<packaging>jar</packaging>
 	<name>FUML Reference Implementation</name>
-	<version>1.4.2a</version>
+	<version>1.4.3-SNAPSHOT</version>
 	<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>
 	<url>http:/fuml.modeldriven.org</url>
 	<licenses>

org.modeldriven.fuml/src/main/java/fuml/semantics/simpleclassifiers/StructuredValue.java

@@ -18,6 +18,7 @@
 import fuml.syntax.classification.ClassifierList;
 import fuml.syntax.classification.InstanceSpecification;
 import fuml.syntax.classification.InstanceValue;
+import fuml.syntax.classification.Property;
 import fuml.syntax.classification.Slot;
 import fuml.syntax.classification.StructuralFeature;
 import fuml.syntax.commonstructure.NamedElement;
@@ -103,20 +104,20 @@ public fuml.semantics.simpleclassifiers.FeatureValueList getMemberValues(Classif
 	};
 
 	public void createFeatureValues() {
-		// Create empty feature values for all structural features of the types 
-		// of this structured value and all its supertypes (including private
-		// features that are not inherited).
+		// Create empty feature values for all non-association-end structural 
+		// features of the types of this structured value and all its supertypes 
+		// (including private features that are not inherited).
 
 		this.addFeatureValues(new FeatureValueList());
 	}
 
 	public void addFeatureValues(FeatureValueList oldFeatureValues) {
-		// Add feature values for all structural features of the types 
-		// of this structured value and all its supertypes (including private
-		// features that are not inherited). If a feature has an old feature 
-		// value in the given list, then use that to initialize the values of 
-		// the corresponding new feature value. Otherwise leave the values of 
-		// the new feature value empty.
+		// Add feature values for all non-association-end structural features 
+		// of the types of this structured value and all its supertypes 
+		// (including private features that are not inherited). If a feature 
+		// has an old feature value in the given list, then use that to initialize 
+		// the values of the corresponding new feature value. Otherwise leave the 
+		// values of the new feature value empty.
 
 		ClassifierList types = this.getTypes();
 
@@ -127,20 +128,22 @@ public void addFeatureValues(FeatureValueList oldFeatureValues) {
 	}
 
 	public void addFeatureValuesForType(Classifier type, FeatureValueList oldFeatureValues) {
-		// Add feature values for all structural features of the given type and
-		// all of its supertypes (including private features that are not
-		// inherited). If a feature has an old feature value in the given list,
-		// then use that to initialize the values of the corresponding new
-		// feature value. Otherwise leave the values of the new feature value
+		// Add feature values for all non-association-end structural features 
+		// of the given type and all of its supertypes (including private features 
+		// that are not inherited). If a feature has an old feature value in the 
+		// given list, then use that to initialize the values of the corresponding 
+		// new feature value. Otherwise leave the values of the new feature value
 		// empty.
 
-		// Set feature values for the owned structural features of the given
-		// type. (Any common structural values that have already been added
-		// previously will simply have their values set again.)
+		// Set feature values for the non-association end owned structural features 
+		// of the given type. (Any common structural values that have already been 
+		// added previously will simply have their values set again.)
 		NamedElementList ownedMembers = type.ownedMember;
 		for (int j = 0; j < ownedMembers.size(); j++) {
 			NamedElement ownedMember = ownedMembers.getValue(j);
-			if (ownedMember instanceof StructuralFeature) {
+			if (ownedMember instanceof StructuralFeature && 
+					!(ownedMember instanceof Property && 
+					  ((Property)ownedMember).association != null)) {
 				this.setFeatureValue((StructuralFeature) ownedMember, 
 					this.getValues(ownedMember, oldFeatureValues), 0);
 			}

org.modeldriven.fuml/src/main/java/fuml/syntax/structuredclassifiers/Association.java

@@ -29,22 +29,7 @@ public void addOwnedEnd(fuml.syntax.classification.Property ownedEnd) {
 		this.ownedEnd.addValue(ownedEnd);
 		ownedEnd._setOwningAssociation(this);
 
-		this.memberEnd.addValue(ownedEnd);
-		ownedEnd._setAssociation(this);
-
-		if (ownedEnd.typedElement.type != null) {
-			this.endType.addValue(ownedEnd.typedElement.type);
-		}
-
-		if (this.memberEnd.size() == 2) {
-			Property opposite = this.memberEnd.get(0);
-			ownedEnd._setOpposite(opposite);
-			opposite._setOpposite(ownedEnd);
-		} else if (this.memberEnd.size() > 2) {
-			for (Property memberEnd : this.memberEnd) {
-				memberEnd._setOpposite(null);
-			}
-		}
+		this._addMemberEnd(ownedEnd);
 	} // addOwnedEnd
 
 	public void addNavigableOwnedEnd(
@@ -54,5 +39,33 @@ public void addNavigableOwnedEnd(
 
 		this.navigableOwnedEnd.addValue(navigableOwnedEnd);
 	} // addNavigableOwnedEnd
+	
+	public void addMemberEnd(fuml.syntax.classification.Property memberEnd) {
+		// Note: This operation should not be used for owned ends. The
+		// operation addOwnedEnd should be used instead.
+
+		this.addMember(memberEnd);
+		this._addMemberEnd(memberEnd);
+	}
+	
+	protected void _addMemberEnd(fuml.syntax.classification.Property memberEnd) {
+		this.memberEnd.addValue(memberEnd);
+		memberEnd._setAssociation(this);
+
+		if (memberEnd.typedElement.type != null) {
+			this.endType.addValue(memberEnd.typedElement.type);
+		}
+
+		if (this.memberEnd.size() == 2) {
+			Property opposite = this.memberEnd.get(0);
+			memberEnd._setOpposite(opposite);
+			opposite._setOpposite(memberEnd);
+		} else if (this.memberEnd.size() > 2) {
+			for (Property end : this.memberEnd) {
+				end._setOpposite(null);
+			}
+		}
+		
+	}
 
 } // Association

org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/LinkReaderTestCase.java

@@ -23,11 +23,11 @@ public static Test suite() {
 
     public void setUp() throws Exception {
     	this.clearExtents();
-   }
+    }
 
-    public void testLinkReader() throws Exception {
-        log.info("testLinkReader");
-        ParameterValueList output = this.testSuite.testLinkReader();
+    public void runTest(int n) throws Exception {
+        log.info("testLinkReader with " + n + " association-owned end(s)");
+        ParameterValueList output = this.testSuite.testLinkReader(n);
         log.info("done");
 
         assertNotNull(output);
@@ -67,4 +67,16 @@ public void testLinkReader() throws Exception {
         assertSame("value2b (feature)", featureOutput1, value2b);
     }
 
+    public void testLinkReaderWithNoOwnedEnds() throws Exception {
+    	this.runTest(0);
+    }
+    
+    public void testLinkReaderWithOneOwnedEnd() throws Exception {
+    	this.runTest(1);
+    }
+    
+    public void testLinkReaderWithTwoOwnedEnds() throws Exception {
+    	this.runTest(2);
+    }
+    
 }

org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/environment/ActivityFactory.java

@@ -2,7 +2,9 @@
  * Initial version copyright 2008 Lockheed Martin Corporation, except  
  * as stated in the file entitled Licensing-Information. 
  * 
- * All modifications copyright 2009-2017 Data Access Technologies, Inc.
+ * Modifications:
+ * Copyright 2009-2017 Data Access Technologies, Inc.
+ * Copyright 2020 Model Driven Solutions, Inc.
  *
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 

org.modeldriven.fuml/src/test/java/org/modeldriven/fuml/test/builtin/environment/ClassifierFactory.java

@@ -2,7 +2,9 @@
  * Initial version copyright 2008 Lockheed Martin Corporation, except  
  * as stated in the file entitled Licensing-Information. 
  * 
- * All modifications copyright 2009-2012 Data Access Technologies, Inc.
+ * Modifications:
+ * Copyright 2009-2012 Data Access Technologies, Inc.
+ * Copyright 2020 Model Driven Solutions, Inc.
  *
  * Licensed under the Academic Free License version 3.0 
  * (http://www.opensource.org/licenses/afl-3.0.php), except as stated 
@@ -34,7 +36,7 @@ public ClassifierFactory(org.modeldriven.fuml.test.builtin.environment.TestEnvir
 		this.environment = environment;
 	} // ClassifierFactory
 
-	public void createEnumerationType(String typeName, int numberOfLiterals) {
+	public Enumeration createEnumerationType(String typeName, int numberOfLiterals) {
 		Enumeration type = new Enumeration();
 
 		type.setName(typeName);
@@ -47,30 +49,36 @@ public void createEnumerationType(String typeName, int numberOfLiterals) {
 		}
 
 		environment.addElement(type);
+		
+		return type;
 	} // createEnumerationType
 
-	public void createDataType(String name) {
+	public DataType createDataType(String name) {
 		DataType dataType = new DataType();
 		dataType.setName(name);
 		environment.addElement(dataType);
+		return dataType;
 	} // createDataType
 
-	public void createClass(String name) {
+	public Class_ createClass(String name) {
 		Class_ class_ = new Class_();
 		class_.setName(name);
 		environment.addElement(class_);
+		return class_;
 	} // createClass
 
-	public void createSignal(String name) {
+	public Signal createSignal(String name) {
 		Signal signal = new Signal();
 		signal.setName(name);
 		this.environment.addElement(signal);
+		return signal;
 	} // createSignal
 
-	public void createAssociation(String name) {
+	public Association createAssociation(String name) {
 		Association association = new Association();
 		association.setName(name);
 		environment.addElement(association);
+		return association;
 	} // createAssociation
 
 	public Property addAttribute(String classifierName, String attributeName,
@@ -130,14 +138,14 @@ public Property addAttribute(String classifierName, String attributeName,
 		return attribute;
 	} // addAttribute
 
-	public void addEnd(String associationName, String endName,
+	public Property addEnd(String associationName, String endName,
 			String endTypeName, boolean isComposite) {
 		Classifier type = environment.getType(associationName);
 
 		if (type == null || !(type instanceof Association)) {
 			Debug.println("[addEnd] " + associationName
 					+ " not found or not an association.");
-			return;
+			return null;
 		}
 
 		Association association = (Association) type;
@@ -147,7 +155,7 @@ public void addEnd(String associationName, String endName,
 		if (endType == null) {
 			Debug.println("[addEnd] " + endTypeName
 					+ " not found or not a classifier.");
-			return;
+			return null;
 		}
 
 		Property end = new Property();
@@ -165,16 +173,18 @@ public void addEnd(String associationName, String endName,
 		}
 
 		association.addOwnedEnd(end);
-
+		association.addNavigableOwnedEnd(end);
+		
+		return end;
 	} // addEnd
 
-	public void addClassifierBehavior(String className, String behaviorName) {
+	public Class_ addClassifierBehavior(String className, String behaviorName) {
 		NamedElement element = this.environment.getElement(className);
 
 		if (element == null || !(element instanceof Class_)) {
 			Debug.println("[addClassifierBehavior] " + className
 					+ " not found or not a class.");
-			return;
+			return null;
 		}
 
 		Class_ classifier = (Class_) element;
@@ -184,25 +194,26 @@ public void addClassifierBehavior(String className, String behaviorName) {
 		if (element == null || !(element instanceof Behavior)) {
 			Debug.println("[addClassifierBehavior] " + behaviorName
 					+ " not found or not a behavior.");
-			return;
+			return null;
 		}
 
 		Behavior behavior = (Behavior) element;
 		this.environment.removeElement(element);
 
 		classifier.addOwnedBehavior(behavior);
 		classifier.setClassifierBehavior(behavior);
-
+		
+		return classifier;
 	} // addClassifierBehavior
 
-	public void addOperation(String className, String baseClassName,
+	public Operation addOperation(String className, String baseClassName,
 			String operationName, String methodName) {
 		NamedElement element = this.environment.getElement(className);
 
 		if (element == null || !(element instanceof Class_)) {
 			Debug.println("[addOperation] " + className
 					+ " not found or not a class.");
-			return;
+			return null;
 		}
 
 		Class_ classifier = (Class_) element;
@@ -216,7 +227,7 @@ public void addOperation(String className, String baseClassName,
 			if (element == null || !(element instanceof Class_)) {
 				Debug.println("[addOperation] " + baseClassName
 						+ " not found or not a class.");
-				return;
+				return null;
 			}
 
 			Class_ baseClass = (Class_) element;
@@ -226,7 +237,7 @@ public void addOperation(String className, String baseClassName,
 			if (redefinedOperation == null) {
 				Debug.println("[addOperation] " + operationName
 						+ " is not an operation of " + baseClassName + ".");
-				return;
+				return null;
 			}
 
 			operation.addRedefinedOperation(redefinedOperation);
@@ -240,7 +251,7 @@ public void addOperation(String className, String baseClassName,
 			if (element == null || !(element instanceof Behavior)) {
 				Debug.println("[addOperation] " + methodName
 						+ " not found or not a behavior.");
-				return;
+				return null;
 			}
 
 			Behavior behavior = (Behavior) element;
@@ -251,33 +262,35 @@ public void addOperation(String className, String baseClassName,
 		}
 
 		classifier.addOwnedOperation(operation);
-
+		
+		return operation;
 	} // addOperation
 
-	public void addGeneralization(String subtypeName, String supertypeName) {
+	public Generalization addGeneralization(String subtypeName, String supertypeName) {
 		Classifier subtype = this.environment.getType(subtypeName);
 
 		if (subtype == null) {
 			Debug.println("[addGeneralization] " + subtypeName
 					+ " not found or not a classifier.");
-			return;
+			return null;
 		}
 
 		Classifier supertype = this.environment.getType(supertypeName);
 
 		if (supertype == null) {
 			Debug.println("[addGeneralization] " + supertypeName
 					+ " not found or not a classifier.");
-			return;
+			return null;
 		}
 
 		Generalization generalization = new Generalization();
 		generalization.setGeneral(supertype);
 		subtype.addGeneralization(generalization);
+		
+		return generalization;
 	} // addGeneralization
 
-	protected fuml.syntax.classification.Operation getOperation(
-			fuml.syntax.structuredclassifiers.Class_ class_, String operationName) {
+	protected Operation getOperation(Class_ class_, String operationName) {
 		for (int i = 0; i < class_.member.size(); i++) {
 			NamedElement member = class_.member.getValue(i);
 			if (member.name.equals(operationName)) {