Merge pull request #23 from simatic-ax/chore/update_to_2405

Chore/update_to_2405

apax.yml

@@ -4,34 +4,36 @@ version: 0.0.0-placeholder
 author: Siemens AG
 type: lib
 # Description will be displayed in the apax extension
-description: the windowtracking library supports you to track data of an item
-  which is transported on a conveyor belt for instance
+description: The windowtracking library supports you to track data of an item which is transported on a conveyor belt for instance
 #URL to the repository
 repository:
   type: git
   url: https://github.com/simatic-ax/windowtracking
 targets:
   - "1500"
   - llvm
+# Registry information, where the package will be published
+registries:
+  '@simatic-ax': 'https://npm.pkg.github.com/'
 # Environment variables
 variables:
   APAX_BUILD_ARGS:
     - '--debug'
+# Install settings
+installStrategy: strict
+apaxVersion: 3.2.1
 # Dependencies
 devDependencies:
-  "@ax/sdk": 2311.0.1
-  "@simatic-ax/snippetscollection": 0.1.3
+  "@ax/sdk": 2405.0.0
+  "@simatic-ax/snippetscollection": 1.0.0
 dependencies:
-  "@simatic-ax/simple-control-modules": 5.0.1
-registries:
-  '@simatic-ax': 'https://npm.pkg.github.com/'
+  "@simatic-ax/simple-control-modules": 6.0.0
 # Files which 'apax pack' will include
 files:
   - 'README.md'
   - 'LICENSE.md'
   - 'changelog.md'
   - 'snippets'
   - 'docs'
-  - 'src'
-installStrategy: strict
-apaxVersion: 3.1.0
+  - 'src' # ship library as src-files
+  # - 'bin'    # ship library as bin-files

test/ItemTest.st

@@ -5,10 +5,17 @@ NAMESPACE Simatic.Ax.WindowTracking
     CLASS ItemTest
         VAR PROTECTED
             i : ItemOneDestination;
+            iStateless : ItemOneDestination;
             vt : VirtualTrigger;
             ivt : IVirtualTrigger;
         END_VAR
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            i := iStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Test_Count_with_no_deststination_expect_0
             Equal(expected := i.DestinationCount(), actual := 0);

test/TransportWindowTest.st

@@ -8,9 +8,16 @@ NAMESPACE Simatic.Ax.WindowTracking
 
         VAR PROTECTED
             tw : TransportWindow;
+            twStateless : TransportWindow;
             enc : EncoderMock;
         END_VAR
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            tw := twStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Test_Encode_NULL_Expect_False
             Equal(expected := FALSE, actual := tw.CalcPosition());

test/TransportWindowsListTest.st

@@ -8,7 +8,9 @@ NAMESPACE Simatic.Ax.WindowTracking
 
         VAR PROTECTED
             tws : TransportWindowList;
+            twsStateless : TransportWindowList;
             enc : EncoderMock;
+            encStateless : EncoderMock;
             v1 : VirtualTrigger := (Position := 100, Id := UINT#1);
             v2 : VirtualTrigger := (Position := 200, Id := UINT#2);
             te1 : TriggerEventMock;
@@ -25,6 +27,13 @@ NAMESPACE Simatic.Ax.WindowTracking
             tws.TriggerPointList := tl;
         END_METHOD
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            tws := twsStateless;
+            enc := encStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Evaluate_a_empty_list_expect_False
             Equal(expected := FALSE, actual := tws.Evaluate());

test/VirtualTriggerListTest.st

@@ -5,6 +5,7 @@ NAMESPACE Simatic.Ax.WindowTracking
     CLASS TestVirtualTriggerList
         VAR PROTECTED
             tl : VirtualTriggerList;
+            tlStateless : VirtualTriggerList;
             trig1 : VirtualTrigger := (Id := UINT#1, Position := 1100);
             trig2 : VirtualTrigger := (Id := UINT#2, Position := 1200);
             trig3 : VirtualTrigger := (Id := UINT#3, Position := 1300);
@@ -26,6 +27,12 @@ NAMESPACE Simatic.Ax.WindowTracking
             tl.Add(tp := trig4);
         END_METHOD
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            tl := tlStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC TestCount_elements_expect_4
             THIS.SetupTriggerList();

test/VirtualTriggerTest.st

@@ -4,6 +4,7 @@ NAMESPACE Simatic.Ax.WindowTracking
     CLASS TestVirtualTrigger
         VAR PROTECTED
             vt : VirtualTrigger;
+            vtStateless : VirtualTrigger;
             evt : TriggerEventMock;
             tw : TransportWindow;
             enc : EncoderMock;
@@ -15,6 +16,12 @@ NAMESPACE Simatic.Ax.WindowTracking
             vt.Id := UINT#10;
         END_METHOD
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            vt := vtStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Test_Activate_method_with_no_event_expect_NullReferecne
             VAR_TEMP

test/WindowingIntegrativeTest.st

@@ -4,6 +4,7 @@ NAMESPACE Simatic.Ax.WindowTracking
     CLASS WindowingIntegraiveTest
         VAR PROTECTED
             twl : TransportWindowList;
+            twlStateless : TransportWindowList;           
             tpl : VirtualTriggerList;
 
             tp1 : VirtualTrigger;
@@ -22,6 +23,12 @@ NAMESPACE Simatic.Ax.WindowTracking
             tpl.Add(tp1);
         END_METHOD   
 
+        // This method will be called before each test method
+        {TestSetup}
+        METHOD PUBLIC MyTestSetup
+            twl := twlStateless;
+        END_METHOD
+
         {Test}
         METHOD PUBLIC Test_Crate3_Windows_with_distance_20
             THIS.Setup();