Merge pull request #669 from Systems-Modeling/ST6RI-864

ST6RI-864 Additional semantic transformation bugs

Author: seidewitz

kerml/src/examples/Simple Tests/Behaviors.kerml

@@ -13,6 +13,9 @@ package Behaviors {
     class C {
         var z = A().y;
         step a : A;
+        step b : B;
         binding z = a.y;
+        flow a.y to b.x1;
     }
+    abstract flow msg of C;
 }

org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_Behaviors.kerml.xt

@@ -5,7 +5,9 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 		File {from ="/library/Base.kerml"}
 		File {from ="/library/Links.kerml"}
 		File {from ="/library/Occurrences.kerml"}
+		File {from ="/library/Objects.kerml"}
 		File {from ="/library/Performances.kerml"}
+		File {from ="/library/Transfers.kerml"}
 		File {from ="/library/ControlFunctions.kerml"}
 	}
 	Workspace {
@@ -15,7 +17,9 @@ XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
 				File {from ="/library/Base.kerml"}
 				File {from ="/library/Links.kerml"}
 				File {from ="/library/Occurrences.kerml"}
+				File {from ="/library/Objects.kerml"}
 				File {from ="/library/Performances.kerml"}
+				File {from ="/library/Transfers.kerml"}
 				File {from ="/library/ControlFunctions.kerml"}
 			}
 		}
@@ -34,6 +38,14 @@ package Behaviors {
     }
     behavior B specializes A {
         in x1;
-        out y1;
+        out var y1;
     }
+    class C {
+        var z = A().y;
+        step a : A;
+        step b : B;
+        binding z = a.y;
+        flow a.y to b.x1;
+    }
+    abstract flow msg of C;
 }

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,Flows::MessageAction,Package,OwningMembership
+true,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
@@ -62,6 +62,8 @@ true,checkIfActionUsageSubactionSpecialization,IfActionUsage,Actions::Action::if
 true,checkWhileLoopActionUsageSubactionSpecialization,WhileLoopActionUsage,Actions::Action::whileLoops,ActionUsage,FeatureMembership
 true,checkForLoopActionUsageSubactionSpecialization,ForLoopActionUsage,Actions::Action::forLoops,ActionUsage,FeatureMembership
 true,checkPerformActionUsageSpecialization,PerformActionUsage,Parts::Part::performedActions,PartUsage,FeatureMembership
+true,checkTerminateActionUsageSubactionSpecialization,TerminateActionUsage,Actions::Action::terminateSubactions,ActionDefinition,FeatureMembership
+true,checkTerminateActionUsageSubactionSpecialization,TerminateActionUsage,Actions::Action::terminateSubactions,ActionUsage,FeatureMembership
 true,checkPerformActionUsageSpecialization,PerformActionUsage,Parts::Part::performedActions,PartDefinition,FeatureMembership
 true,checkStateUsageSpecialization,StateUsage,States::stateActions,Package,OwningMembership
 true,checkStateUsageExclusiveStateSpecialization,StateUsage,States::StateAction::exclusiveStates,StateUsage,FeatureMembership
@@ -86,20 +88,20 @@ true,checkConcernUsageFramedConcernSpecialization,ConcernUsage,Requirements::Req
 true,checkCaseUsageSpecialization,CaseUsage,Cases::cases,Package,OwningMembership
 true,checkCaseUsageSubcaseSpecialization,CaseUsage,Cases::Case::subcases,CaseUsage,FeatureMembership
 true,checkAnalysisCaseUsageSpecialization,AnalysisCaseUsage,AnalysisCases::analysisCases,Package,OwningMembership
-false,checkAnalysisCaseUsageSubAnalysisCaseSpecialization,AnalysisCaseUsage,AnalysisCases::AnalysisCase::subAnalysisCases,AnalysisCaseUsage,FeatureMembership
-false,checkAnalysisCaseUsageSubAnalysisCaseSpecialization,AnalysisCaseUsage,AnalysisCases::AnalysisCase::subAnalysisCases,AnalysisCaseDefinition,FeatureMembership
+true,checkAnalysisCaseUsageSubAnalysisCaseSpecialization,AnalysisCaseUsage,AnalysisCases::AnalysisCase::subAnalysisCases,AnalysisCaseUsage,FeatureMembership
+true,checkAnalysisCaseUsageSubAnalysisCaseSpecialization,AnalysisCaseUsage,AnalysisCases::AnalysisCase::subAnalysisCases,AnalysisCaseDefinition,FeatureMembership
 true,checkVerificationCaseUsageSpecialization,VerificationCaseUsage,VerificationCases::verificationCases,Package,OwningMembership
-false,checkVerificationCaseUsageSubVerificationCaseSpecialization,VerificationCaseUsage,VerificationCases::VerificationCase::subVerificationCases,VerificationCaseUsage,FeatureMembership
-false,checkVerificationCaseUsageSubVerificationCaseSpecialization,VerificationCaseUsage,VerificationCases::VerificationCase::subVerificationCases,VerificationCaseDefinition,FeatureMembership
+true,checkVerificationCaseUsageSubVerificationCaseSpecialization,VerificationCaseUsage,VerificationCases::VerificationCase::subVerificationCases,VerificationCaseUsage,FeatureMembership
+true,checkVerificationCaseUsageSubVerificationCaseSpecialization,VerificationCaseUsage,VerificationCases::VerificationCase::subVerificationCases,VerificationCaseDefinition,FeatureMembership
 true,checkUseCaseUsageSpecialization,UseCaseUsage,UseCases::useCases,Package,OwningMembership
 true,checkUseCaseUsageSubUseCaseSpecialization,UseCaseUsage,UseCases::UseCase::subUseCases,UseCaseUsage,FeatureMembership
 true,checkUseCaseUsageSubUseCaseSpecialization,UseCaseUsage,UseCases::UseCase::subUseCases,UseCaseDefinition,FeatureMembership
