Added new test models for integer, boolean and bit shift expressions

test-plugins/org.yakindu.sct.test.models/src/util/TestModels.java

@@ -36,6 +36,9 @@ public class TestModels {
 
 	private static final String TESTMODEL_DIR = "org.yakindu.sct.test.models/testmodels/";
 
+	public static final String BIT_EXPRESSIONS = "BitExpressions.sct";
+	public static final String INTEGER_EXPRESSIONS = "IntegerExpressions.sct";
+	public static final String BOOLEAN_EXPRESSIONS = "BooleanExpressions.sct";
 	public static final String ALWAYS_ONCYCLE = "AlwaysOncycle.sct";
 	public static final String CHOICE = "Choice.sct";
 	public static final String DEEP_HISTORY = "DeepHistory.sct";
@@ -61,10 +64,41 @@ public class TestModels {
 	 * @return the {@link ExecutionFlow}
 	 * @throws IOException
 	 */
+	public ExecutionFlow createBitExpressions() throws IOException {
+		return loadExecutionFlowFromResource(BIT_EXPRESSIONS);
+	}
+
+	/**
+	 * <img src="../../images/IntegerExpressions.png" /> <br />
+	 * 
+	 * @return the {@link ExecutionFlow}
+	 * @throws IOException
+	 */
+	public ExecutionFlow createIntegerExpressions() throws IOException {
+		return loadExecutionFlowFromResource(INTEGER_EXPRESSIONS);
+	}
+
+	/**
+	 * <img src="../../images/BooleanExpressions.png" /> <br />
+	 * 
+	 * @return the {@link ExecutionFlow}
+	 * @throws IOException
+	 */
+
+	public ExecutionFlow createBooleanExpressions() throws IOException {
+		return loadExecutionFlowFromResource(BOOLEAN_EXPRESSIONS);
+	}
+
+	/**
+	 * <img src="../../images/BitExpressions.png" /> <br />
+	 * 
+	 * @return the {@link ExecutionFlow}
+	 * @throws IOException
+	 */
 	public ExecutionFlow createSimpleEventModel() throws IOException {
 		return loadExecutionFlowFromResource(SIMPLE_EVENT);
 	}
-	
+
 	/**
 	 * <img src="../../images/PriorityValues.png" /> <br />
 	 * 

test-plugins/org.yakindu.sct.test.models/testmodels/BitExpressions.sct

@@ -0,0 +1,114 @@
+<?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="_-_ezoL-hEeGY1JN0_LPdVA" specification="interface :&#xD;&#xA;var myBit1 : integer&#xD;&#xA;var myBit2 : integer&#xD;&#xA;&#xD;&#xA;var leftBitshift : integer&#xD;&#xA;var rightBitshift : integer&#xD;&#xA;var complementBitshift : integer&#xD;&#xA;&#xD;&#xA;var bitwiseAnd : integer&#xD;&#xA;var bitwiseOr : integer&#xD;&#xA;var bitwiseXor : integer&#xD;&#xA;&#xD;&#xA;in event e1&#xD;&#xA;" name="BitExpressions">
+    <regions xmi:id="_-_ezo7-hEeGY1JN0_LPdVA" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_-_n9mb-hEeGY1JN0_LPdVA">
+        <outgoingTransitions xmi:id="_-_n9s7-hEeGY1JN0_LPdVA" target="_-_n9pL-hEeGY1JN0_LPdVA"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_-_n9pL-hEeGY1JN0_LPdVA" specification="entry / &#xD;&#xA;myBit1 = 5;&#xD;&#xA;myBit2 = 7" name="StateA" incomingTransitions="_-_n9s7-hEeGY1JN0_LPdVA">
+        <outgoingTransitions xmi:id="_4tWWwMRNEeG2ApzwxmEQZA" specification="e1" target="_WycAkL-kEeG1VpJAB_S_mw"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_WycAkL-kEeG1VpJAB_S_mw" specification="entry /&#xD;&#xA;leftBitshift =  myBit1&lt;&lt;1;&#xD;&#xA;rightBitshift = myBit1 >> 1;&#xD;&#xA;complementBitshift =  ~myBit1;&#xD;&#xA;&#xD;&#xA;bitwiseAnd = myBit1  &amp; myBit2;&#xD;&#xA;bitwiseOr = myBit1 | myBit2;&#xD;&#xA;bitwiseXor = myBit1 ^ myBit2&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;&#xD;&#xA;" name="StateB" incomingTransitions="_4tWWwMRNEeG2ApzwxmEQZA"/>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_-_ezob-hEeGY1JN0_LPdVA" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_-_ezoL-hEeGY1JN0_LPdVA" measurementUnit="Pixel">
+    <children xmi:id="_-_n9kL-hEeGY1JN0_LPdVA" type="Region" element="_-_ezo7-hEeGY1JN0_LPdVA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_-_n9k7-hEeGY1JN0_LPdVA" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9lL-hEeGY1JN0_LPdVA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_-_n9lb-hEeGY1JN0_LPdVA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_-_n9lr-hEeGY1JN0_LPdVA" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_-_n9mr-hEeGY1JN0_LPdVA" type="Entry" element="_-_n9mb-hEeGY1JN0_LPdVA">
+          <children xmi:id="_-_n9nb-hEeGY1JN0_LPdVA" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_-_n9oL-hEeGY1JN0_LPdVA" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9ob-hEeGY1JN0_LPdVA"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_-_n9or-hEeGY1JN0_LPdVA"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9nr-hEeGY1JN0_LPdVA" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9n7-hEeGY1JN0_LPdVA"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9m7-hEeGY1JN0_LPdVA" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9o7-hEeGY1JN0_LPdVA" x="54" y="54"/>
+        </children>
+        <children xmi:id="_-_n9pr-hEeGY1JN0_LPdVA" type="State" element="_-_n9pL-hEeGY1JN0_LPdVA">
+          <children xsi:type="notation:DecorationNode" xmi:id="_-_n9qr-hEeGY1JN0_LPdVA" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9q7-hEeGY1JN0_LPdVA"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_-_n9rL-hEeGY1JN0_LPdVA"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_-_n9rb-hEeGY1JN0_LPdVA" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_-_n9rr-hEeGY1JN0_LPdVA" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9r7-hEeGY1JN0_LPdVA"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_-_n9sL-hEeGY1JN0_LPdVA" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9p7-hEeGY1JN0_LPdVA" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_-_n9qL-hEeGY1JN0_LPdVA"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_-_n9sb-hEeGY1JN0_LPdVA"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9sr-hEeGY1JN0_LPdVA" x="24" y="143"/>
+        </children>
+        <children xmi:id="_WzVYcL-kEeG1VpJAB_S_mw" type="State" element="_WycAkL-kEeG1VpJAB_S_mw">
+          <children xsi:type="notation:DecorationNode" xmi:id="_WzfJcL-kEeG1VpJAB_S_mw" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_WzfJcb-kEeG1VpJAB_S_mw"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_WzfJcr-kEeG1VpJAB_S_mw"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_WzfJc7-kEeG1VpJAB_S_mw" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_WzfJdL-kEeG1VpJAB_S_mw" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WzfJdb-kEeG1VpJAB_S_mw"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_WzfJdr-kEeG1VpJAB_S_mw" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_WzVYcb-kEeG1VpJAB_S_mw" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_WzVYcr-kEeG1VpJAB_S_mw"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_WzfJd7-kEeG1VpJAB_S_mw"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_WzVYc7-kEeG1VpJAB_S_mw" x="171" y="178"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_NQx8wL-nEeG1VpJAB_S_mw" type="Note" fontName="Verdana" description="expectations:&#xD;&#xA;leftBitshift = 10&#xD;&#xA;rightBitshift = 2&#xD;&#xA;complementBitshift = -6&#xD;&#xA;bitwiseAnd = 5&#xD;&#xA;bitwiseOr = 7&#xD;&#xA;bitwiseXor = 2" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="_NQx8xL-nEeG1VpJAB_S_mw" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="_NQx8xb-nEeG1VpJAB_S_mw" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xsi:type="notation:TextStyle" xmi:id="_NQx8wb-nEeG1VpJAB_S_mw"/>
+          <styles xsi:type="notation:LineTypeStyle" xmi:id="_NQx8wr-nEeG1VpJAB_S_mw"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_NQx8w7-nEeG1VpJAB_S_mw" x="185" y="13" width="186" height="126"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9l7-hEeGY1JN0_LPdVA"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_-_n9kb-hEeGY1JN0_LPdVA" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_n9mL-hEeGY1JN0_LPdVA" x="220" y="10" width="446" height="461"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_-_xul7-hEeGY1JN0_LPdVA" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_-_xumb-hEeGY1JN0_LPdVA" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_-_xumr-hEeGY1JN0_LPdVA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_-_xum7-hEeGY1JN0_LPdVA"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_-_xunL-hEeGY1JN0_LPdVA" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_xunb-hEeGY1JN0_LPdVA"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_-_xunr-hEeGY1JN0_LPdVA" x="10" y="25" width="200" height="400"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_-_ezor-hEeGY1JN0_LPdVA"/>
+    <edges xmi:id="_-_xukL-hEeGY1JN0_LPdVA" type="Transition" element="_-_n9s7-hEeGY1JN0_LPdVA" source="_-_n9mr-hEeGY1JN0_LPdVA" target="_-_n9pr-hEeGY1JN0_LPdVA">
+      <children xsi:type="notation:DecorationNode" xmi:id="_-_xulL-hEeGY1JN0_LPdVA" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_-_xulb-hEeGY1JN0_LPdVA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_-_xulr-hEeGY1JN0_LPdVA" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_-_xukb-hEeGY1JN0_LPdVA" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_-_xuk7-hEeGY1JN0_LPdVA" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_-_xukr-hEeGY1JN0_LPdVA" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_4tyboMRNEeG2ApzwxmEQZA" type="Transition" element="_4tWWwMRNEeG2ApzwxmEQZA" source="_-_n9pr-hEeGY1JN0_LPdVA" target="_WzVYcL-kEeG1VpJAB_S_mw">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4uF9oMRNEeG2ApzwxmEQZA" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_4uF9ocRNEeG2ApzwxmEQZA"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4uF9osRNEeG2ApzwxmEQZA" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_4tybocRNEeG2ApzwxmEQZA" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_4tybo8RNEeG2ApzwxmEQZA" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4tybosRNEeG2ApzwxmEQZA" points="[0, 4, -110, -73]$[0, 77, -110, 0]$[110, 77, 0, 0]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4urzgMRNEeG2ApzwxmEQZA" id="(0.425531914893617,0.9550561797752809)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4urzgcRNEeG2ApzwxmEQZA" id="(0.0,0.5470085470085471)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/testmodels/BooleanExpressions.sct

@@ -0,0 +1,114 @@
+<?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="_ooSlsL7REeGmQI_7e4ED3g" specification="interface:&#xD;&#xA;var myBool1 : boolean&#xD;&#xA;var myBool2 : boolean&#xD;&#xA;var and : boolean&#xD;&#xA;var or : boolean&#xD;&#xA;var not : boolean&#xD;&#xA;var equal : boolean&#xD;&#xA;var notequal : boolean&#xD;&#xA;&#xD;&#xA;in event e1" name="BooleanExpressions">
+    <regions xmi:id="_oocWsr7REeGmQI_7e4ED3g" name="main region">
+      <vertices xsi:type="sgraph:Entry" xmi:id="_oo5Cpr7REeGmQI_7e4ED3g">
+        <outgoingTransitions xmi:id="_opL9nb7REeGmQI_7e4ED3g" target="_opCMl77REeGmQI_7e4ED3g"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_opCMl77REeGmQI_7e4ED3g" specification="entry / myBool1 = true ; myBool2= false  " name="StateA" incomingTransitions="_opL9nb7REeGmQI_7e4ED3g">
+        <outgoingTransitions xmi:id="_4xtq4L7SEeGmQI_7e4ED3g" specification="e1" target="_3_82wL7SEeGmQI_7e4ED3g"/>
+      </vertices>
+      <vertices xsi:type="sgraph:State" xmi:id="_3_82wL7SEeGmQI_7e4ED3g" specification="entry/ &#xD;&#xA;and = myBool1&amp;&amp;myBool2;  &#xD;&#xA;or = myBool1||myBool2; &#xD;&#xA;not = !myBool1;&#xD;&#xA;equal = myBool1==myBool2;&#xD;&#xA;notequal = (myBool1 != myBool2)" name="StateB" incomingTransitions="_4xtq4L7SEeGmQI_7e4ED3g"/>
+    </regions>
+  </sgraph:Statechart>
+  <notation:Diagram xmi:id="_oocWsL7REeGmQI_7e4ED3g" type="org.yakindu.sct.ui.editor.editor.StatechartDiagramEditor" element="_ooSlsL7REeGmQI_7e4ED3g" measurementUnit="Pixel">
+    <children xmi:id="_oovRoL7REeGmQI_7e4ED3g" type="Region" element="_oocWsr7REeGmQI_7e4ED3g">
+      <children xsi:type="notation:DecorationNode" xmi:id="_oo5CoL7REeGmQI_7e4ED3g" type="RegionName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_oo5Cob7REeGmQI_7e4ED3g"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_oo5Cor7REeGmQI_7e4ED3g"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_oo5Co77REeGmQI_7e4ED3g" type="RegionCompartment" fontName="Verdana" lineColor="4210752">
+        <children xmi:id="_oo5Cp77REeGmQI_7e4ED3g" type="Entry" element="_oo5Cpr7REeGmQI_7e4ED3g">
+          <children xmi:id="_opCMkL7REeGmQI_7e4ED3g" type="BorderItemLabelContainer">
+            <children xsi:type="notation:DecorationNode" xmi:id="_opCMk77REeGmQI_7e4ED3g" type="BorderItemLabel">
+              <styles xsi:type="notation:ShapeStyle" xmi:id="_opCMlL7REeGmQI_7e4ED3g"/>
+              <layoutConstraint xsi:type="notation:Location" xmi:id="_opCMlb7REeGmQI_7e4ED3g"/>
+            </children>
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_opCMkb7REeGmQI_7e4ED3g" fontName="Verdana" lineColor="4210752"/>
+            <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opCMkr7REeGmQI_7e4ED3g"/>
+          </children>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_oo5CqL7REeGmQI_7e4ED3g" fontName="Verdana" lineColor="4210752"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opCMlr7REeGmQI_7e4ED3g" x="139" y="14"/>
+        </children>
+        <children xmi:id="_opL9kL7REeGmQI_7e4ED3g" type="State" element="_opCMl77REeGmQI_7e4ED3g">
+          <children xsi:type="notation:DecorationNode" xmi:id="_opL9lL7REeGmQI_7e4ED3g" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_opL9lb7REeGmQI_7e4ED3g"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_opL9lr7REeGmQI_7e4ED3g"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_opL9l77REeGmQI_7e4ED3g" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_opL9mL7REeGmQI_7e4ED3g" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opL9mb7REeGmQI_7e4ED3g"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_opL9mr7REeGmQI_7e4ED3g" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_opL9kb7REeGmQI_7e4ED3g" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_opL9kr7REeGmQI_7e4ED3g"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_opL9m77REeGmQI_7e4ED3g"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opL9nL7REeGmQI_7e4ED3g" x="9" y="74"/>
+        </children>
+        <children xmi:id="_4AsdoL7SEeGmQI_7e4ED3g" type="State" element="_3_82wL7SEeGmQI_7e4ED3g">
+          <children xsi:type="notation:DecorationNode" xmi:id="_4AsdpL7SEeGmQI_7e4ED3g" type="StateName">
+            <styles xsi:type="notation:ShapeStyle" xmi:id="_4Asdpb7SEeGmQI_7e4ED3g"/>
+            <layoutConstraint xsi:type="notation:Location" xmi:id="_4Asdpr7SEeGmQI_7e4ED3g"/>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_4Asdp77SEeGmQI_7e4ED3g" type="StateTextCompartment">
+            <children xsi:type="notation:Shape" xmi:id="_4AsdqL7SEeGmQI_7e4ED3g" type="StateTextCompartmentExpression" fontName="Verdana" lineColor="4210752">
+              <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4Asdqb7SEeGmQI_7e4ED3g"/>
+            </children>
+          </children>
+          <children xsi:type="notation:Compartment" xmi:id="_4Asdqr7SEeGmQI_7e4ED3g" type="StateFigureCompartment"/>
+          <styles xsi:type="notation:ShapeStyle" xmi:id="_4Asdob7SEeGmQI_7e4ED3g" fontName="Verdana" fillColor="15981773" lineColor="12632256"/>
+          <styles xsi:type="notation:FontStyle" xmi:id="_4Asdor7SEeGmQI_7e4ED3g"/>
+          <styles xsi:type="notation:BooleanValueStyle" xmi:id="_4Asdq77SEeGmQI_7e4ED3g"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_4Asdo77SEeGmQI_7e4ED3g" x="19" y="229"/>
+        </children>
+        <children xsi:type="notation:Shape" xmi:id="_VJm4EL7UEeGmQI_7e4ED3g" type="Note" fontName="Verdana" description="expectation : &#xD;&#xA;and = false&#xD;&#xA;or = true&#xD;&#xA;not = false&#xD;&#xA;equal = false&#xD;&#xA;notequal = true" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="_VJm4FL7UEeGmQI_7e4ED3g" type="DiagramName">
+            <element xsi:nil="true"/>
+          </children>
+          <children xsi:type="notation:BasicDecorationNode" xmi:id="_VJm4Fb7UEeGmQI_7e4ED3g" type="Description">
+            <element xsi:nil="true"/>
+          </children>
+          <styles xsi:type="notation:TextStyle" xmi:id="_VJm4Eb7UEeGmQI_7e4ED3g"/>
+          <styles xsi:type="notation:LineTypeStyle" xmi:id="_VJm4Er7UEeGmQI_7e4ED3g"/>
+          <element xsi:nil="true"/>
+          <layoutConstraint xsi:type="notation:Bounds" xmi:id="_VJm4E77UEeGmQI_7e4ED3g" x="279" y="239" width="131" height="106"/>
+        </children>
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oo5CpL7REeGmQI_7e4ED3g"/>
+      </children>
+      <styles xsi:type="notation:ShapeStyle" xmi:id="_oovRob7REeGmQI_7e4ED3g" fontName="Verdana" fillColor="15790320" lineColor="12632256"/>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_oo5Cpb7REeGmQI_7e4ED3g" x="235" y="10" width="451" height="406"/>
+    </children>
+    <children xsi:type="notation:Shape" xmi:id="_opVHh77REeGmQI_7e4ED3g" type="StatechartText" fontName="Verdana" lineColor="4210752">
+      <children xsi:type="notation:DecorationNode" xmi:id="_opVHib7REeGmQI_7e4ED3g" type="StatechartName">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_opVHir7REeGmQI_7e4ED3g"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_opVHi77REeGmQI_7e4ED3g"/>
+      </children>
+      <children xsi:type="notation:Shape" xmi:id="_opVHjL7REeGmQI_7e4ED3g" type="StatechartTextExpression" fontName="Verdana" lineColor="4210752">
+        <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opVHjb7REeGmQI_7e4ED3g"/>
+      </children>
+      <layoutConstraint xsi:type="notation:Bounds" xmi:id="_opVHjr7REeGmQI_7e4ED3g" x="10" y="10" width="200" height="400"/>
+    </children>
+    <styles xsi:type="notation:DiagramStyle" xmi:id="_oocWsb7REeGmQI_7e4ED3g"/>
+    <edges xmi:id="_opVHgL7REeGmQI_7e4ED3g" type="Transition" element="_opL9nb7REeGmQI_7e4ED3g" source="_oo5Cp77REeGmQI_7e4ED3g" target="_opL9kL7REeGmQI_7e4ED3g">
+      <children xsi:type="notation:DecorationNode" xmi:id="_opVHhL7REeGmQI_7e4ED3g" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_opVHhb7REeGmQI_7e4ED3g"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_opVHhr7REeGmQI_7e4ED3g" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_opVHgb7REeGmQI_7e4ED3g" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_opVHg77REeGmQI_7e4ED3g" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_opVHgr7REeGmQI_7e4ED3g" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:id="_4yKW0L7SEeGmQI_7e4ED3g" type="Transition" element="_4xtq4L7SEeGmQI_7e4ED3g" source="_opL9kL7REeGmQI_7e4ED3g" target="_4AsdoL7SEeGmQI_7e4ED3g">
+      <children xsi:type="notation:DecorationNode" xmi:id="_4yKW1L7SEeGmQI_7e4ED3g" type="TransitionExpression">
+        <styles xsi:type="notation:ShapeStyle" xmi:id="_4yKW1b7SEeGmQI_7e4ED3g"/>
+        <layoutConstraint xsi:type="notation:Location" xmi:id="_4yKW1r7SEeGmQI_7e4ED3g" y="10"/>
+      </children>
+      <styles xsi:type="notation:ConnectorStyle" xmi:id="_4yKW0b7SEeGmQI_7e4ED3g" lineColor="4210752"/>
+      <styles xsi:type="notation:FontStyle" xmi:id="_4yKW077SEeGmQI_7e4ED3g" fontName="Verdana"/>
+      <bendpoints xsi:type="notation:RelativeBendpoints" xmi:id="_4yKW0r7SEeGmQI_7e4ED3g" points="[1, 13, -7, -138]$[11, 141, 3, -10]"/>
+      <sourceAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4zWpoL7SEeGmQI_7e4ED3g" id="(0.4697508896797153,0.7704918032786885)"/>
+      <targetAnchor xsi:type="notation:IdentityAnchor" xmi:id="_4zWpob7SEeGmQI_7e4ED3g" id="(0.5147058823529411,0.19642857142857142)"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>

test-plugins/org.yakindu.sct.test.models/tests/BitExpression.sctunit

@@ -0,0 +1,18 @@
+testcase for BitExpressions{
+	
+	test BitExpressions {
+		assert active ( BitExpressions.main_region.StateA)
+		assert myBit1 == 5
+		assert myBit2 == 7
+		raise e1
+		cycle
+		
+		assert active (BitExpressions.main_region.StateB)
+		assert leftBitshift == 10
+		assert rightBitshift == 2
+		assert complementBitshift == -6
+		assert bitwiseAnd == 5
+		assert bitwiseOr == 7
+		assert bitwiseXor == 2	 
+	}   
+}      

test-plugins/org.yakindu.sct.test.models/tests/BooleanExpressions.sctunit

@@ -0,0 +1,16 @@
+testcase for BooleanExpressions {
+	
+	test booleanExpressions {
+		assert active (BooleanExpressions.main_region.StateA)
+		assert myBool1 == true
+		assert myBool2 == false
+		raise e1
+		cycle
+		assert active (BooleanExpressions.main_region.StateB)
+		assert and == false
+		assert or == true
+		assert not == false
+		assert equal == false
+		assert notequal == true 
+	}
+}

test-plugins/org.yakindu.sct.test.models/tests/IntegerExpressions.sctunit

@@ -0,0 +1,36 @@
+testcase for IntegerExpressions {
+	
+	test integerExpressions {
+		assert active (IntegerExpressions.main_region.StateA)
+		assert myInt1 == 10
+		assert myInt2 == 5
+		raise e1 
+		cycle 
+		  
+		// comparison
+		assert less == false
+		assert greater == true
+		assert equalOrLess == false
+		assert equalOrGreater == true
+		assert equal == false
+		assert notEqual == true 
+		
+		//
+		assert plus == 15
+		assert minus == 5
+		assert multiply == 50
+		assert division == 2
+		assert modulo == 0
+		
+		//
+		assert negat == -10
+		//TODO  assert complement == -10 
+		
+		//
+		assert multiAssign == 20
+		assert divAssign == 2
+		assert plusAssign == 12
+		assert minusAssign == -8
+		assert moduloAssign == 0
+		}
+	}