Added New Tests for Hierarchy, LocalActions, ParallelRegions and ShallowHistory

TestScenarios/CMakeLists.txt

@@ -7,7 +7,17 @@ add_definitions( -Wall -O0 -g)
 add_subdirectory(src-gen-c/InterfaceTest)
 add_subdirectory(src-gen-c/Test_Expression)
 add_subdirectory(src-gen-c/Test_Hierarchy)
+add_subdirectory(src-gen-c/Test_ParallelRegions)
+#add_subdirectory(src-gen-c/Test_Transition)
+add_subdirectory(src-gen-c/Test_ShallowHistory)
+#add_subdirectory(src-gen-c/Test_LocalActions)
+
+
 add_subdirectory(test-c/InterfaceTest)
 add_subdirectory(test-c/Test_Expression)
 add_subdirectory(test-c/Test_Hierarchy)
+add_subdirectory(test-c/Test_ParallelRegions)
+#add_subdirectory(test-c/Test_Transition)
+add_subdirectory(test-c/Test_ShallowHistory)
+#add_subdirectory(test-c/Test_LocalActions)
 

TestScenarios/TestModels/Test_Hierarchy.sct

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:sgraph="http://www.yakindu.org/sct/2.0.0" xmlns:stext="http://www.yakindu.org/sct/statechart/SText">
   <sgraph:Statechart xmi:id="_Mv_1gPZlEeCSetPXFd1ZUw" name="Test_Hierarchy" expression="interface:&#xA;in event event1&#xA;in event event2&#xA;in event event3&#xA;in event event4&#xA;in event event5&#xA;in event event6&#xA;in event event7&#xA;in event event8&#xA;in event event9&#xA;in event event10&#xA;in event event11&#xA;in event event12&#xA;in event event13&#xA;in event event14&#xA;in event event15&#xA;in event event16&#xA;var s1 : integer&#xA;var s2 : integer&#xA;">
-    <scopes xsi:type="stext:InterfaceScope" xmi:id="_YxpRsAFWEeGBE7eesluF0A">
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRsQFWEeGBE7eesluF0A" name="event1" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRsgFWEeGBE7eesluF0A" name="event2" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRswFWEeGBE7eesluF0A" name="event3" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRtAFWEeGBE7eesluF0A" name="event4" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRtQFWEeGBE7eesluF0A" name="event5" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRtgFWEeGBE7eesluF0A" name="event6" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRtwFWEeGBE7eesluF0A" name="event7" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRuAFWEeGBE7eesluF0A" name="event8" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRuQFWEeGBE7eesluF0A" name="event9" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRugFWEeGBE7eesluF0A" name="event10" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRuwFWEeGBE7eesluF0A" name="event11" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRvAFWEeGBE7eesluF0A" name="event12" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRvQFWEeGBE7eesluF0A" name="event13" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRvgFWEeGBE7eesluF0A" name="event14" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRvwFWEeGBE7eesluF0A" name="event15" direction="in"/>
-      <declarations xsi:type="stext:EventDefinition" xmi:id="_YxpRwAFWEeGBE7eesluF0A" name="event16" direction="in"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_YxpRwQFWEeGBE7eesluF0A" name="s1" type="integer"/>
-      <declarations xsi:type="stext:VariableDefinition" xmi:id="_YxpRwgFWEeGBE7eesluF0A" name="s2" type="integer"/>
+    <scopes xsi:type="stext:InterfaceScope" xmi:id="_LxLiwBQzEeGPHvKqG6e0zg">
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiwRQzEeGPHvKqG6e0zg" name="event1" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiwhQzEeGPHvKqG6e0zg" name="event2" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiwxQzEeGPHvKqG6e0zg" name="event3" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLixBQzEeGPHvKqG6e0zg" name="event4" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLixRQzEeGPHvKqG6e0zg" name="event5" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLixhQzEeGPHvKqG6e0zg" name="event6" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLixxQzEeGPHvKqG6e0zg" name="event7" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiyBQzEeGPHvKqG6e0zg" name="event8" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiyRQzEeGPHvKqG6e0zg" name="event9" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiyhQzEeGPHvKqG6e0zg" name="event10" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLiyxQzEeGPHvKqG6e0zg" name="event11" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLizBQzEeGPHvKqG6e0zg" name="event12" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLizRQzEeGPHvKqG6e0zg" name="event13" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLizhQzEeGPHvKqG6e0zg" name="event14" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxLizxQzEeGPHvKqG6e0zg" name="event15" direction="in"/>
+      <declarations xsi:type="stext:EventDefinition" xmi:id="_LxMJ0BQzEeGPHvKqG6e0zg" name="event16" direction="in"/>
+      <declarations xsi:type="stext:VariableDefinition" xmi:id="_LxMJ0RQzEeGPHvKqG6e0zg" name="s1" type="integer"/>
+      <declarations xsi:type="stext:VariableDefinition" xmi:id="_LxMJ0hQzEeGPHvKqG6e0zg" name="s2" type="integer"/>
     </scopes>
     <regions xmi:id="_MwAckvZlEeCSetPXFd1ZUw" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_MwBDpvZlEeCSetPXFd1ZUw">
@@ -27,28 +27,28 @@
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_MwBqt_ZlEeCSetPXFd1ZUw" name="State1" incomingTransitions="_MwHxU_ZlEeCSetPXFd1ZUw _gDLuUPiSEeC4at_AzcYiGg _PeCEgPiTEeC4at_AzcYiGg _R5300PiTEeC4at_AzcYiGg _VBno4PiTEeC4at_AzcYiGg" expression="entry / s1=1;&#xA;exit / s1-=1;">
         <outgoingTransitions xmi:id="_ys3bsPiREeC4at_AzcYiGg" expression="event1" target="_vau8kPiREeC4at_AzcYiGg">
-          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yxx0kAFWEeGBE7eesluF0A">
-            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yxx0kQFWEeGBE7eesluF0A" event="_YxpRsQFWEeGBE7eesluF0A"/>
+          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxcBcBQzEeGPHvKqG6e0zg">
+            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LxcBcRQzEeGPHvKqG6e0zg" event="_LxLiwRQzEeGPHvKqG6e0zg"/>
           </trigger>
         </outgoingTransitions>
-        <scopes xmi:id="_YxrG4AFWEeGBE7eesluF0A">
-          <declarations xsi:type="stext:LocalReaction" xmi:id="_YxrG4QFWEeGBE7eesluF0A">
-            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YxrG4gFWEeGBE7eesluF0A">
-              <triggers xsi:type="stext:EntryEvent" xmi:id="_YxrG4wFWEeGBE7eesluF0A"/>
+        <scopes xmi:id="_LxN_ABQzEeGPHvKqG6e0zg">
+          <declarations xsi:type="stext:LocalReaction" xmi:id="_LxN_ARQzEeGPHvKqG6e0zg">
+            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxN_AhQzEeGPHvKqG6e0zg">
+              <triggers xsi:type="stext:EntryEvent" xmi:id="_LxN_AxQzEeGPHvKqG6e0zg"/>
             </trigger>