-false,checkIncludeUseCaseUsageSpecialization,IncludeUseCaseUsage,UseCases::UseCase::includedUseCases,UseCaseUsage,FeatureMembership
-false,checkIncludeUseCaseUsageSpecialization,IncludeUseCaseUsage,UseCases::UseCase::includedUseCases,UseCaseDefinition,FeatureMembership
+true,checkIncludeUseCaseUsageSpecialization,IncludeUseCaseUsage,UseCases::UseCase::includedUseCases,UseCaseUsage,FeatureMembership
+true,checkIncludeUseCaseUsageSpecialization,IncludeUseCaseUsage,UseCases::UseCase::includedUseCases,UseCaseDefinition,FeatureMembership
 true,checkViewUsageSpecialization,ViewUsage,Views::views,Package,OwningMembership
 true,checkViewUsageSubviewSpecialization,ViewUsage,Views::View::subviews,ViewUsage,FeatureMembership
 true,checkViewUsageSubviewSpecialization,ViewUsage,Views::View::subviews,ViewDefinition,FeatureMembership
-false,checkViewpointUsageSpecialization,ViewpointUsage,Views::viewpoints,Package,OwningMembership
+true,checkViewpointUsageSpecialization,ViewpointUsage,Views::viewpointChecks,Package,OwningMembership
 true,checkViewpointUsageViewpointSatisfactionSpecialization,ViewpointUsage,Views::View::viewpointSatisfactions,ViewDefinition,FeatureMembership
 true,checkViewpointUsageViewpointSatisfactionSpecialization,ViewpointUsage,Views::View::viewpointSatisfactions,ViewUsage,FeatureMembership
 true,checkRenderingUsageSpecialization,RenderingUsage,Views::renderings,Package,OwningMembership

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

@@ -65,7 +65,12 @@ action def ControlNodeTest {
 	action B1 {
 	    in b;
 	}
+	then M;
+	
 	action B2 {
 	    in b;
 	}
+	then M; 
+	
+	merge M;
 }

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

@@ -58,7 +58,7 @@ action def DecisionTest {
 	if x > 1 then A2;
 	else A3; 
 
-	then decide; 
+	then decide D; 
 	if true then A1;
 	if false then A2;
 

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

@@ -86,6 +86,12 @@ package UseCaseTest {
 	part system : System {
 		include uc2;
 		perform u;
+		use case uc1 : UC1;
+	}
+	
+	use case uc3 {
+	    include u;
+	    include system.uc1;
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023, 2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -44,8 +44,9 @@ protected String getSubactionType() {
 	}
 
 	public boolean isSubAnalysisCase() {
-		Type owningType = getTarget().getOwningType();
-		return isNonEntryExitComposite() &&
+		AnalysisCaseUsage target = getTarget();
+		Type owningType = target.getOwningType();
+		return target.isComposite() &&
 			   (owningType instanceof AnalysisCaseDefinition || owningType instanceof AnalysisCaseUsage);
 	}
 

org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java

@@ -48,16 +48,10 @@ protected String getSubactionType() {
 	}		
 
 	public boolean isSubcalculation() {
-		/*
-		 * TODO: Update checkCalculationUsageSubcalculationSpecialization
-		 * 
-    	 * isNonEntryExitComposite check is not part of the OCL
-    	 * See SYSML12-298
-		 */
 		CalculationUsage target = getTarget();
 		Type owningType = target.getOwningType();
-		return isNonEntryExitComposite() &&
-			   owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage;
+		return target.isComposite() &&
+			   (owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage);
 	}
 
 	@Override

org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java

@@ -57,15 +57,9 @@ protected String getSubactionType() {
 	}
 
 	public boolean isSubcase() {
-		/*
-		 * TODO: Update checkCaseUsageSubcaseSpecialization
-		 * 
-		 * nonEntryExit part of the check is not reflected of the OCL
-    	 * See SYSML21-298
-		 */
 		CaseUsage target = getTarget();
 		Type owningType = target.getOwningType();
-		return isNonEntryExitComposite() &&
+		return target.isComposite() &&
 			   (owningType instanceof CaseDefinition || owningType instanceof CaseUsage);
 	}
 

org.omg.sysml/src/org/omg/sysml/adapter/ElementAdapterFactory.java

@@ -82,6 +82,11 @@ public ElementAdapter caseActionUsage(ActionUsage element) {
 			return new ActionUsageAdapter(element);
 		}
 
+		@Override
+		public ElementAdapter caseAnalysisCaseUsage(AnalysisCaseUsage element) {
+			return new AnalysisCaseUsageAdapter(element);
+		}
+		
 		@Override
 		public ElementAdapter caseAnnotatingElement(AnnotatingElement element) {
 			return new AnnotatingElementAdapter(element);
@@ -597,6 +602,11 @@ public ElementAdapter caseUseCaseUsage(UseCaseUsage element) {
 			return new UseCaseUsageAdapter(element);
 		}
 
+		@Override
+		public ElementAdapter caseVerificationCaseUsage(VerificationCaseUsage element) {
+			return new VerificationCaseUsageAdapter(element);
+		}
+		
 		@Override
 		public ElementAdapter caseViewUsage(ViewUsage element) {
 			return new ViewUsageAdapter(element);