changed Name of TimeTrigger Tests, added DeepEntry and EntryChoice Test, updated AllTests

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

@@ -55,7 +55,7 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	statechart DeepEntry {
+	statechart DeepEntry{
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -66,6 +66,20 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
+	
+	statechart EntryChoice {
+		feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		}
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+	}
+	
+	
 	statechart ExitOnSelfTransition {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
@@ -93,15 +107,6 @@ GeneratorModel for yakindu::java {
 		}
 		
 	}
-	
-	statechart EntryChoice {
-		feature Outlet {
-			targetProject = "org.yakindu.sct.generator.java.test"
-			targetFolder = "src-gen"
-		}
-
-	}
-	
 	statechart EnterState {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
@@ -158,6 +163,32 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
+		
+	statechart LogicalAnd {
+			feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		} 
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+		
+	}
+
+	statechart LogicalOr {
+			feature Outlet {
+			targetProject = "org.yakindu.sct.generator.java.test"
+			targetFolder = "src-gen"
+		} 
+
+		feature GeneralFeatures {
+			TimerService = true
+			RuntimeService = true
+		}
+		
+	}	
 	
 	statechart Parenthesis {
 		feature Outlet {
@@ -479,7 +510,7 @@ GeneratorModel for yakindu::java {
 		}
 	}
 	
-	statechart TransitionWithoutCondition {
+	statechart TimedTransitions {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -491,7 +522,7 @@ GeneratorModel for yakindu::java {
 		}
 	}
 	
-	statechart TimeTrigger {
+	statechart TransitionWithoutCondition {
 		feature Outlet {
 			targetProject = "org.yakindu.sct.generator.java.test"
 			targetFolder = "src-gen"
@@ -502,31 +533,5 @@ GeneratorModel for yakindu::java {
 			RuntimeService = true
 		}
 	}
-	
-	statechart LogicalAnd {
-			feature Outlet {
-			targetProject = "org.yakindu.sct.generator.java.test"
-			targetFolder = "src-gen"
-		} 
-
-		feature GeneralFeatures {
-			TimerService = true
-			RuntimeService = true
-		}
-		
-	}
-
-	statechart LogicalOr {
-			feature Outlet {
-			targetProject = "org.yakindu.sct.generator.java.test"
-			targetFolder = "src-gen"
-		} 
-
-		feature GeneralFeatures {
-			TimerService = true
-			RuntimeService = true
-		}
-		
-	}
 
 }

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

@@ -7,7 +7,7 @@ GeneratorModel for sctunit::java {
 			targetFolder = "test-gen"			
 		}			
 	}
-	
+
 	test AlwaysOncycle{
 		
 		feature Outlet{ 
@@ -80,6 +80,7 @@ GeneratorModel for sctunit::java {
 		}			
 	}
 	
+	
 	test EnterState{
 		
 		feature Outlet{ 
@@ -321,7 +322,7 @@ GeneratorModel for sctunit::java {
 		}			
 	}
 
-	test TimeTrigger{
+	test TimedTransitions{
 		
 		feature Outlet{ 
 			targetProject = "org.yakindu.sct.generator.java.test"