-            <effect xsi:type="stext:ReactionEffect" xmi:id="_YxrG5AFWEeGBE7eesluF0A">
-              <actions xsi:type="stext:Assignment" xmi:id="_YxrG5QFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YxrG5gFWEeGBE7eesluF0A" value="1"/>
+            <effect xsi:type="stext:ReactionEffect" xmi:id="_LxN_BBQzEeGPHvKqG6e0zg">
+              <actions xsi:type="stext:Assignment" xmi:id="_LxN_BRQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg">
+                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LxN_BhQzEeGPHvKqG6e0zg" value="1"/>
               </actions>
             </effect>
           </declarations>
-          <declarations xsi:type="stext:LocalReaction" xmi:id="_YxrG5wFWEeGBE7eesluF0A">
-            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YxrG6AFWEeGBE7eesluF0A">
-              <triggers xsi:type="stext:ExitEvent" xmi:id="_YxrG6QFWEeGBE7eesluF0A"/>
+          <declarations xsi:type="stext:LocalReaction" xmi:id="_LxN_BxQzEeGPHvKqG6e0zg">
+            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxN_CBQzEeGPHvKqG6e0zg">
+              <triggers xsi:type="stext:ExitEvent" xmi:id="_LxN_CRQzEeGPHvKqG6e0zg"/>
             </trigger>
-            <effect xsi:type="stext:ReactionEffect" xmi:id="_YxrG6gFWEeGBE7eesluF0A">
-              <actions xsi:type="stext:Assignment" xmi:id="_YxrG6wFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A" operator="-=">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YxrG7AFWEeGBE7eesluF0A" value="1"/>
+            <effect xsi:type="stext:ReactionEffect" xmi:id="_LxN_ChQzEeGPHvKqG6e0zg">
+              <actions xsi:type="stext:Assignment" xmi:id="_LxN_CxQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg" operator="-=">
+                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LxN_DBQzEeGPHvKqG6e0zg" value="1"/>
               </actions>
             </effect>
           </declarations>
@@ -56,28 +56,28 @@
         <subRegions xmi:id="_w_O_wPiSEeC4at_AzcYiGg" name="Region1">
           <vertices xsi:type="sgraph:State" xmi:id="_yYbAQPiSEeC4at_AzcYiGg" name="State9" incomingTransitions="_1vGoMPiSEeC4at_AzcYiGg _9XYoMPiSEeC4at_AzcYiGg _YoMG8PiTEeC4at_AzcYiGg" expression="entry / s1+=1;&#xA;exit / s1-=1;">
             <outgoingTransitions xmi:id="_7lpk0PiSEeC4at_AzcYiGg" expression="event9" target="_3mSzUPiSEeC4at_AzcYiGg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yx8MoAFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yx8MoQFWEeGBE7eesluF0A" event="_YxpRuQFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxwKgBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LxwKgRQzEeGPHvKqG6e0zg" event="_LxLiyRQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
-            <scopes xmi:id="_Yx034AFWEeGBE7eesluF0A">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_Yx034QFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yx2GAAFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_Yx2GAQFWEeGBE7eesluF0A"/>
+            <scopes xmi:id="_LxlycBQzEeGPHvKqG6e0zg">
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_LxlycRQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxlychQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:EntryEvent" xmi:id="_LxlycxQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_Yx2GAgFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_Yx2GAwFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A" operator="+=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Yx2GBAFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_LxlydBQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_LxlydRQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg" operator="+=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LxlydhQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_Yx2GBQFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yx2GBgFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:ExitEvent" xmi:id="_Yx2GBwFWEeGBE7eesluF0A"/>
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_LxlydxQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LxlyeBQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:ExitEvent" xmi:id="_LxlyeRQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_Yx2GCAFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_Yx2GCQFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A" operator="-=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Yx2GCgFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_LxlyehQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_LxlyexQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg" operator="-=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LxlyfBQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
@@ -88,28 +88,28 @@
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_3mSzUPiSEeC4at_AzcYiGg" name="State10" incomingTransitions="_7lpk0PiSEeC4at_AzcYiGg _jHEgoPiTEeC4at_AzcYiGg _qCKqgPiTEeC4at_AzcYiGg" expression="entry / s1+=1;&#xA;exit / s1-=1;">
             <outgoingTransitions xmi:id="_9XYoMPiSEeC4at_AzcYiGg" expression="event10" target="_yYbAQPiSEeC4at_AzcYiGg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyHLwAFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YyHLwQFWEeGBE7eesluF0A" event="_YxpRugFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyACIBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LyACIRQzEeGPHvKqG6e0zg" event="_LxLiyhQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
-            <scopes xmi:id="_YyBFIAFWEeGBE7eesluF0A">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyBFIQFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyBFIgFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_YyBFIwFWEeGBE7eesluF0A"/>
+            <scopes xmi:id="_Lx2RIBQzEeGPHvKqG6e0zg">
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_Lx2RIRQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lx2RIhQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:EntryEvent" xmi:id="_Lx2RIxQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyBFJAFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyBFJQFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A" operator="+=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyBFJgFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_Lx2RJBQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_Lx2RJRQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg" operator="+=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Lx2RJhQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyBFJwFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyBFKAFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:ExitEvent" xmi:id="_YyBFKQFWEeGBE7eesluF0A"/>
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_Lx2RJxQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lx2RKBQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:ExitEvent" xmi:id="_Lx2RKRQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyBFKgFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyBFKwFWEeGBE7eesluF0A" varRef="_YxpRwQFWEeGBE7eesluF0A" operator="-=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyBFLAFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_Lx2RKhQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_Lx2RKxQzEeGPHvKqG6e0zg" varRef="_LxMJ0RQzEeGPHvKqG6e0zg" operator="-=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Lx2RLBQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
@@ -119,28 +119,28 @@
       </vertices>
       <vertices xsi:type="sgraph:State" xmi:id="_vau8kPiREeC4at_AzcYiGg" name="State2" incomingTransitions="_ys3bsPiREeC4at_AzcYiGg" expression="entry / s2 = 1;&#xA;exit / s2-=1;">
         <outgoingTransitions xmi:id="_gDLuUPiSEeC4at_AzcYiGg" expression="event6" target="_MwBqt_ZlEeCSetPXFd1ZUw">
-          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YySK4AFWEeGBE7eesluF0A">
-            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YySK4QFWEeGBE7eesluF0A" event="_YxpRtgFWEeGBE7eesluF0A"/>
+          <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyPSsBQzEeGPHvKqG6e0zg">
+            <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LyPSsRQzEeGPHvKqG6e0zg" event="_LxLixhQzEeGPHvKqG6e0zg"/>
           </trigger>
         </outgoingTransitions>
