Started working on issue #17, it's quite tricky.

tcunit · Dec 20, 2018 · 53f2b25 · 53f2b25
1 parent 19f6a05
commit 53f2b25
Show file tree

Hide file tree

Showing 5 changed files with 300 additions and 71 deletions.
diff --git a/TcUnit/TcUnit/DUTs/ST_AssertResultInstances.TcDUT b/TcUnit/TcUnit/DUTs/ST_AssertResultInstances.TcDUT
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.16">
+  <DUT Name="ST_AssertResultInstances" Id="{018c91ab-7038-42ef-b6e4-5007ea06204f}">
+    <Declaration><![CDATA[TYPE ST_AssertResultInstances :
+STRUCT
+    AssertResult : ST_AssertResult;
+    DetectionCount : UINT; // Amount of instances of the "AssertResult"
+    DetectionCountThisCycle : UINT; // Amount of instance of the "AssertResult" in this specific PLC-cycle
+END_STRUCT
+END_TYPE]]></Declaration>
+  </DUT>
+</TcPlcObject>
diff --git a/TcUnit/TcUnit/GVLs/GVL.TcGVL b/TcUnit/TcUnit/GVLs/GVL.TcGVL
@@ -4,7 +4,7 @@
     <Declaration><![CDATA[{attribute 'no_assign'}
 {attribute 'qualified_only'}
 VAR_GLOBAL
-    AssertResultStatic : FB_AssertResultStatic;
+    //AssertResultStatic : FB_AssertResultStatic;
     TcUnitRunner : FB_TcUnitRunner;
 
     (* Indication of whether the last instantiated test suite has an assert instance created *)

diff --git a/TcUnit/TcUnit/POUs/FB_Assert.TcPOU b/TcUnit/TcUnit/POUs/FB_Assert.TcPOU
@@ -8,7 +8,7 @@
 {attribute 'call_after_init'}
 FUNCTION_BLOCK FB_Assert
 VAR
-    AssertResults : FB_AssertResultStatic := GVL.AssertResultStatic;
+    AssertResults : FB_AssertResultStatic;// := GVL.AssertResultStatic;
 
     (* Prints the failed asserts to ADS so that Visual Studio can display the assert message.
        This assert formatter can be replaced with something else than ADS *)