ST6RI-895 Updated SysML Xpect tests for new occurrence validation msg.

Author: seidewitz

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

@@ -37,28 +37,28 @@ END_SETUP
 package pkg {
 	public import ScalarValues::*;
 	item def A {
-		// XPECT errors --> "An item must be typed by item definitions." at "item i1: Real;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i1: Real;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i1: Real;"
 		item i1: Real;
-		// XPECT errors --> "An item must be typed by item definitions." at "item i2: att;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i2: att;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i2: att;"
 		item i2: att;
-		// XPECT errors --> "An item must be typed by item definitions." at "item i3: act;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i3: act;"
 		//* XPECT warnings ---
 		   "Duplicate of inherited member name 'self' from Action, Item" at "item i3: act;"
 		   "Duplicate of inherited member name 'start' from Action, Item" at "item i3: act;"
 		   "Duplicate of inherited member name 'done' from Action, Item" at "item i3: act;"
 		--- */
 		item i3: act;
-		// XPECT errors --> "An item must be typed by item definitions." at "item i4: AttDef;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i4: AttDef;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Item" at "item i4: AttDef;"
 		item i4: AttDef;
-		// XPECT errors ---> "An item must be typed by item definitions." at "item i5: PartDef::aPort;"
+		// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i5: PartDef::aPort;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from Item, Port" at "item i5: PartDef::aPort;"
 		item i5: PartDef::aPort;
-		// XPECT errors ---> "An item must be typed by item definitions." at "item i6: PartDef::aPart;"
+		// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i6: PartDef::aPart;"
 		item i6: PartDef::aPart;
-		// XPECT errors --> "An item must be typed by item definitions." at "item i7: PartDef, AttDef;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "item i7: PartDef, AttDef;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "item i7: PartDef, AttDef;"
 		item i7: PartDef, AttDef;
 	}

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

@@ -37,13 +37,13 @@ END_SETUP
 package pkg {
 	public import ScalarValues::*;
 	occurrence def A {
-		// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence areal: Real;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence areal: Real;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "occurrence areal: Real;"
 		occurrence areal: Real;
-		// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence avalue :> aValue;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence avalue :> aValue;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "occurrence avalue :> aValue;"
 		occurrence avalue:> aValue;
-		// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "occurrence twoTypes: PartDef, Real;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "occurrence twoTypes: PartDef, Real;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "occurrence twoTypes: PartDef, Real;"
 		occurrence twoTypes: PartDef, Real;
 	}
@@ -55,7 +55,7 @@ package pkg {
 	// XPECT errors --> "Must reference an occurrence." at "a"
 	event a;
 
-	// XPECT errors --> "An occurrence must be typed by occurrence definitions." at "event a.areal;"
+	// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "event a.areal;"
 	//* XPECT warnings ---
 	   "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "event a.areal;"
 	   "Duplicate of inherited member name 'self' from DataValue, Occurrence" at "a.areal"

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

@@ -37,28 +37,28 @@ END_SETUP
 package pkg {
 	public import ScalarValues::*;
 	part def A {
-		// XPECT errors --> "A part must be typed by item definitions." at "part p1: Real;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p1: Real;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p1: Real;"
 		part p1: Real;
-		// XPECT errors --> "A part must be typed by item definitions." at "part p2: att;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p2: att;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p2: att;"
 		part p2: att;
-		// XPECT errors --> "A part must be typed by item definitions." at "part p3: act;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p3: act;"
 		//* XPECT warnings ---
 		 "Duplicate of inherited member name 'self' from Action, Part" at "part p3: act;"
 		 "Duplicate of inherited member name 'start' from Action, Part" at "part p3: act;"
 		 "Duplicate of inherited member name 'done' from Action, Part" at "part p3: act;"
 		--- */
 		part p3: act;
-		// XPECT errors --> "A part must be typed by item definitions." at "part p4: AttDef;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p4: AttDef;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p4: AttDef;"
 		part p4: AttDef;
-		// XPECT errors --> "A part must be typed by item definitions." at "part p5: PartDef::aPort;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p5: PartDef::aPort;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from Part, Port" at "part p5: PartDef::aPort;"
 		part p5: PartDef::aPort;
-		// XPECT errors ---> "A part must be typed by item definitions." at "part p6: PartDef::aPart;"
+		// XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "part p6: PartDef::aPart;"
 		part p6: PartDef::aPart;
-		// XPECT errors --> "A part must be typed by item definitions." at "part p7: PartDef, AttDef;"
+		// XPECT errors --> "An occurrence, item or part must be typed by occurrence definitions." at "part p7: PartDef, AttDef;"
 		// XPECT warnings --> "Duplicate of inherited member name 'self' from DataValue, Part" at "part p7: PartDef, AttDef;"
 		part p7: PartDef, AttDef;
 	}

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

@@ -42,7 +42,7 @@ package UsageDefinition_invalid {
     ref i1 : i, I;
     // XPECT errors ---> "A usage must be typed by definitions." at "ref i2 : i;"
     ref i2 : i;
-    // XPECT errors ---> "An item must be typed by item definitions." at "item i3 : i;"
+    // XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "item i3 : i;"
     item i3 : i;
 
     part def P;
@@ -51,7 +51,7 @@ package UsageDefinition_invalid {
     ref p1 : p, P;
     // XPECT errors ---> "A usage must be typed by definitions." at "ref p2 : p;"
     ref p2 : p;
-    // XPECT errors ---> "A part must be typed by item definitions." at "part p3 : p;"
+    // XPECT errors ---> "An occurrence, item or part must be typed by occurrence definitions." at "part p3 : p;"
     part p3 : p;
 
     action def Ac;