-        <scopes xmi:id="_YyK2IAFWEeGBE7eesluF0A">
-          <declarations xsi:type="stext:LocalReaction" xmi:id="_YyLdMAFWEeGBE7eesluF0A">
-            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyLdMQFWEeGBE7eesluF0A">
-              <triggers xsi:type="stext:EntryEvent" xmi:id="_YyLdMgFWEeGBE7eesluF0A"/>
+        <scopes xmi:id="_LyGIwBQzEeGPHvKqG6e0zg">
+          <declarations xsi:type="stext:LocalReaction" xmi:id="_LyGIwRQzEeGPHvKqG6e0zg">
+            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyGIwhQzEeGPHvKqG6e0zg">
+              <triggers xsi:type="stext:EntryEvent" xmi:id="_LyGIwxQzEeGPHvKqG6e0zg"/>
             </trigger>
-            <effect xsi:type="stext:ReactionEffect" xmi:id="_YyLdMwFWEeGBE7eesluF0A">
-              <actions xsi:type="stext:Assignment" xmi:id="_YyLdNAFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyLdNQFWEeGBE7eesluF0A" value="1"/>
+            <effect xsi:type="stext:ReactionEffect" xmi:id="_LyGIxBQzEeGPHvKqG6e0zg">
+              <actions xsi:type="stext:Assignment" xmi:id="_LyGIxRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg">
+                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LyGIxhQzEeGPHvKqG6e0zg" value="1"/>
               </actions>
             </effect>
           </declarations>
-          <declarations xsi:type="stext:LocalReaction" xmi:id="_YyLdNgFWEeGBE7eesluF0A">
-            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyLdNwFWEeGBE7eesluF0A">
-              <triggers xsi:type="stext:ExitEvent" xmi:id="_YyLdOAFWEeGBE7eesluF0A"/>
+          <declarations xsi:type="stext:LocalReaction" xmi:id="_LyGIxxQzEeGPHvKqG6e0zg">
+            <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyGIyBQzEeGPHvKqG6e0zg">
+              <triggers xsi:type="stext:ExitEvent" xmi:id="_LyGIyRQzEeGPHvKqG6e0zg"/>
             </trigger>
-            <effect xsi:type="stext:ReactionEffect" xmi:id="_YyLdOQFWEeGBE7eesluF0A">
-              <actions xsi:type="stext:Assignment" xmi:id="_YyLdOgFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyLdOwFWEeGBE7eesluF0A" value="1"/>
+            <effect xsi:type="stext:ReactionEffect" xmi:id="_LyGIyhQzEeGPHvKqG6e0zg">
+              <actions xsi:type="stext:Assignment" xmi:id="_LyGIyxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LyGIzBQzEeGPHvKqG6e0zg" value="1"/>
               </actions>
             </effect>
           </declarations>
@@ -148,38 +148,38 @@
         <subRegions xmi:id="_x3yN0PiREeC4at_AzcYiGg" name="Region2">
           <vertices xsi:type="sgraph:State" xmi:id="_08_EMPiREeC4at_AzcYiGg" name="State3" incomingTransitions="_3t66wPiREeC4at_AzcYiGg _kRfh0PiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
             <outgoingTransitions xmi:id="_8XIhkPiREeC4at_AzcYiGg" expression="event2" target="_5TvCAPiREeC4at_AzcYiGg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yyci8AFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yyci8QFWEeGBE7eesluF0A" event="_YxpRsgFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lyd8MBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Lyd8MRQzEeGPHvKqG6e0zg" event="_LxLiwhQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
             <outgoingTransitions xmi:id="_PeCEgPiTEeC4at_AzcYiGg" expression="event11" target="_MwBqt_ZlEeCSetPXFd1ZUw">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyfmQAFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YygNUAFWEeGBE7eesluF0A" event="_YxpRuwFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lyi0sBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Lyi0sRQzEeGPHvKqG6e0zg" event="_LxLiyxQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
             <outgoingTransitions xmi:id="_YoMG8PiTEeC4at_AzcYiGg" expression="event14" target="_yYbAQPiSEeC4at_AzcYiGg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YykewAFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YykewQFWEeGBE7eesluF0A" event="_YxpRvgFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyoUQBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LyoUQRQzEeGPHvKqG6e0zg" event="_LxLizhQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
-            <scopes xmi:id="_YyV1QAFWEeGBE7eesluF0A">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyV1QQFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyV1QgFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_YyV1QwFWEeGBE7eesluF0A"/>
+            <scopes xmi:id="_LyUyQBQzEeGPHvKqG6e0zg">
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_LyUyQRQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyUyQhQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:EntryEvent" xmi:id="_LyUyQxQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyV1RAFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyV1RQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyV1RgFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_LyUyRBQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_LyUyRRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LyUyRhQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyV1RwFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyV1SAFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:ExitEvent" xmi:id="_YyV1SQFWEeGBE7eesluF0A"/>
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_LyUyRxQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LyUySBQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:ExitEvent" xmi:id="_LyUySRQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyV1SgFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyV1SwFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyV1TAFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_LyUyShQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_LyUySxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LyUyTBQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
@@ -190,28 +190,28 @@
           </vertices>
           <vertices xsi:type="sgraph:State" xmi:id="_5TvCAPiREeC4at_AzcYiGg" name="State4" incomingTransitions="_8XIhkPiREeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
             <outgoingTransitions xmi:id="_kRfh0PiSEeC4at_AzcYiGg" expression="event7" target="_08_EMPiREeC4at_AzcYiGg">
-              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yyvd4AFWEeGBE7eesluF0A">
-                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yyvd4QFWEeGBE7eesluF0A" event="_YxpRtwFWEeGBE7eesluF0A"/>
+              <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Ly29wBQzEeGPHvKqG6e0zg">
+                <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Ly29wRQzEeGPHvKqG6e0zg" event="_LxLixxQzEeGPHvKqG6e0zg"/>
               </trigger>
             </outgoingTransitions>
-            <scopes xmi:id="_YyowMAFWEeGBE7eesluF0A">
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyowMQFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyowMgFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:EntryEvent" xmi:id="_YyowMwFWEeGBE7eesluF0A"/>
+            <scopes xmi:id="_Lyua4BQzEeGPHvKqG6e0zg">
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_Lyua4RQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lyua4hQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:EntryEvent" xmi:id="_Lyua4xQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyowNAFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyowNQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyowNgFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_Lyua5BQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_Lyua5RQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Lyua5hQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
-              <declarations xsi:type="stext:LocalReaction" xmi:id="_YyowNwFWEeGBE7eesluF0A">
-                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyowOAFWEeGBE7eesluF0A">
-                  <triggers xsi:type="stext:ExitEvent" xmi:id="_YyowOQFWEeGBE7eesluF0A"/>
+              <declarations xsi:type="stext:LocalReaction" xmi:id="_Lyua5xQzEeGPHvKqG6e0zg">
+                <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lyua6BQzEeGPHvKqG6e0zg">
+                  <triggers xsi:type="stext:ExitEvent" xmi:id="_Lyua6RQzEeGPHvKqG6e0zg"/>
                 </trigger>
