YAKHMI-1024, STatechart and Test for static/dynamic Choice Test

test-plugins/org.yakindu.sct.generator.java.test/model/model.sgen

@@ -22,6 +22,31 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
+	
+	statechart BooleanExpressions {
+		feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		}
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+	}
+	
+	statechart BitExpressions {
+		feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		}
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+	}
+		
 	statechart Choice {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
@@ -66,7 +91,19 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	
+		
+	statechart DynamicChoice{
+		feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		}
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+	}
+		
 	statechart EntryChoice {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
@@ -78,8 +115,7 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	
-	
+		
 	statechart ExitOnSelfTransition {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
@@ -269,18 +305,8 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	statechart SyncFork {
-		feature Outlet {
-			targetProject = "org.yakindu.sct.generator.java.test"
-			targetFolder = "src-gen"
-		}
-
-		feature GeneralFeatures {
-			TimerService = true
-			RuntimeService = true
-		}
-	}
-	statechart SyncJoin {
+	
+	statechart StaticChoice {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -291,7 +317,8 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	statechart ValuedEvents {
+	
+	statechart SyncFork {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -302,7 +329,7 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	statechart BooleanExpressions {
+	statechart SyncJoin {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -313,7 +340,7 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	statechart BitExpressions {
+	statechart ValuedEvents {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"

test-plugins/org.yakindu.sct.generator.java.test/model/test.sgen

@@ -80,6 +80,15 @@ GeneratorModel for sctunit::java {
 		}			
 	}
 	
+	test DynamicChoice{
+		
+		feature Outlet{ 
+			targetProject = "org.yakindu.sct.generator.java.test" 
+			targetFolder = "test-gen"			
+		}			
+	}
+	
+	
 	
 	test EnterState{
 		
@@ -290,6 +299,14 @@ GeneratorModel for sctunit::java {
 		}			
 	}
 	
+	test StaticChoice{
+		
+		feature Outlet{ 
+			targetProject = "org.yakindu.sct.generator.java.test" 
+			targetFolder = "test-gen"			
+		}			
+	}
+	
 	test STextKeywordsInStatesAndRegions{
 		
 		feature Outlet{