فهرست منبع

added usage of internal constants in Unit-Test

bohl@itemis.de 10 سال پیش
والد
کامیت
3f6ecc314b

+ 4 - 0
test-plugins/org.yakindu.sct.generator.java.test/test-gen/org/yakindu/sct/generator/java/test/ConstantsTestsTest.java

@@ -46,5 +46,9 @@ public class ConstantsTestsTest {
 		statemachine.raiseE();
 		statemachine.runCycle();
 		assertTrue(statemachine.getResult() == 20);
+		statemachine.raiseE();
+		statemachine.runCycle();
+		assertTrue(statemachine.isStateActive(State.main_region_C));
+		assertTrue(statemachine.getResult() == 100);
 	}
 }

+ 33 - 4
test-plugins/org.yakindu.sct.test.models/testmodels/SCTUnit/Constants.sct

@@ -1,6 +1,6 @@
 <?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/sgraph/2.0.0">
-  <sgraph:Statechart xmi:id="_WbmUAHDFEeS-kPXuwFs1pA" specification="interface:&#xD;&#xA;in event e&#xD;&#xA;const x : integer = 10&#xD;&#xA;const y :integer = x *2&#xD;&#xA;&#xD;&#xA;var result : integer = 0&#xD;&#xA;&#xD;&#xA;interface Named:&#xD;&#xA;const y : string = &quot;Hello World&quot;&#xD;&#xA;const two : integer = 2&#xD;&#xA;" name="Constants">
+  <sgraph:Statechart xmi:id="_WbmUAHDFEeS-kPXuwFs1pA" specification="interface:&#xD;&#xA;in event e&#xD;&#xA;const x : integer = 10&#xD;&#xA;const y :integer = x *2&#xD;&#xA;&#xD;&#xA;var result : integer = 0&#xD;&#xA;&#xD;&#xA;interface Named:&#xD;&#xA;const y : string = &quot;Hello World&quot;&#xD;&#xA;const two : integer = 2&#xD;&#xA;&#xD;&#xA;internal:&#xD;&#xA;const internalConstant : integer = 5" name="Constants">
     <regions xmi:id="_WboJMnDFEeS-kPXuwFs1pA" name="main region">
       <vertices xsi:type="sgraph:Entry" xmi:id="_WbqldnDFEeS-kPXuwFs1pA">
         <outgoingTransitions xmi:id="_WbtBs3DFEeS-kPXuwFs1pA" target="_WbrzlHDFEeS-kPXuwFs1pA"/>
@@ -8,7 +8,10 @@
       <vertices xsi:type="sgraph:State" xmi:id="_WbrzlHDFEeS-kPXuwFs1pA" name="A" incomingTransitions="_WbtBs3DFEeS-kPXuwFs1pA">
         <outgoingTransitions xmi:id="_KJyusHDGEeS-kPXuwFs1pA" specification="e" target="_9cjnEHDFEeS-kPXuwFs1pA"/>
       </vertices>
-      <vertices xsi:type="sgraph:State" xmi:id="_9cjnEHDFEeS-kPXuwFs1pA" specification="entry / result = Named.two * x" name="B" incomingTransitions="_KJyusHDGEeS-kPXuwFs1pA"/>
+      <vertices xsi:type="sgraph:State" xmi:id="_9cjnEHDFEeS-kPXuwFs1pA" specification="entry / result = Named.two * x" name="B" incomingTransitions="_KJyusHDGEeS-kPXuwFs1pA">
+        <outgoingTransitions xmi:id="_kzHK4OG9EeS03b3Sal9BvQ" specification="e" target="_kbR5sOG9EeS03b3Sal9BvQ"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_kbR5sOG9EeS03b3Sal9BvQ" specification="entry / result = result * internalConstant" name="C" incomingTransitions="_kzHK4OG9EeS03b3Sal9BvQ"/>
     </regions>
   </sgraph:Statechart>
   <notation:Diagram xmi:id="_WboJMHDFEeS-kPXuwFs1pA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_WbmUAHDFEeS-kPXuwFs1pA" measurementUnit="Pixel">
@@ -62,10 +65,26 @@
           <styles xsi:type="notation:BooleanValueStyle" xmi:id="_9cri4XDFEeS-kPXuwFs1pA" name="isHorizontal" booleanValue="true"/>
           <layoutConstraint xsi:type="notation:Bounds" xmi:id="_9cpts3DFEeS-kPXuwFs1pA" x="211" y="75"/>
         </children>