-                <effect xsi:type="stext:ReactionEffect" xmi:id="_YyowOgFWEeGBE7eesluF0A">
-                  <actions xsi:type="stext:Assignment" xmi:id="_YyowOwFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyowPAFWEeGBE7eesluF0A" value="1"/>
+                <effect xsi:type="stext:ReactionEffect" xmi:id="_Lyua6hQzEeGPHvKqG6e0zg">
+                  <actions xsi:type="stext:Assignment" xmi:id="_Lyua6xQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                    <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Lyua7BQzEeGPHvKqG6e0zg" value="1"/>
                   </actions>
                 </effect>
               </declarations>
@@ -219,38 +219,38 @@
             <subRegions xmi:id="_-v5IsPiREeC4at_AzcYiGg" name="Region4">
               <vertices xsi:type="sgraph:State" xmi:id="__P10EPiREeC4at_AzcYiGg" name="State5" incomingTransitions="_GZpvYPiSEeC4at_AzcYiGg _nOwkMPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
                 <outgoingTransitions xmi:id="_JU70wPiSEeC4at_AzcYiGg" expression="event3" target="_DCp-YPiSEeC4at_AzcYiGg">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yy5O4AFWEeGBE7eesluF0A">
-                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yy518AFWEeGBE7eesluF0A" event="_YxpRswFWEeGBE7eesluF0A"/>
+                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzFAMBQzEeGPHvKqG6e0zg">
+                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LzFAMRQzEeGPHvKqG6e0zg" event="_LxLiwxQzEeGPHvKqG6e0zg"/>
                   </trigger>
                 </outgoingTransitions>
                 <outgoingTransitions xmi:id="_R5300PiTEeC4at_AzcYiGg" expression="event12" target="_MwBqt_ZlEeCSetPXFd1ZUw">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yy9gUAFWEeGBE7eesluF0A">
-                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yy9gUQFWEeGBE7eesluF0A" event="_YxpRvAFWEeGBE7eesluF0A"/>
+                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzJ4sBQzEeGPHvKqG6e0zg">
+                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LzJ4sRQzEeGPHvKqG6e0zg" event="_LxLizBQzEeGPHvKqG6e0zg"/>
                   </trigger>
                 </outgoingTransitions>
                 <outgoingTransitions xmi:id="_jHEgoPiTEeC4at_AzcYiGg" expression="event15" target="_3mSzUPiSEeC4at_AzcYiGg">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzCY0AFWEeGBE7eesluF0A">
-                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YzCY0QFWEeGBE7eesluF0A" event="_YxpRvwFWEeGBE7eesluF0A"/>
+                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzOKIBQzEeGPHvKqG6e0zg">
+                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LzOKIRQzEeGPHvKqG6e0zg" event="_LxLizxQzEeGPHvKqG6e0zg"/>
                   </trigger>
                 </outgoingTransitions>
-                <scopes xmi:id="_YyzvUAFWEeGBE7eesluF0A">
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_YyzvUQFWEeGBE7eesluF0A">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyzvUgFWEeGBE7eesluF0A">
-                      <triggers xsi:type="stext:EntryEvent" xmi:id="_YyzvUwFWEeGBE7eesluF0A"/>
+                <scopes xmi:id="_Ly8dUBQzEeGPHvKqG6e0zg">
+                  <declarations xsi:type="stext:LocalReaction" xmi:id="_Ly8dURQzEeGPHvKqG6e0zg">
+                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Ly8dUhQzEeGPHvKqG6e0zg">
+                      <triggers xsi:type="stext:EntryEvent" xmi:id="_Ly8dUxQzEeGPHvKqG6e0zg"/>
                     </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_YyzvVAFWEeGBE7eesluF0A">
-                      <actions xsi:type="stext:Assignment" xmi:id="_YyzvVQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyzvVgFWEeGBE7eesluF0A" value="1"/>
+                    <effect xsi:type="stext:ReactionEffect" xmi:id="_Ly8dVBQzEeGPHvKqG6e0zg">
+                      <actions xsi:type="stext:Assignment" xmi:id="_Ly8dVRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Ly8dVhQzEeGPHvKqG6e0zg" value="1"/>
                       </actions>
                     </effect>
                   </declarations>
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_YyzvVwFWEeGBE7eesluF0A">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YyzvWAFWEeGBE7eesluF0A">
-                      <triggers xsi:type="stext:ExitEvent" xmi:id="_YyzvWQFWEeGBE7eesluF0A"/>
+                  <declarations xsi:type="stext:LocalReaction" xmi:id="_Ly8dVxQzEeGPHvKqG6e0zg">
+                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Ly8dWBQzEeGPHvKqG6e0zg">
+                      <triggers xsi:type="stext:ExitEvent" xmi:id="_Ly8dWRQzEeGPHvKqG6e0zg"/>
                     </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_YyzvWgFWEeGBE7eesluF0A">
-                      <actions xsi:type="stext:Assignment" xmi:id="_YyzvWwFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YyzvXAFWEeGBE7eesluF0A" value="1"/>
+                    <effect xsi:type="stext:ReactionEffect" xmi:id="_Ly8dWhQzEeGPHvKqG6e0zg">
+                      <actions xsi:type="stext:Assignment" xmi:id="_Ly8dWxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_Ly8dXBQzEeGPHvKqG6e0zg" value="1"/>
                       </actions>
                     </effect>
                   </declarations>
@@ -258,28 +258,28 @@
               </vertices>
               <vertices xsi:type="sgraph:State" xmi:id="_DCp-YPiSEeC4at_AzcYiGg" name="State6" incomingTransitions="_JU70wPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
                 <outgoingTransitions xmi:id="_nOwkMPiSEeC4at_AzcYiGg" expression="event8" target="__P10EPiREeC4at_AzcYiGg">
-                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzKUoAFWEeGBE7eesluF0A">
-                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YzKUoQFWEeGBE7eesluF0A" event="_YxpRuAFWEeGBE7eesluF0A"/>
+                  <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzcMkBQzEeGPHvKqG6e0zg">
+                    <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LzcMkRQzEeGPHvKqG6e0zg" event="_LxLiyBQzEeGPHvKqG6e0zg"/>
                   </trigger>
                 </outgoingTransitions>
-                <scopes xmi:id="_YzGDMAFWEeGBE7eesluF0A">
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_YzGDMQFWEeGBE7eesluF0A">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzGDMgFWEeGBE7eesluF0A">
-                      <triggers xsi:type="stext:EntryEvent" xmi:id="_YzGDMwFWEeGBE7eesluF0A"/>
+                <scopes xmi:id="_LzTpsBQzEeGPHvKqG6e0zg">
+                  <declarations xsi:type="stext:LocalReaction" xmi:id="_LzTpsRQzEeGPHvKqG6e0zg">
+                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzTpshQzEeGPHvKqG6e0zg">
+                      <triggers xsi:type="stext:EntryEvent" xmi:id="_LzTpsxQzEeGPHvKqG6e0zg"/>
                     </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_YzGDNAFWEeGBE7eesluF0A">
