ST6RI-921 Updated Xpect tests related to filter expressions.

Author: seidewitz

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/imports/local/Import_Filtered.kerml.xt

@@ -237,7 +237,7 @@ package Import_Filtered {
 	}
 
 	package 'Mandatory Features_true_1' {
-		public import vehicle1_c1::**[Safety::isMandatory];
+		public import vehicle1_c1::**[(as Safety).isMandatory];
 		classifier b :> seatBelt; 
 
 		// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"
@@ -259,7 +259,7 @@ package Import_Filtered {
 	}
 
 	package 'Mandatory Features_true_2' {
-		public import vehicle1_c1::**[Safety::isMandatory == true]; 
+		public import vehicle1_c1::**[(as Safety).isMandatory == true]; 
 		classifier b :> seatBelt; 
 
 		// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"
@@ -281,7 +281,7 @@ package Import_Filtered {
 	}
 
 	package 'Mandatory Features_false' {
-		public import vehicle1_c1::**[Safety::isMandatory == false]; 
+		public import vehicle1_c1::**[(as Safety).isMandatory == false]; 
 		classifier j :> antilockBrakes; 
 
 		// XPECT errors --> "Couldn't resolve reference to Classifier 'alarm'." at "alarm"

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

@@ -50,12 +50,12 @@ package MetadataFeatureTest {
 
 	function f { in x; return : ScalarValues::Boolean; }
 
-	// XPECT errors --> "Must be model-level evaluable" at "filter f(A::y);"
-	filter f(A::y);
-	// XPECT errors --> "Must be model-level evaluable" at "filter ~A::z;"
-	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 be model-level evaluable" at "filter f((as A).y);"
+	filter f((as A).y);
+	// XPECT errors --> "Must be model-level evaluable" at "filter ~(as A).z;"
+	filter ~(as A).z;
+	// XPECT errors --> "Must be model-level evaluable" at "filter (as A).y->ControlFunctions::collect {in x; x};"
+	filter (as A).y->ControlFunctions::collect {in x; x};
 	// XPECT errors --> "Must have a Boolean result" at "filter new A(null, 1, "", false);"
 	filter new A(null, 1, "", false);
 
@@ -66,8 +66,8 @@ package MetadataFeatureTest {
 			// XPECT errors --> "Must be model-level evaluable" at "= ~3"
 			x = ~3;
 			y = "e";
-			// XPECT errors --> "Must be model-level evaluable" at "= f(A::y)"
-			z = f(A::y);
+			// XPECT errors --> "Must be model-level evaluable" at "= f((as A).y)"
+			z = f((as A).y);
 			u {
 				v = 1;
 				// XPECT errors --> "Must redefine an owning-type feature" at "bad;"

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/simpletests/ElementFilter.sysml.xt

@@ -85,6 +85,6 @@ package ElementFilterTest {
 	}
 
 	package 'Mandatory Features' {
-		public import vehicle1_c1::**[@Safety and PartInfo::isMandatory];
+		public import vehicle1_c1::**[@Safety and (as PartInfo).isMandatory];
 	}
 }

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/invalid/MetadataUsage_Invalid.sysml.xt

@@ -62,12 +62,12 @@ package Test {
 
 	calc def f { in x : ScalarValues::Boolean; }
 
-	// XPECT errors --> "Must be model-level evaluable" at "filter f(A::z);"
-	filter f(A::z);
-	// XPECT errors --> "Must be model-level evaluable" at "filter ~A::z;"
-	filter ~A::z;
-	// XPECT errors --> "Must be model-level evaluable" at "filter A::y->ControlFunctions::collect {in ref x; x};"
-	filter A::y->ControlFunctions::collect {in ref x; x};
+	// XPECT errors --> "Must be model-level evaluable" at "filter f((as A).z);"
+	filter f((as A).z);
+	// XPECT errors --> "Must be model-level evaluable" at "filter ~(as A).z;"
+	filter ~(as A).z;
+	// XPECT errors --> "Must be model-level evaluable" at "filter (as A).y->ControlFunctions::collect {in ref x; x};"
+	filter (as A).y->ControlFunctions::collect {in ref x; x};
 	// XPECT errors --> "Must have a Boolean result" at "filter new A(null, 1, "", false);"
 	filter new A(null, 1, "", false);
 
@@ -82,8 +82,8 @@ package Test {
 			// XPECT errors --> "Must be model-level evaluable" at "= ~3"
 			x = ~3;
 			y = E::e;
-			// XPECT errors --> "Must be model-level evaluable" at "= f(A::z)"
-			z = f(A::z);
+			// XPECT errors --> "Must be model-level evaluable" at "= f((as A).z)"
+			z = f((as A).z);
 			u {
 				v = 1;
 				// XPECT errors --> "Must redefine an owning-type feature" at "bad;"