Merge pull request #44 from simatic-ax/SDK_2311_integration

sjuergen · web-flow · commit 5343a2991eb1 · 2024-01-22T16:21:31.000+01:00
Sdk 2311 integration
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
diff --git a/apax-lock.json b/apax-lock.json
diff --git a/apax.yml b/apax.yml
@@ -8,7 +8,7 @@ description: Library to create state machines according an OOP state pattern
 type: lib
 targets:
   - '1500'
-  - 'axunit-llvm'
+  - 'llvm'
 # URL to repository
 repository:
   type: git
@@ -29,7 +29,7 @@ scripts:
     - apax pack
 # Dependencies
 devDependencies:
-  '@ax/sdk': 4.0.2
+  '@ax/sdk': 2311.0.1
   "@simatic-ax/snippetscollection": 0.1.3
 dependencies:
   "@ax/system-timer": 6.0.94
@@ -43,3 +43,5 @@ files:
   - 'doc'
   - 'src' # ship library with source
   # - 'bin/1500/'   # ship library with binary
+installStrategy: strict
+apaxVersion: 3.1.0
diff --git a/src/StateFramework/State/StateController.st b/src/StateFramework/State/StateController.st
@@ -141,6 +141,9 @@ NAMESPACE Simatic.Ax.StateFramework
                         EXIT; 
                     END_IF;                
                 END_FOR;
+            ELSE
+                _status := StateControllerStatus#STATUS_NO_TRANSITION;
+                RETURN;
             END_IF;
             _status := StateControllerStatus#STATUS_IS_RUNNING;
             // TODO action will be called after OnExit --> has to be changed
diff --git a/src/StateFramework/State/StateControllerStatus.st b/src/StateFramework/State/StateControllerStatus.st
@@ -5,7 +5,8 @@ NAMESPACE Simatic.Ax.StateFramework
             STATUS_IS_RUNNING := WORD#16#7001,
             STATUS_STATE_CHANGED := WORD#16#7002,
             STATUS_NO_INITIALSTATE := WORD#16#8100,
-            STATUS_NO_NEXTSTATE := WORD#16#8101
+            STATUS_NO_NEXTSTATE := WORD#16#8101,
+            STATUS_NO_TRANSITION := WORD#16#8102
         ) := STATUS_NO_ERR;
     END_TYPE
 END_NAMESPACE
diff --git a/test/Assert.st b/test/Assert.st
@@ -1,13 +1,7 @@
 USING Simatic.Ax.Stateframework;
 
 NAMESPACE AxUnit.Assert
-  FUNCTION Equal
-            VAR_INPUT
-		         expected:  StateControllerStatus;
-		         actual:  StateControllerStatus;
-	        END_VAR
-            Equal(expected := TRUE, actual := expected = actual);
-    END_FUNCTION 
+
     
     FUNCTION Equal
             VAR_INPUT