-                      <actions xsi:type="stext:Assignment" xmi:id="_YzGDNQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzGDNgFWEeGBE7eesluF0A" value="1"/>
+                    <effect xsi:type="stext:ReactionEffect" xmi:id="_LzTptBQzEeGPHvKqG6e0zg">
+                      <actions xsi:type="stext:Assignment" xmi:id="_LzTptRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzTpthQzEeGPHvKqG6e0zg" value="1"/>
                       </actions>
                     </effect>
                   </declarations>
-                  <declarations xsi:type="stext:LocalReaction" xmi:id="_YzGDNwFWEeGBE7eesluF0A">
-                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzGDOAFWEeGBE7eesluF0A">
-                      <triggers xsi:type="stext:ExitEvent" xmi:id="_YzGDOQFWEeGBE7eesluF0A"/>
+                  <declarations xsi:type="stext:LocalReaction" xmi:id="_LzTptxQzEeGPHvKqG6e0zg">
+                    <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzTpuBQzEeGPHvKqG6e0zg">
+                      <triggers xsi:type="stext:ExitEvent" xmi:id="_LzTpuRQzEeGPHvKqG6e0zg"/>
                     </trigger>
-                    <effect xsi:type="stext:ReactionEffect" xmi:id="_YzGDOgFWEeGBE7eesluF0A">
-                      <actions xsi:type="stext:Assignment" xmi:id="_YzGqQAFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzGqQQFWEeGBE7eesluF0A" value="1"/>
+                    <effect xsi:type="stext:ReactionEffect" xmi:id="_LzTpuhQzEeGPHvKqG6e0zg">
+                      <actions xsi:type="stext:Assignment" xmi:id="_LzTpuxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                        <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzTpvBQzEeGPHvKqG6e0zg" value="1"/>
                       </actions>
                     </effect>
                   </declarations>
@@ -287,28 +287,28 @@
                 <subRegions xmi:id="_HPB4MPiSEeC4at_AzcYiGg" name="Region6">
                   <vertices xsi:type="sgraph:State" xmi:id="_NwkSkPiSEeC4at_AzcYiGg" name="State7" incomingTransitions="_SEyg0PiSEeC4at_AzcYiGg _VsUBIPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
                     <outgoingTransitions xmi:id="_TM8bsPiSEeC4at_AzcYiGg" expression="event4" target="_PLn7UPiSEeC4at_AzcYiGg">
-                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzWh4AFWEeGBE7eesluF0A">
-                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YzXI8AFWEeGBE7eesluF0A" event="_YxpRtAFWEeGBE7eesluF0A"/>
+                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzqPABQzEeGPHvKqG6e0zg">
+                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_LzqPARQzEeGPHvKqG6e0zg" event="_LxLixBQzEeGPHvKqG6e0zg"/>
                       </trigger>
                     </outgoingTransitions>
-                    <scopes xmi:id="_YzRCUAFWEeGBE7eesluF0A">
-                      <declarations xsi:type="stext:LocalReaction" xmi:id="_YzRCUQFWEeGBE7eesluF0A">
-                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzRCUgFWEeGBE7eesluF0A">
-                          <triggers xsi:type="stext:EntryEvent" xmi:id="_YzRCUwFWEeGBE7eesluF0A"/>
+                    <scopes xmi:id="_LzhsIBQzEeGPHvKqG6e0zg">
+                      <declarations xsi:type="stext:LocalReaction" xmi:id="_LzhsIRQzEeGPHvKqG6e0zg">
+                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzhsIhQzEeGPHvKqG6e0zg">
+                          <triggers xsi:type="stext:EntryEvent" xmi:id="_LzhsIxQzEeGPHvKqG6e0zg"/>
                         </trigger>
-                        <effect xsi:type="stext:ReactionEffect" xmi:id="_YzRCVAFWEeGBE7eesluF0A">
-                          <actions xsi:type="stext:Assignment" xmi:id="_YzRCVQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzRCVgFWEeGBE7eesluF0A" value="1"/>
+                        <effect xsi:type="stext:ReactionEffect" xmi:id="_LzhsJBQzEeGPHvKqG6e0zg">
+                          <actions xsi:type="stext:Assignment" xmi:id="_LzhsJRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzhsJhQzEeGPHvKqG6e0zg" value="1"/>
                           </actions>
                         </effect>
                       </declarations>
-                      <declarations xsi:type="stext:LocalReaction" xmi:id="_YzRCVwFWEeGBE7eesluF0A">
-                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzRCWAFWEeGBE7eesluF0A">
-                          <triggers xsi:type="stext:ExitEvent" xmi:id="_YzRCWQFWEeGBE7eesluF0A"/>
+                      <declarations xsi:type="stext:LocalReaction" xmi:id="_LzhsJxQzEeGPHvKqG6e0zg">
+                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzhsKBQzEeGPHvKqG6e0zg">
+                          <triggers xsi:type="stext:ExitEvent" xmi:id="_LzhsKRQzEeGPHvKqG6e0zg"/>
                         </trigger>
-                        <effect xsi:type="stext:ReactionEffect" xmi:id="_YzRCWgFWEeGBE7eesluF0A">
-                          <actions xsi:type="stext:Assignment" xmi:id="_YzRCWwFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzRCXAFWEeGBE7eesluF0A" value="1"/>
+                        <effect xsi:type="stext:ReactionEffect" xmi:id="_LzhsKhQzEeGPHvKqG6e0zg">
+                          <actions xsi:type="stext:Assignment" xmi:id="_LzhsKxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzhsLBQzEeGPHvKqG6e0zg" value="1"/>
                           </actions>
                         </effect>
                       </declarations>
@@ -316,38 +316,38 @@
                   </vertices>
                   <vertices xsi:type="sgraph:State" xmi:id="_PLn7UPiSEeC4at_AzcYiGg" name="State8" incomingTransitions="_TM8bsPiSEeC4at_AzcYiGg" expression="entry / s2+=1;&#xA;exit / s2-=1;">
                     <outgoingTransitions xmi:id="_VsUBIPiSEeC4at_AzcYiGg" expression="event5" target="_NwkSkPiSEeC4at_AzcYiGg">
-                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzhhAAFWEeGBE7eesluF0A">
-                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YzhhAQFWEeGBE7eesluF0A" event="_YxpRtQFWEeGBE7eesluF0A"/>
+                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lz4RcBQzEeGPHvKqG6e0zg">
+                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Lz4RcRQzEeGPHvKqG6e0zg" event="_LxLixRQzEeGPHvKqG6e0zg"/>
                       </trigger>
                     </outgoingTransitions>
                     <outgoingTransitions xmi:id="_VBno4PiTEeC4at_AzcYiGg" expression="event13" target="_MwBqt_ZlEeCSetPXFd1ZUw">
