Merge branch 'SYSML2_-159' into ST6RI-825

Author: seidewitz

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

@@ -21,6 +21,8 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 		File {from ="/library.systems/Ports.sysml"}
 		File {from ="/library.systems/Actions.sysml"}
 		File {from ="/library.systems/Calculations.sysml"}
+		File {from ="/library.systems/Connections.sysml"}
+		File {from ="/library.systems/FlowConnections.sysml"}
 		File {from ="/library.domain/Quantities and Units/Quantities.sysml"}
 		File {from ="/library.domain/Quantities and Units/MeasurementReferences.sysml"}
 		File {from ="/library.domain/Quantities and Units/ISQ.sysml"}
@@ -51,6 +53,8 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 				File {from ="/library.systems/Ports.sysml"}
 				File {from ="/library.systems/Actions.sysml"}
 				File {from ="/library.systems/Calculations.sysml"}
+				File {from ="/library.systems/Connections.sysml"}
+				File {from ="/library.systems/FlowConnections.sysml"}
 				File {from ="/library.domain/Quantities and Units/Quantities.sysml"}
 				File {from ="/library.domain/Quantities and Units/MeasurementReferences.sysml"}
 				File {from ="/library.domain/Quantities and Units/ISQ.sysml"}
@@ -90,6 +94,19 @@ package ActionTest {
 			else done;
 	}
 
+	action a2 {
+		in s : S;
+		action aa {
+			out part target;
+		}
+		flow aa.target to snd1.receiver;
+		action snd1 send { 
+			:>> payload = s;
+		}
+		action snd2 send via this to aa.target;
+		bind s = snd2.payload;
+	}
+	
 	action b {
 		attribute f : ScalarValues::Boolean;
 		ref action a : A;

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

@@ -3,24 +3,40 @@ XPECT_SETUP org.omg.sysml.xpect.tests.simpletests.SysMLTests
 	ResourceSet {
 		ThisFile {}
 		File {from ="/library.kernel/Base.kerml"}
+		File {from ="/library.kernel/Links.kerml"}
        	File {from ="/library.kernel/Occurrences.kerml"}
        	File {from ="/library.kernel/Objects.kerml"}
+       	File {from ="/library.kernel/Performances.kerml"}
+       	File {from ="/library.kernel/StatePerformances.kerml"}
+       	File {from ="/library.kernel/Transfers.kerml"}
        	File {from ="/library.systems/Attributes.sysml"}
  		File {from ="/library.systems/Items.sysml"}
  		File {from ="/library.systems/Parts.sysml"}
  		File {from ="/library.systems/Ports.sysml"}
+ 		File {from ="/library.systems/Connections.sysml"}
+ 		File {from ="/library.systems/FlowConnections.sysml"}
+ 		File {from ="/library.systems/Actions.sysml"}
+ 		File {from ="/library.systems/States.sysml"}
 	}
 	Workspace {
 		JavaProject {
 			SrcFolder {
 				ThisFile {}
 				File {from ="/library.kernel/Base.kerml"}
+				File {from ="/library.kernel/Links.kerml"}
 		       	File {from ="/library.kernel/Occurrences.kerml"}
 		       	File {from ="/library.kernel/Objects.kerml"}
+		       	File {from ="/library.kernel/Performances.kerml"}
+		       	File {from ="/library.kernel/StatePerformances.kerml"}
+       			File {from ="/library.kernel/Transfers.kerml"}
 		       	File {from ="/library.systems/Attributes.sysml"}
 				File {from ="/library.systems/Items.sysml"}
 				File {from ="/library.systems/Parts.sysml"}
  				File {from ="/library.systems/Ports.sysml"}
+ 				File {from ="/library.systems/Connections.sysml"}
+ 				File {from ="/library.systems/FlowConnections.sysml"}
+ 				File {from ="/library.systems/Actions.sysml"}
+ 				File {from ="/library.systems/States.sysml"}
 			}
 		}
 	}
@@ -34,20 +50,41 @@ package PartTest {
 	public part def A {
 		part <'1'> b: B;
 		protected port c: C;
-		readonly attribute x;
+		readonly attribute x[0..2];
 		derived ref attribute y :> x;
+		ref z;
 	}
 
+	item def S;
+	
 	abstract part def <xx> B {
 		public abstract part a: A;
-		port x: ~C;
+		public abstract part b subsets a;
+		public abstract part c subsets a;
+		port x: ~C {
+		    port p;
+		    ref port q;
+		}
 		package P { }
+		
+		succession flow x.p to a1.aa.receiver;
+		
+		action a1 {
+			accept S via x;
+			action aa accept S;
+		}
+		perform action a2;
+		
+		state s1;
+		exhibit state s2;
 	}
 
 	private port def C {
 		private in ref y: A, B;
 		alias z1 for y;
 		alias z2 for y;
+		port c1 : C;
+		ref port c2 : C;
 	}
 
     part p1 :> p2;
@@ -56,4 +93,4 @@ package PartTest {
 
     part p4 :> p4;
 
-}
+}