ST6RI-884 Added new tests in ExpressionEvaluationTest.

- Moved SequenceFunction tests out of ModelLevelEvaluationTest, because
SequenceFunctions are not currently model-level evaluable per the spec.

- Added tests for evaluation of expressions using ControlFunctions
collect and select. These functions are model-level evaluable, but
cannot be usefully used because of problem with model-level evaluability
of body expressions with result expressions that reference parameters.

- Added a few tests for collect and select into ModelLevelEvaluationTest
just to confirm that they the functions themselves are considered
model-level evaluable.

Author: seidewitz

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/ExpressionEvaluationTest.java

@@ -397,4 +397,13 @@ public void testNumericalFunctionEvaluation() throws Exception {
 		assertElement("LiteralInteger 6", instance.eval("NumericalFunctions::sum((1,2,3))", null));
 		assertElement("LiteralInteger 6", instance.eval("NumericalFunctions::product((1,2,3))", null));
 	}
+	
+	@Test
+	public void testControlOpEvaluation() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		assertList(new String[] {"LiteralInteger 2", "LiteralInteger 4", "LiteralInteger 6"}, instance.eval("(1,2,3).{in x : ScalarValues::Integer; x * 2}", null));
+		assertList(new String[] {"LiteralInteger 1", "LiteralInteger 2"}, instance.eval("(1,2,3).?{in x : ScalarValues::Integer; x < 3}", null));
+		assertList(new String[] {"LiteralInteger 2", "LiteralInteger 4", "LiteralInteger 6"}, instance.eval("(1,2,3)->ControlFunctions::collect{in x : ScalarValues::Integer; x * 2}", null));
+		assertList(new String[] {"LiteralInteger 1", "LiteralInteger 2"}, instance.eval("(1,2,3)->ControlFunctions::select{in x : ScalarValues::Integer; x < 3}", null));
+	}
 }

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/ModelLevelEvaluationTest.java

@@ -201,6 +201,15 @@ public void testListOpsModelLevelEvaluability() throws Exception {
 		checkExpressionIsModelLevelEvaluable(instance, "(1, 2, 3)");
 		checkExpressionIsModelLevelEvaluable(instance, "1..3");
 	}
+	
+	@Test
+	public void testControlOpsModelLevelEvaluability() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		checkExpressionIsModelLevelEvaluable(instance, "null.{in x; 1}");
+		checkExpressionIsModelLevelEvaluable(instance, "null.?{in x; true}");
+		checkExpressionIsModelLevelEvaluable(instance, "ControlFunctions::collect(null, {in x; 1})");
+		checkExpressionIsModelLevelEvaluable(instance, "ControlFunctions::select(null, {in x; true})");
+	}
 
 	@Test
 	public void testNonModelLevelEvaluability() throws Exception {
@@ -306,6 +315,16 @@ public void testListEvaluation() throws Exception {
 //		assertEquals(true, evaluateBooleanValue(null, null, "SequenceFunctions::notEmpty((1,2,3))"));
 	}
 
+// Note: These collect and select expressions are currently not model-level evaluable, because the feature references 
+// to parameters of the body expressions are considered non-model-level evaluable (currently per the specification).
+//	@Test
+//	public void testControlOpEvaluation() throws Exception {
+//		assertArrayEquals(new Object[] {2, 4, 6}, evaluateListValue(null, null, "(1,2,3).{in x : ScalarValues::Integer; x * 2}"));
+//		assertArrayEquals(new Object[] {1, 2}, evaluateListValue(null, null, "(1,2,3).?{in x : ScalarValues::Integer; x < 3}"));
+//		assertArrayEquals(new Object[] {2, 4, 6}, evaluateListValue(null, null, "(1,2,3)->ControlFunctions::collect{in x : ScalarValues::Integer; x * 2}"));
+//		assertArrayEquals(new Object[] {1, 2}, evaluateListValue(null, null, "(1,2,3)->ControlFunctions::select{in x : ScalarValues::Integer; x < 3}"));
+//	}
+	
 	@Test
 	public void testConstructorEvaluation() throws Exception {
 		SysMLInteractive instance = getSysMLInteractiveInstance();