-                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzlycAFWEeGBE7eesluF0A">
-                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_YzlycQFWEeGBE7eesluF0A" event="_YxpRvQFWEeGBE7eesluF0A"/>
+                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Lz9J8BQzEeGPHvKqG6e0zg">
+                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Lz9xABQzEeGPHvKqG6e0zg" event="_LxLizRQzEeGPHvKqG6e0zg"/>
                       </trigger>
                     </outgoingTransitions>
                     <outgoingTransitions xmi:id="_qCKqgPiTEeC4at_AzcYiGg" expression="event16" target="_3mSzUPiSEeC4at_AzcYiGg">
-                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_Yzpc0AFWEeGBE7eesluF0A">
-                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_Yzpc0QFWEeGBE7eesluF0A" event="_YxpRwAFWEeGBE7eesluF0A"/>
+                      <trigger xsi:type="stext:ReactionTrigger" xmi:id="_L0CCcBQzEeGPHvKqG6e0zg">
+                        <triggers xsi:type="stext:RegularEventSpec" xmi:id="_L0CCcRQzEeGPHvKqG6e0zg" event="_LxMJ0BQzEeGPHvKqG6e0zg"/>
                       </trigger>
                     </outgoingTransitions>
-                    <scopes xmi:id="_YzbaYAFWEeGBE7eesluF0A">
-                      <declarations xsi:type="stext:LocalReaction" xmi:id="_YzbaYQFWEeGBE7eesluF0A">
-                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzbaYgFWEeGBE7eesluF0A">
-                          <triggers xsi:type="stext:EntryEvent" xmi:id="_YzbaYwFWEeGBE7eesluF0A"/>
+                    <scopes xmi:id="_LzvukBQzEeGPHvKqG6e0zg">
+                      <declarations xsi:type="stext:LocalReaction" xmi:id="_LzvukRQzEeGPHvKqG6e0zg">
+                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzvukhQzEeGPHvKqG6e0zg">
+                          <triggers xsi:type="stext:EntryEvent" xmi:id="_LzvukxQzEeGPHvKqG6e0zg"/>
                         </trigger>
-                        <effect xsi:type="stext:ReactionEffect" xmi:id="_YzbaZAFWEeGBE7eesluF0A">
-                          <actions xsi:type="stext:Assignment" xmi:id="_YzbaZQFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="+=">
-                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzbaZgFWEeGBE7eesluF0A" value="1"/>
+                        <effect xsi:type="stext:ReactionEffect" xmi:id="_LzvulBQzEeGPHvKqG6e0zg">
+                          <actions xsi:type="stext:Assignment" xmi:id="_LzvulRQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="+=">
+                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzvulhQzEeGPHvKqG6e0zg" value="1"/>
                           </actions>
                         </effect>
                       </declarations>
-                      <declarations xsi:type="stext:LocalReaction" xmi:id="_YzbaZwFWEeGBE7eesluF0A">
-                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_YzbaaAFWEeGBE7eesluF0A">
-                          <triggers xsi:type="stext:ExitEvent" xmi:id="_YzbaaQFWEeGBE7eesluF0A"/>
+                      <declarations xsi:type="stext:LocalReaction" xmi:id="_LzvulxQzEeGPHvKqG6e0zg">
+                        <trigger xsi:type="stext:ReactionTrigger" xmi:id="_LzvumBQzEeGPHvKqG6e0zg">
+                          <triggers xsi:type="stext:ExitEvent" xmi:id="_LzvumRQzEeGPHvKqG6e0zg"/>
                         </trigger>
-                        <effect xsi:type="stext:ReactionEffect" xmi:id="_YzbaagFWEeGBE7eesluF0A">
-                          <actions xsi:type="stext:Assignment" xmi:id="_YzbaawFWEeGBE7eesluF0A" varRef="_YxpRwgFWEeGBE7eesluF0A" operator="-=">
-                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_YzbabAFWEeGBE7eesluF0A" value="1"/>
+                        <effect xsi:type="stext:ReactionEffect" xmi:id="_LzvumhQzEeGPHvKqG6e0zg">
+                          <actions xsi:type="stext:Assignment" xmi:id="_LzvumxQzEeGPHvKqG6e0zg" varRef="_LxMJ0hQzEeGPHvKqG6e0zg" operator="-=">
+                            <expression xsi:type="stext:PrimitiveValueExpression" xmi:id="_LzvunBQzEeGPHvKqG6e0zg" value="1"/>
                           </actions>
                         </effect>
                       </declarations>
@@ -812,5 +812,32 @@
       <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9YJdMPiSEeC4at_AzcYiGg" id="(0.7796610169491526,0.4126984126984127)"/>
       <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_9YJdMfiSEeC4at_AzcYiGg" id="(0.7843137254901961,0.4126984126984127)"/>
     </edges>
+    <edges xmi:id="_MX9O4BQzEeGPHvKqG6e0zg" type="Transition" element="_qCKqgPiTEeC4at_AzcYiGg" source="_PLpJcPiSEeC4at_AzcYiGg" target="_3mTaYPiSEeC4at_AzcYiGg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_MX_EEBQzEeGPHvKqG6e0zg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_MX_EERQzEeGPHvKqG6e0zg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MX_EEhQzEeGPHvKqG6e0zg" y="40"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_MX9O4RQzEeGPHvKqG6e0zg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_MX918BQzEeGPHvKqG6e0zg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MX9O4hQzEeGPHvKqG6e0zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_Mcl3QBQzEeGPHvKqG6e0zg" type="Transition" element="_jHEgoPiTEeC4at_AzcYiGg" source="__P3CMPiREeC4at_AzcYiGg" target="_3mTaYPiSEeC4at_AzcYiGg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_McmeURQzEeGPHvKqG6e0zg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_McmeUhQzEeGPHvKqG6e0zg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_McmeUxQzEeGPHvKqG6e0zg" y="40"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_Mcl3QRQzEeGPHvKqG6e0zg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_McmeUBQzEeGPHvKqG6e0zg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_Mcl3QhQzEeGPHvKqG6e0zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_MfZ6sBQzEeGPHvKqG6e0zg" type="Transition" element="_YoMG8PiTEeC4at_AzcYiGg" source="_08_rQPiREeC4at_AzcYiGg" target="_yYc1cPiSEeC4at_AzcYiGg">
+      <children xsi:type="notation:DecorationNode" xmi:id="_MfahwBQzEeGPHvKqG6e0zg" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_MfahwRQzEeGPHvKqG6e0zg"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_MfahwhQzEeGPHvKqG6e0zg" x="-16" y="8"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_MfZ6sRQzEeGPHvKqG6e0zg" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_MfZ6sxQzEeGPHvKqG6e0zg" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_MfZ6shQzEeGPHvKqG6e0zg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>

TestScenarios/test-c/InterfaceTest/CMakeLists.txt

