ST6RI-818 Updated KerML and SysML Xpect tests.

Author: seidewitz

org.omg.kerml.xpect.tests/library/BaseFunctions.kerml

@@ -45,25 +45,25 @@ standard library package BaseFunctions {
 
 	abstract function 'istype'{ 
 		in seq: Anything[0..*];
-		abstract feature 'type': Anything;
+		in 'type': Anything;
 		return : Boolean[1];
 	}
 
 	abstract function 'hastype'{ 
 		in seq: Anything[0..*];
-		abstract feature 'type': Anything;
+		in 'type': Anything;
 		return : Boolean;
 	}
 
 	abstract function '@'{ 
 		in seq: Anything[0..*];
-		abstract feature 'type': Anything;
+		in 'type': Anything;
 		return : Boolean[1];
 	}
 
 	abstract function '@@'{ 
 		in seq: Metaobject[0..*];
-		abstract feature 'type': Metaobject;
+		in 'type': Metaobject;
 		return : Boolean[1];
 	}
 

org.omg.kerml.xpect.tests/library/CollectionFunctions.kerml

@@ -57,7 +57,7 @@ standard library package CollectionFunctions {
 		private feature n : Natural[1] = arr.rank;
 
 		// Assumes row-major ordering for elements.
-		private function index { in arr: Array[1]; i : Natural; indexes : Positive[1..*];
+		private function index { in arr: Array[1]; in i : Natural; in indexes : Positive[1..*];
 			if i <= 1? indexes#(1) else arr.dimensions#(i) * (index(arr, i-1, indexes) - 1) + indexes#(i)
 		}
 

org.omg.kerml.xpect.tests/library/KerML.kerml

@@ -201,6 +201,16 @@ standard library package Performances {
 		 */
 	}
 
+	abstract expr constructorEvaluations [0..*] nonunique subsets evaluations  {
+	    doc
+	    /*
+	     * constructorEvaluations is a specialization of evaluations that restricts the multiplicity 
+	     * of its result parameter to 1..1, requiring a constructorEvaluation to result in a single value.
+	     */
+	     
+	     return result [1..1];
+	}
+	
 	abstract expr booleanEvaluations: BooleanEvaluation[0..*] nonunique subsets evaluations {
 		doc
 		/*

org.omg.kerml.xpect.tests/library/Performances.kerml

@@ -75,7 +75,7 @@ standard library package Triggers {
 			 */
 		}
 
-		return feature changeSignal : ChangeSignal[1] = ChangeSignal(condition, monitor) {
+		return feature changeSignal : ChangeSignal[1] = new ChangeSignal(condition, monitor) {
 			doc
 			/*
 			 * The ChangeSignal for the condition, as monitored by the monitor.
@@ -125,7 +125,7 @@ standard library package Triggers {
 			 */
 		}
 
-		return feature timeSignal : TimeSignal[1] = TimeSignal(timeInstant, clock, monitor) {
+		return feature timeSignal : TimeSignal[1] = new TimeSignal(timeInstant, clock, monitor) {
 			doc
 			/*
 			 * The TimeSignal for the given timeInstant, as monitored by the monitor.

org.omg.kerml.xpect.tests/library/Triggers.kerml

@@ -6,6 +6,7 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 		File {from ="/library/Links.kerml"}
 		File {from ="/library/Occurrences.kerml"}
 		File {from ="/library/Performances.kerml"}
+		File {from ="/library/ControlFunctions.kerml"}
 	}
 	Workspace {
 		JavaProject {
@@ -15,6 +16,7 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 				File {from ="/library/Links.kerml"}
 				File {from ="/library/Occurrences.kerml"}
 				File {from ="/library/Performances.kerml"}
+				File {from ="/library/ControlFunctions.kerml"}
 			}
 		}
 	}

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Behaviors.kerml.xt

@@ -114,6 +114,6 @@ package Expressions {
 		feature count : ScalarValues::Integer = c#(1).count;
 	}
 
-	feature l = L();
+	feature l = new L();
 	feature w1 = w(xx);
 }

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Expressions.kerml.xt

@@ -9,6 +9,7 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 		File {from ="/library/ScalarValues.kerml"}
 		File {from ="/library/Collections.kerml"}
 		File {from ="/library/BaseFunctions.kerml"}
+		File {from ="/library/ControlFunctions.kerml"}
 	}
 	Workspace {
 		JavaProject {
@@ -21,6 +22,7 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 				File {from ="/library/ScalarValues.kerml"}
 				File {from ="/library/Collections.kerml"}
 				File {from ="/library/BaseFunctions.kerml"}
+				File {from ="/library/ControlFunctions.kerml"}
 			}
 		}
 	}

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Indexing.kerml.xt

@@ -56,8 +56,8 @@ package MetadataFeatureTest {
 	filter ~A::z;
 	// XPECT errors --> "Must be model-level evaluable" at "filter A::y->ControlFunctions::collect {in x; x};"
 	filter A::y->ControlFunctions::collect {in x; x};
-	// XPECT errors --> "Must have a Boolean result" at "filter A(null, 1, "", false);"
-	filter A(null, 1, "", false);
+	// XPECT errors --> "Must have a Boolean result" at "filter new A(null, 1, "", false);"
+	filter new A(null, 1, "", false);
 
 	feature bad;
 

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/validation/MetadataTests_MetadataFeature_invalid.kerml.xt

@@ -72,8 +72,8 @@ standard library package SampledFunctions {
 
 		in calc calculation { in x; }
 		in attribute domainValues [0..*];
-		return sampling = SampledFunction (
-			samples = domainValues->collect { in x; SamplePair(x, calculation(x)) }
+		return sampling = new SampledFunction (
+			samples = domainValues->collect { in x; new SamplePair(x, calculation(x)) }
 		);
 	}