+        <children xmi:id="_kbYAUOG9EeS03b3Sal9BvQ" type="State" element="_kbR5sOG9EeS03b3Sal9BvQ">
+          <children xsi:type="notation:DecorationNode" xmi:id="_kbeG8OG9EeS03b3Sal9BvQ" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_kbeG8eG9EeS03b3Sal9BvQ"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_kbeG8uG9EeS03b3Sal9BvQ"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_kbeuAOG9EeS03b3Sal9BvQ" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_kbfVEOG9EeS03b3Sal9BvQ" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kbfVEeG9EeS03b3Sal9BvQ"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_kbf8IOG9EeS03b3Sal9BvQ" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_kbYAUeG9EeS03b3Sal9BvQ" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_kbYAUuG9EeS03b3Sal9BvQ"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_kbf8IeG9EeS03b3Sal9BvQ" name="isHorizontal" booleanValue="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_kbYAU-G9EeS03b3Sal9BvQ" x="159" y="177" width="286"/>
+        </children>
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WbqldHDFEeS-kPXuwFs1pA"/>
       </children>
       <styles xsi:type="notation:ShapeStyle" xmi:id="_WbowQXDFEeS-kPXuwFs1pA" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WbqldXDFEeS-kPXuwFs1pA" x="245" y="10" width="457" height="196"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WbqldXDFEeS-kPXuwFs1pA" x="260" y="10" width="481" height="293"/>
     </children>
     <children xsi:type="notation:Shape" xmi:id="_WbuP03DFEeS-kPXuwFs1pA" type="StatechartText" fontName="Verdana" lineColor="4210752">
       <children xsi:type="notation:DecorationNode" xmi:id="_WbuP1XDFEeS-kPXuwFs1pA" type="StatechartName">
@@ -75,7 +94,7 @@
       <children xsi:type="notation:Shape" xmi:id="_WbuP2HDFEeS-kPXuwFs1pA" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
         <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WbuP2XDFEeS-kPXuwFs1pA"/>
       </children>
-      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Wbu24HDFEeS-kPXuwFs1pA" x="10" y="10" width="221" height="196"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_Wbu24HDFEeS-kPXuwFs1pA" x="10" y="10" width="246" height="293"/>
     </children>
     <styles xsi:type="notation:DiagramStyle" xmi:id="_WboJMXDFEeS-kPXuwFs1pA"/>
     <edges xmi:id="_WbtowHDFEeS-kPXuwFs1pA" type="Transition" element="_WbtBs3DFEeS-kPXuwFs1pA" source="_WbrMgHDFEeS-kPXuwFs1pA" target="_Wbrzl3DFEeS-kPXuwFs1pA">
@@ -96,5 +115,15 @@
       <styles xsi:type="notation:FontStyle" xmi:id="_KJ5cYHDGEeS-kPXuwFs1pA" fontName="Verdana"/>
       <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_KJ41UnDGEeS-kPXuwFs1pA" points="[18, -3, -143, -1]$[154, -26, -7, -24]"/>
     </edges>
+    <edges xmi:id="_kzJAEOG9EeS03b3Sal9BvQ" type="Transition" element="_kzHK4OG9EeS03b3Sal9BvQ" source="_9cptsHDFEeS-kPXuwFs1pA" target="_kbYAUOG9EeS03b3Sal9BvQ">
+      <children xsi:type="notation:DecorationNode" xmi:id="_kzJAFOG9EeS03b3Sal9BvQ" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_kzJAFeG9EeS03b3Sal9BvQ"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_kzJAFuG9EeS03b3Sal9BvQ" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_kzJAEeG9EeS03b3Sal9BvQ" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_kzJAE-G9EeS03b3Sal9BvQ" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_kzJAEuG9EeS03b3Sal9BvQ" points="[-45, 24, 118, -59]$[-159, 74, 4, -9]"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_kzuO4OG9EeS03b3Sal9BvQ" id="(0.5927272727272728,0.07936507936507936)"/>
+    </edges>
   </notation:Diagram>
 </xmi:XMI>

+ 10 - 0
test-plugins/org.yakindu.sct.test.models/tests/Constants.sctunit

@@ -12,6 +12,16 @@ testgroup ConstantsTests for statechart Constants {
 		raise e
 		cycle
 		assert result == 20
+		
+		raise e
+		cycle
+		
+		
+		assert active(Constants.main_region.C)
+		assert result == 100
+			
+		
+		
 	} 
 }