diff --git a/test/StateControllerStatusAssert.st b/test/StateControllerStatusAssert.st
@@ -0,0 +1,42 @@
+USING Simatic.Ax.StateFramework;
+USING AxUnit.ResultFunctions;
+USING System.Strings;
+
+NAMESPACE AxUnit.Assert
+    FUNCTION PUBLIC Equal2
+        VAR_INPUT
+            expected : StateControllerStatus;
+            actual : StateControllerStatus;
+            {CallerFilePath}
+            file : WSTRING[1024];
+            {CallerLineNumber}
+            line : INT;
+        END_VAR
+
+        IF actual = expected THEN
+            axunit_Succeed();
+        ELSE
+            ;
+            axunit_Fail(Concat('Expected ', ToString(expected), ', but found ', ToString(actual)), file, line);
+        END_IF;
+
+    END_FUNCTION
+
+    FUNCTION INTERNAL ToString : STRING
+        VAR_INPUT
+            actual : StateControllerStatus;
+        END_VAR
+        IF (actual = StateControllerStatus#STATUS_NO_ERR) THEN
+            ToString := 'STATUS_NO_ERR';
+        ELSIF (actual = StateControllerStatus#STATUS_IS_RUNNING) THEN
+            ToString := 'STATUS_IS_RUNNING';
+        ELSIF (actual = StateControllerStatus#STATUS_STATE_CHANGED) THEN
+            ToString := 'STATUS_STATE_CHANGED';
+        ELSIF (actual = StateControllerStatus#STATUS_NO_INITIALSTATE) THEN
+            ToString := 'STATUS_NO_INITIALSTATE';
+        ELSIF (actual = StateControllerStatus#STATUS_NO_NEXTSTATE) THEN
+            ToString := 'STATUS_NO_NEXTSTATE';
+        END_IF;
+        ;
+    END_FUNCTION
+END_NAMESPACE
diff --git a/test/StateFramework/Guards/GuardTest.st b/test/StateFramework/Guards/GuardTest.st
@@ -8,8 +8,15 @@ NAMESPACE Simatic.Ax.StateFramework.Test
     CLASS CountGuardTest
         VAR
             _guard : Simatic.Ax.StateFramework.CountGuard;
+            _guardStateless : Simatic.Ax.StateFramework.CountGuard;
         END_VAR
 
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            // Will be called before each test
+            _guard := _guardStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC TestCheck_Two_Times_Expect_TRUE
             _guard.Count := 2;
diff --git a/test/StateFramework/Transitions/TestState1Transition.st b/test/StateFramework/Transitions/TestState1Transition.st
@@ -5,10 +5,18 @@ NAMESPACE Simatic.Ax.StateFramework.Test
     {TestFixture}
     CLASS TestTransition1
         VAR
-            state1 : State1Transition := (StateId := 99, StateName := 'blabla');
+            state1 : State1Transition;
+            state1StateLess : State1Transition := (StateId := 99, StateName := 'blabla');
             trans : Transition;
         END_VAR
 
+        
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            // Will be called before each test
+            state1 := state1StateLess;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC  TransitionCount_Expect_0
             Equal(expected := UINT#0, actual := state1.TransitionCount());            
diff --git a/test/StateFramework/Transitions/TestState2Transition.st b/test/StateFramework/Transitions/TestState2Transition.st
@@ -6,10 +6,17 @@ NAMESPACE Simatic.Ax.StateFramework.Test
     CLASS TestTransition2
         VAR
             state2 : State2Transition;
+            state2StateLess : State2Transition;
             trans1 : Transition;
             trans2 : Transition;
         END_VAR
 
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            // Will be called before each test
+            state2 := state2StateLess;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC  Set_no_trans_And_Expect_0
             Equal(expected := UINT#0, actual := state2.TransitionCount());            
diff --git a/test/StateFramework/Transitions/TestState3Transition.st b/test/StateFramework/Transitions/TestState3Transition.st
@@ -6,11 +6,18 @@ NAMESPACE Simatic.Ax.StateFramework.Test
     CLASS TestTransition3
         VAR
             state3 : State3Transition;
+            state3StateLess : State3Transition;
             trans1 : Transition;
             trans2 : Transition;
             trans3 : Transition;
         END_VAR
 
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            // Will be called before each test
+            state3 := state3StateLess;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC  Set_no_trans_And_Expect_0
             Equal(expected := UINT#0, actual := state3.TransitionCount());            
diff --git a/test/StateFramework/testStateController.st b/test/StateFramework/testStateController.st
@@ -7,19 +7,52 @@ NAMESPACE Simatic.Ax.StateFramework.TestStateController
     CLASS StateControllerTest
         VAR
             sc : StateController;
-            is : InitialState := (StateName := 'Initial State');
-            ns : NextState1 := (StateName := 'Next State');
-            ls : LastState := (StateName := 'LastState');
+            scStateLess : StateController;
+            is : InitialState;
+            ns : NextState1;
+            ls : LastState;
+            isStateLess : InitialState := (StateName := 'Initial State');
+            nsStateLess : NextState1 := (StateName := 'Next State');
+            lsStateLess : LastState := (StateName := 'Last State');
             t1 : Transition;
             t2 : Transition;
             t3 : Transition;
+            t1StateLess : Transition;
+            t2StateLess : Transition;
+            t3StateLess : Transition;
             g1 : BoolGuard;
             b : BOOL;
         END_VAR
         
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            // Will be called before each test
+            sc := scStateLess;
+            is := isStateLess; 
+            ns := nsStateLess; 
+            ls := lsStateLess;
+            t1 := t1StateLess;
+            t2 := t2StateLess;
+            t3 := t3StateLess;
+
+            b := FALSE;
+            g1.Value := REF(b);
+            
+            is.Transition1 := t1;
+            t1.Guard := g1;
+            t1.NextState := ns;
+
+            ns.Transition1 := t2;
+            t2.NextState := ls;
+            t2.Guard := g1;
+            sc.InitialState := is;
+
+            // ls.Transition1 := t3;
+
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Test_Sc_Activate_State_1
-            THIS.SetupStatemachine();
             sc.Execute();
             Equal(expected := 'Initial State', actual := sc.GetActiveStateName());
             Equal(expected := 1, actual := is.OnEntryCount);
@@ -50,35 +83,21 @@ NAMESPACE Simatic.Ax.StateFramework.TestStateController
             ;
         END_METHOD
         
-        
-
-        // {Test}
-        // METHOD PUBLIC TestNoInitialState_and_Expect_8100
-        //     sc.Execute();
-        //     Equal(expected := StateControllerStatus#STATUS_NO_INITIALSTATE, actual := sc.GetState());
-        // END_METHOD
-
-        METHOD SetupStatemachine        
-            g1.Value := REF(b);
-            t1.Guard := g1;
-            is.Transition1 := t1;
-            t1.NextState := ns;
-            
-            ns.Transition1 := t2;
-            t2.Guard := g1;
-
-            sc.InitialState := is;
-        END_METHOD        
+           
         METHOD SetupStatemachine3States        
             g1.Value := REF(b);
-            t1.Guard := g1;
+            
+            // configure initial state
             is.Transition1 := t1;
             t1.NextState := ns;
+            t1.Guard := g1;
             
+            // configure next state
             ns.Transition1 := t2;
             t2.NextState := ls;
             t2.Guard := g1;
 
+            // configure last state
             ls.Transition1 := t3;
             t3.NextState := NULL;
             t3.Guard := g1;
@@ -87,54 +106,49 @@ NAMESPACE Simatic.Ax.StateFramework.TestStateController
         END_METHOD    
         {Test}
         METHOD PUBLIC TestExecute_ExpectStatusRunning
-            THIS.SetupStatemachine();
             sc.Execute();
-            Equal(expected := TRUE, actual := sc.GetState() = StateControllerStatus#STATUS_IS_RUNNING);
+            Equal2(expected := StateControllerStatus#STATUS_IS_RUNNING, actual := sc.GetState());
         END_METHOD
 
         {Test}
         METHOD PUBLIC TestExecute_ChangeStateTransition_True
-            THIS.SetupStatemachine();
             b := TRUE;
             sc.Execute();
-            Equal(expected := TRUE, actual := sc.GetState() = StateControllerStatus#STATUS_IS_RUNNING);
+            Equal2(expected := StateControllerStatus#STATUS_IS_RUNNING, actual := sc.GetState());
         END_METHOD
    
 
         {Test}
         METHOD PUBLIC TestExecute_ExpectStatus_No_NextStateRunning
-            THIS.SetupStatemachine();
             b := TRUE;
             sc.Execute();  // finalize first state
             sc.Execute();  // finalize next state (switchover fails, because next state has no own next state)
-            Equal(expected := TRUE, actual := sc.GetState() = StateControllerStatus#STATUS_NO_NEXTSTATE);
+            Equal2(expected := StateControllerStatus#STATUS_IS_RUNNING, actual := sc.GetState());
             sc.Execute();
-            Equal(expected := TRUE, actual := sc.GetState() = StateControllerStatus#STATUS_NO_NEXTSTATE);
+            Equal2(expected := StateControllerStatus#STATUS_NO_TRANSITION, actual := sc.GetState());
         END_METHOD        
 
         {Test}
         METHOD PUBLIC Restart_starts_with_the_InitialState
-            THIS.SetupStatemachine();
             // 1. Cycle
             b := TRUE; // Transition to nextState = TRUE
             sc.Execute();  // finalize first state
             // 2. Cycle
             b := FALSE;
             sc.Restart();
             sc.Execute();  // finalize next state (switchover fails, because next state has no own next state)
-            Equal(expected := TRUE, actual := StateControllerStatus#STATUS_IS_RUNNING = sc.GetState());
+            Equal(expected := StateControllerStatus#STATUS_IS_RUNNING, actual := sc.GetState());
             Equal(expected := 'Initial State', actual := sc.GetActiveStateName());
         END_METHOD                
 
         {Test}
         METHOD PUBLIC States_where_all_transitions_are_true_passed_in_two_cycles
-            THIS.SetupStatemachine3States();
             // 1. Cycle
             b := TRUE; // Transition to nextState = TRUE
             sc.Execute();  
             sc.Execute();  
-            Equal(expected := TRUE, actual := sc.GetState() = StateControllerStatus#STATUS_IS_RUNNING);
-            Equal(expected := 'LastState', actual := sc.GetActiveStateName());
+            Equal(expected := StateControllerStatus#STATUS_IS_RUNNING, actual := sc.GetState());
+            Equal(expected := 'Last State', actual := sc.GetActiveStateName());
             Equal(expected := TRUE, actual := ls.GetStatus() = StateStatus#Active);
         END_METHOD    
 
diff --git a/test/StringAssert.st b/test/StringAssert.st
@@ -0,0 +1,22 @@
+USING AxUnit.ResultFunctions;
+USING System.Strings;
+
+NAMESPACE AxUnit.Assert
+    FUNCTION PUBLIC Equal
+        VAR_INPUT
+            actual : String;
+            expected: String;
+            {CallerFilePath}
+            file : WSTRING[1024];
+            {CallerLineNumber}
+            line : INT;
+        END_VAR
+
+        IF actual = expected THEN
+            axunit_Succeed();
+        ELSE
+            axunit_Fail(Concat('Expected ', expected, ', but found ', actual), file, line);
+        END_IF;
+
+    END_FUNCTION
+END_NAMESPACE