@@ -5,10 +5,10 @@ include_directories(../../src-gen-c/InterfaceTest)
 add_executable(InterfaceTestStatemachineMain main.c)
 target_link_libraries(InterfaceTestStatemachineMain InterfaceTestStatemachine)
 
-add_test(test_default_interface_good InterfaceTestStatemachineMain "1")
-add_test(test_default_interface_bad InterfaceTestStatemachineMain "2")
-add_test(test_other_interface_good InterfaceTestStatemachineMain "3")
-add_test(test_other_interface_bad InterfaceTestStatemachineMain "4")
-add_test(test_third_interface_good InterfaceTestStatemachineMain "5")
-add_test(test_third_interface_bad InterfaceTestStatemachineMain "6")
-add_test(test_namespaces InterfaceTestStatemachineMain "7")
+add_test(Interface_test_default_interface_good_1 InterfaceTestStatemachineMain "1")
+add_test(Interface_test_default_interface_bad_2 InterfaceTestStatemachineMain "2")
+add_test(Interface_test_other_interface_good_3 InterfaceTestStatemachineMain "3")
+add_test(Interface_test_other_interface_bad_4 InterfaceTestStatemachineMain "4")
+add_test(Interface_test_third_interface_good_5 InterfaceTestStatemachineMain "5")
+add_test(Interface_test_third_interface_bad_6 InterfaceTestStatemachineMain "6")
+add_test(Interface_test_namespaces_7 InterfaceTestStatemachineMain "7")

TestScenarios/test-c/Test_Expression/CMakeLists.txt

@@ -5,5 +5,7 @@ include_directories(../../src-gen-c/Test_Expression)
 add_executable(TestExpressionMain main.c)
 target_link_libraries(TestExpressionMain Test_ExpressionStatemachine)
 
-add_test(test_default_other_var1 TestExpressionMain "1")
-add_test(test_default_other_var2_var3 TestExpressionMain "2")
+add_test(Expression_test_initialization_and_first_entry TestExpressionMain "1")
+add_test(Expression_test_default_other_var1 TestExpressionMain "2")
+add_test(Expression_test_default_other_var2_var3 TestExpressionMain "3")
+add_test(Expression_test_onCycle TestExpressionMain "4")

TestScenarios/test-c/Test_Expression/main.c

@@ -35,17 +35,38 @@ void teardownStatemachine(Test_ExpressionStatemachine* machine, Timer* dummyTime
 }
 
 /*@Test: test_default_var1 test behavior of var1 in default interface */
-int test_initialization()
+int test_initialization_and_first_entry()
 {
 	Test_ExpressionStatemachine machine;
 	Timer dummyTimer;
 	EventPool eventPool;
 
+	real testvalue1u = (19.4 + 19.4*123 + 0.1);
+	real testvalue1l = (19.4 + 19.4*123 - 0.1);
+
 	//integer retval;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
+	/*@Desc: check whether var1 from default interface is initially set to 6 */
+	assert( test_Expression_if_get_var1(&machine.interface) == 6);
+
+	/*@Desc: check whether var2 from default is initially set to 123 */
+	assert( test_Expression_if_get_var2(&machine.interface) == 123);
+
+	/*@Desc: check, wether var3 from default interface is set correct after state1 entry */
+	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.interface));
+	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue1l) &&
+			(test_Expression_if_get_var3(&machine.interface) < testvalue1u) );
+
+	/*@Desc: check, whether var4 from default interface is between 43.3 and 43.5 */
+	assert( (test_Expression_if_get_var4(&machine.interface) > 43.3) &&
+			(test_Expression_if_get_var4(&machine.interface) < 43.5) );
+
+	/*@Desc: check whether var5 from default interface is initially set to false */
+	assert( test_Expression_if_get_var5(&machine.interface) == bool_false);
+
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
 
@@ -54,6 +75,8 @@ int test_initialization()
 }
 
 
+
+
 /*@Test: test_default_var1 test behavior of var1 in default and other interface */
 int test_default_other_var1()
 {
@@ -61,7 +84,7 @@ int test_default_other_var1()
 	Timer dummyTimer;
 	EventPool eventPool;
 
-	real retval;
+//	real retval;
 
 	/*@Desc: setup initial statemachine */
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
@@ -98,15 +121,9 @@ int test_default_other_var1()
 	/*@Desc: check whether var1 has been increased by 1 (==7) */
 	assert( test_Expression_if_get_var1(&machine.interface) == 7 );
 
-	/*@Desc: check if the entry event2 is raised */
-	assert( test_Expression_if_is_event2_raised(&machine.interface, &retval) == bool_true );
-
 	/*@Desc: run an explicit cycle */
 	test_ExpressionStatemachine_runCycle(&machine);
 
-	/*@Desc: check whether var1 has been increased by 1 on onCycle (==8) */
-	assert( test_Expression_if_get_var1(&machine.interface) == 8 );
-
 	/*@Desc: check whether the state is still set to "State2" */
 	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
@@ -123,8 +140,8 @@ int test_default_other_var2_var3()
 	Timer dummyTimer;
 	EventPool eventPool;
 
-	real testvalue1u = (19.4 + 19.4*123 + 0.1);
-	real testvalue1l = (19.4 + 19.4*123 - 0.1);
+//	real testvalue1u = (19.4 + 19.4*123 + 0.1);
+//	real testvalue1l = (19.4 + 19.4*123 - 0.1);
 
 	real testvalue2u = 19.4 + 19.4*123/5.0 + 0.1;
 	real testvalue2l = 19.4 + 19.4*123/5.0 - 0.1;
@@ -146,9 +163,16 @@ int test_default_other_var2_var3()
 	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
 
-	/*@Desc: check, wether var3 on default interface is set correct after state1 entry */
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue1l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue1u) );
+	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
+	test_Expression_if_raise_event1(&machine.interface, 5);
+
+	/*@Desc: run an explicit cycle - without any waiting event */
+	test_ExpressionStatemachine_runCycle(&machine);
+
+	/*@Desc: check the initial state */
+	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
+	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
+
 
 	/*@Desc: check, wether var3 on default interface is set correct after state1 entry */
 	assert( test_Expression_if_get_var2(&machine.interface) == 1 );
@@ -164,6 +188,7 @@ int test_default_other_var2_var3()
 	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
 
 	/*@Desc: check, wether var3 on default interface is set correct after entry */
+	printf("Var3 is set to %f\n", test_Expression_if_get_var3(&machine.interface));
 	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue2l) &&
 			(test_Expression_if_get_var3(&machine.interface) < testvalue2u) );
 
@@ -185,6 +210,48 @@ int test_default_other_var2_var3()
 	return 0;
 }
 
