SYSML2_-158 Updated SysML Xpect tests related to individuals/portions.

Author: seidewitz

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

@@ -49,8 +49,11 @@ package OccurrenceTest {
 	}
 	individual occurrence ind : Ind, Occ {
 		snapshot s3;
-		individual timeslice t3;
+		individual timeslice t3 :> ind;
+        individual snapshot s4 : Ind;
+	}
+
+	occurrence o1 {
+	  occurrence o2;
 	}
-	
-	individual snapshot s4 : Ind;
 }

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

@@ -46,7 +46,7 @@ package 'Individuals and Roles' {
 	// XPECT errors --> "At most one individual definition is allowed." at "individual two_types : A_1, B_1;"
 	individual two_types : A_1, B_1;
 
-	// XPECT errors -->"An individual must be typed by one individual definition." at "individual snapshot b_1_1 : B;"
-	individual snapshot b_1_1 : B;
+	// XPECT errors -->"An individual must be typed by one individual definition." at "individual b_1_1 : B;"
+	individual b_1_1 : B;
 
 }

org.omg.sysml.xpect.tests/src/org/omg/sysml/xpect/tests/validation/valid/IndividualUsage.sysml.xt

@@ -41,25 +41,8 @@ XPECT_SETUP org.omg.sysml.xpect.tests.validation.valid.SysMLTests
 END_SETUP 
 */
 // XPECT noErrors ---> ""
-package 'Individuals and Roles' {
-	public import ScalarValues::*;
-	part def Vehicle {
-		attribute mass : Real;
-		attribute status : VehicleStatus;
-		
-		part eng : Engine;
-		
-		ref driver : Person;
-	}
-	
-	attribute def VehicleStatus {
-		gearSetting : Integer;
-		acceleratorPosition : Real;
-	}
-	
-	part def Engine;	
-	part def Person;
-	
+package IndividualUsage_Valid {
+	part def Vehicle;	
 	part def Wheel;
 
 	individual def Vehicle_1 :> Vehicle {
@@ -71,11 +54,11 @@ package 'Individuals and Roles' {
 
 	individual vehicle_1 : Vehicle_1 {
 		snapshot vehicle_1_t0 {
-			snapshot leftFrontWheel_t0 : Wheel_1 :>> leftFrontWheel;
+			individual leftFrontWheel_t0 : Wheel_1 :>> leftFrontWheel;
 		}
 
-		snapshot vehicle_1_t1 {
-			snapshot rightFrontWheel_t1 : Wheel_1 :>> rightFrontWheel;
+		timeslice vehicle_1_t1 {
+			individual rightFrontWheel_t1 : Wheel_1 :>> rightFrontWheel;
 		}
 
 		first vehicle_1_t0 then vehicle_1_t1;