SYSML2_-417 Updated the semantic tests.

Author: seidewitz

org.omg.sysml.interactive.tests/resources/org/omg/sysml/semantics/tests/sysml-simple-specializations.csv

@@ -2,7 +2,7 @@ true,checkItemDefinitionSpecialization,ItemDefinition,Items::Item,Package,Owning
 true,checkPartDefinitionSpecialization,PartDefinition,Parts::Part,Package,OwningMembership
 true,checkPortDefinitionSpecialization,PortDefinition,Ports::Port,Package,OwningMembership
 true,checkConnectionDefinitionSpecialization,ConnectionDefinition,Connections::Connection,Package,OwningMembership
-false,checkFlowDefinitionSpecialization,FlowDefinition,FlowConnections::MessageConnection,Package,OwningMembership
+false,checkFlowDefinitionSpecialization,FlowDefinition,Flows::MessageAction,Package,OwningMembership
 true,checkInterfaceDefinitionSpecialization,InterfaceDefinition,Interfaces::Interface,Package,OwningMembership
 true,checkAllocationDefinitionSpecialization,AllocationDefinition,Allocations::Allocation,Package,OwningMembership
 true,checkActionDefinitionSpecialization,ActionDefinition,Actions::Action,Package,OwningMembership
@@ -43,8 +43,8 @@ true,checkPortUsageSubportSpecialization,PortUsage,Ports::Port::subports,PortDef
 true,checkPortUsageOwnedPortSpecialization,PortUsage,Parts::Part::ownedPorts,PartUsage,FeatureMembership
 true,checkPortUsageOwnedPortSpecialization,PortUsage,Parts::Part::ownedPorts,PartDefinition,FeatureMembership
 true,checkConnectionUsageSpecialization,ConnectionUsage,Connections::connections,Package,OwningMembership
-true,checkFlowUsageSpecialization,FlowUsage,FlowConnections::messageConnections,Package,OwningMembership
-true,checkSuccessionFlowUsageSpecialization,SuccessionFlowUsage,FlowConnections::successionFlowConnections,Package,OwningMembership
+true,checkFlowUsageSpecialization,FlowUsage,Flows::messages,Package,OwningMembership
+true,checkSuccessionFlowUsageSpecialization,SuccessionFlowUsage,Flows::successionFlows,Package,OwningMembership
 true,checkInterfaceUsageSpecialization,InterfaceUsage,Interfaces::interfaces,Package,OwningMembership
 true,checkAllocationUsageSpecialization,AllocationUsage,Allocations::allocations,Package,OwningMembership
 true,checkActionUsageSpecialization,ActionUsage,Actions::actions,Package,OwningMembership

org.omg.sysml.interactive.tests/src/org/omg/sysml/semantics/tests/SysMLBinaryRelationTest.java

@@ -97,35 +97,35 @@ public void checkInterfaceUsageBinarySpecialization() {
 	}
 
 	@Test
-	public void checkFlowConnectionUsageFlowSpecialization() {
-		//Succession flow connection is always binary, no base case
+	public void checkFlowUsageFlowSpecialization() {
+		// A FlowUsage is always binary, no base case
 		var resource = getResource();
-		var flowConnectionUsage = SysMLFactory.eINSTANCE.createFlowUsage();
+		var flowUsage = SysMLFactory.eINSTANCE.createFlowUsage();
 
-		resource.getContents().add(flowConnectionUsage);
+		resource.getContents().add(flowUsage);
 
-		addEndTo(flowConnectionUsage);
-		addEndTo(flowConnectionUsage);
+		addEndTo(flowUsage);
+		addEndTo(flowUsage);
 
-		ElementUtil.transformAll(flowConnectionUsage, true);
+		ElementUtil.transformAll(flowUsage, true);
 
-		assertTrue(specializes(flowConnectionUsage, "FlowConnections::flowConnections"));
+		assertTrue(specializes(flowUsage, "Flows::flows"));
 	}
 
 	@Test
-	public void checkSuccessionFlowConnectionUsageSpecialization() {
-		//Succession flow connection is always binary, no base case
+	public void checkSuccessionFlowUsageSpecialization() {
+		// A SuccessionFlowUsag is always binary, no base case
 		var resource = getResource();
-		var interfaceDefinition = SysMLFactory.eINSTANCE.createSuccessionFlowUsage();
+		var successionFlowUsage = SysMLFactory.eINSTANCE.createSuccessionFlowUsage();
 
-		resource.getContents().add(interfaceDefinition);
+		resource.getContents().add(successionFlowUsage);
 
-		addEndTo(interfaceDefinition);
-		addEndTo(interfaceDefinition);
+		addEndTo(successionFlowUsage);
+		addEndTo(successionFlowUsage);
 
-		ElementUtil.transformAll(interfaceDefinition, true);
+		ElementUtil.transformAll(successionFlowUsage, true);
 
-		assertTrue(specializes(interfaceDefinition, "FlowConnections::successionFlowConnections"));
+		assertTrue(specializes(successionFlowUsage, "Flows::successionFlows"));
 	}
 
 	//Utility methods