+int test_onCycle()
+{
+	Test_ExpressionStatemachine machine;
+	Timer dummyTimer;
+	EventPool eventPool;
+
+	/*@Desc: setup initial statemachine */
+	setupStatemachine(&machine, &dummyTimer, &eventPool);
+
+	/*@Desc: run an explicit cycle - without any waiting event */
+	test_ExpressionStatemachine_runCycle(&machine);
+
+	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
+	test_Expression_if_raise_event1(&machine.interface, 5);
+
+	/*@Desc: set other.var1 to "true" to let transition take place */
+	test_Expression_if_other_set_var1(&machine.interfaceOther, bool_true);
+
+	/*@Desc: run an explicit cycle */
+	test_ExpressionStatemachine_runCycle(&machine);
+
+	/*@Desc: check whether var1 has been increased by one (==7) */
+	assert( test_Expression_if_get_var1(&machine.interface) == 7 );
+
+	/*@Desc: run an explicit cycle - without any change */
+	test_ExpressionStatemachine_runCycle(&machine);
+
+	/*@Desc: check whether var1 has been increased by 1 on onCycle (==8) */
+	assert( test_Expression_if_get_var1(&machine.interface) == 8 );
+
+	/*@Desc: run an explicit cycle - without any change */
+	test_ExpressionStatemachine_runCycle(&machine);
+
+	/*@Desc: check whether var1 has been increased by 1 on onCycle (==9) */
+	assert( test_Expression_if_get_var1(&machine.interface) == 9 );
+
+	/*@Desc: teardown statemachine */
+	teardownStatemachine(&machine, &dummyTimer, &eventPool);
+
+	return 0;
+}
+
 
 
 int main(int argc, char** argv)
@@ -194,9 +261,13 @@ int main(int argc, char** argv)
 
 	switch (atoi(argv[1])) {
 	case 1:
-		return test_default_other_var1();
+		return test_initialization_and_first_entry();
 	case 2:
+		return test_default_other_var1();
+	case 3:
 		return test_default_other_var2_var3();
+	case 4:
+		return test_onCycle();
 	}
 
 	return 0;

TestScenarios/test-c/Test_Hierarchy/CMakeLists.txt

@@ -3,6 +3,6 @@ include_directories(../../src-gen-c/Test_Hierarchy)
 add_executable(TestHierarchyMain main.c)
 target_link_libraries(TestHierarchyMain Test_HierarchyStatemachine)
 
-add_test(test_default_other_var1 TestHierarchyMain "1")
-add_test(test_default_other_var2_var3 TestHierarchyMain "2")
+add_test(Hierarchy_test_state9_state10_transition TestHierarchyMain "1")
+add_test(Hierarchy_test_state1_state2_back_transition TestHierarchyMain "2")
 

TestScenarios/test-c/Test_Hierarchy/main.c

@@ -12,8 +12,7 @@
 #include <string.h>
 #include "Timer.h"
 #include "DummyTimer.h"
-#include "Test_ExpressionStatemachine.h"
-#include "Test_Hierarchy.h"
+#include "Test_HierarchyStatemachine.h"
 
 /*@DTestSuite: Hierachy Statechart Test (Test_Hierarchy.sct) */
 
@@ -59,7 +58,12 @@ int test_state9_state10_transition()
 	/*@Desc: setup initial statemachine */
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
+	/*@Desc: run the statechart for the first time (initially) */
+	test_HierarchyStatemachine_runCycle(&machine);
 
+	/*@Desc: check wether state is initial state (State9) */
+	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
+	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State9") == 0);
 
 	/*@Desc: teardown statemachine */
 	teardownStatemachine(&machine, &dummyTimer, &eventPool);
@@ -78,7 +82,7 @@ int test_state1_state2_back_transition()
 	setupStatemachine(&machine, &dummyTimer, &eventPool);
 
 	/*@Desc: run an explicit cycle - without any waiting event (for initialization) */
-	test_ExpressionStatemachine_runCycle(&machine);
+	test_HierarchyStatemachine_runCycle(&machine);
 
 	/*@Desc:  */
 
@@ -92,74 +96,6 @@ int test_state1_state2_back_transition()
 
 
 
-int test_default_other_var2_var3()
-{
-	Test_ExpressionStatemachine machine;
-	Timer dummyTimer;
-	EventPool eventPool;
-
-	real testvalue1u = (19.4 + 19.4*123 + 0.1);
-	real testvalue1l = (19.4 + 19.4*123 - 0.1);
-
-	real testvalue2u = 19.4 + 19.4*123/5.0 + 0.1;
-	real testvalue2l = 19.4 + 19.4*123/5.0 - 0.1;
-
-	/*@Desc: setup initial statemachine */
-	setupStatemachine(&machine, &dummyTimer, &eventPool);
-
-	/*@Desc: check initial value for var2 ( == 123) */
-	assert( test_Expression_if_get_var2(&machine.interface) == 123 );
-
-	/*@Desc: check initial value for var3 (19.4) */
-	assert( (test_Expression_if_get_var3(&machine.interface) > 19.3) &&
-			(test_Expression_if_get_var3(&machine.interface) < 19.5));
-
-	/*@Desc: run an explicit cycle - without any waiting event */
-	test_ExpressionStatemachine_runCycle(&machine);
-
-	/*@Desc: check the initial state */
-	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
-	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
-
-	/*@Desc: check, wether var3 on default interface is set correct after state1 entry */
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue1l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue1u) );
-
-	/*@Desc: check, wether var3 on default interface is set correct after state1 entry */
-	assert( test_Expression_if_get_var2(&machine.interface) == 1 );
-
-	/*@Desc: set var5 to "false" to let transition take place */
-	test_Expression_if_set_var5(&machine.interface, bool_false);
-
-	/*@Desc: raise event1 on default interface with value 5 (actually unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
-
-	/*@Desc: check the initial state */
-	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
-	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State2") == 0);
-
-	/*@Desc: check, wether var3 on default interface is set correct after entry */
-	assert( (test_Expression_if_get_var3(&machine.interface) > testvalue2l) &&
-			(test_Expression_if_get_var3(&machine.interface) < testvalue2u) );
-
-	/*@Desc: set event1 with variable 5 (acutally unused) */
-	test_Expression_if_raise_event1(&machine.interface, 5);
-
-	/*@Desc: run an explicit cycle */
-	test_ExpressionStatemachine_runCycle(&machine);
-
-	/*@Desc: check the transition to state1 */
-	printf("%s\n", stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)]);
-	assert( strcmp(stateName[statemachineBase_getState((StatemachineBase*)&machine, 0)], "State1") == 0);
-
-	/*@Desc-Info: I will not calculate the complete for var3 in this scenario */
-
-	/*@Desc: teardown statemachine */
-	teardownStatemachine(&machine, &dummyTimer, &eventPool);
-
-	return 0;
-}
-
 
 
 int main(int argc, char** argv)
@@ -169,11 +105,11 @@ int main(int argc, char** argv)
 
 	switch (atoi(argv[1])) {
 	case 1:
-		return test_default_other_var1();
+		return test_state9_state10_transition();
 	case 2:
-		return test_default_other_var2_var3();
+		return test_state1_state2_back_transition();
 	}
 
-	return 0;
+	return -1;
 
 }