From d152c952b25b9508a734205a2ac69f274b811f6d Mon Sep 17 00:00:00 2001
From: Jakob Sagatowski <jakob.sagatowski@outlook.com>
Date: Wed, 30 Dec 2020 15:03:45 +0100
Subject: [PATCH] Implemented new way of execute tests RUN_IN_SEQUENCE(). This
 executes the test suites one after the other (as opposed to RUN() which
 executes all test suites in parallel). For more details, see #95.

Also changed method access modifiers for all methods in TcUnit so that none is left with the default (PUBLIC).
Incremented version of TcUnit to 1.2.0.0.
---
 README.md                                     |  2 +-
 .../TcUnitVerifier/Test/PRG_TEST.TcPOU        |  9 ++-
 .../POUs/FB_AdsAssertMessageFormatter.TcPOU   |  2 +-
 .../FB_AdsLogStringMessageFifoQueue.TcPOU     |  2 +-
 .../POUs/FB_AssertArrayResultStatic.TcPOU     |  4 +-
 .../TcUnit/POUs/FB_AssertResultStatic.TcPOU   |  4 +-
 TcUnit/TcUnit/POUs/FB_FileControl.TcPOU       |  6 +-
 TcUnit/TcUnit/POUs/FB_TcUnitRunner.TcPOU      | 62 ++++++++++++++++++-
 TcUnit/TcUnit/POUs/FB_Test.TcPOU              | 28 ++++-----
 TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU         | 44 ++++++++-----
 TcUnit/TcUnit/POUs/Functions/RUN.TcPOU        |  1 +
 .../POUs/Functions/RUN_IN_SEQUENCE.TcPOU      | 13 ++++
 TcUnit/TcUnit/TcUnit.plcproj                  |  5 +-
 TcUnit/TcUnit/Version/Global_Version.TcGVL    |  2 +-
 TcUnit/_Config/PLC/TcUnit.xti                 |  4 +-
 15 files changed, 142 insertions(+), 46 deletions(-)
 create mode 100644 TcUnit/TcUnit/POUs/Functions/RUN_IN_SEQUENCE.TcPOU

diff --git a/README.md b/README.md
index 9b83b0a..ba8afdb 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,4 @@ That's fantastic! But please read the [CONTRIBUTING](CONTRIBUTING.md) first.
 **Found a bug or want to discuss an idea?**  
 Check the [open](https://github.com/tcunit/TcUnit/issues) and [closed](https://github.com/tcunit/TcUnit/issues?q=is%3Aissue+is%3Aclosed) issues.
 If your issue does not already exist, create a [new](https://github.com/tcunit/TcUnit/issues/new).
-For general idea/discussions, use the [discussions](https://github.com/tcunit/TcUnit/discussions).
\ No newline at end of file
+For general ideas/discussions, use the [discussions](https://github.com/tcunit/TcUnit/discussions).
\ No newline at end of file
diff --git a/TcUnit-Verifier/TcUnit-Verifier_TwinCAT/TcUnit-Verifier_TwinCAT/TcUnitVerifier/Test/PRG_TEST.TcPOU b/TcUnit-Verifier/TcUnit-Verifier_TwinCAT/TcUnit-Verifier_TwinCAT/TcUnitVerifier/Test/PRG_TEST.TcPOU
index 9580c07..d3fd92f 100644
--- a/TcUnit-Verifier/TcUnit-Verifier_TwinCAT/TcUnit-Verifier_TwinCAT/TcUnitVerifier/Test/PRG_TEST.TcPOU
+++ b/TcUnit-Verifier/TcUnit-Verifier_TwinCAT/TcUnit-Verifier_TwinCAT/TcUnitVerifier/Test/PRG_TEST.TcPOU
@@ -35,7 +35,14 @@ VAR
     //TestFinishedNamedDoesNotExist : FB_TestFinishedNamedDoesNotExist;
 END_VAR]]></Declaration>
     <Implementation>
-      <ST><![CDATA[TcUnit.RUN();]]></ST>
+      <ST><![CDATA[(* There are two ways to run TcUnit test suites:
+    1. The RUN() will run all the test suites in parallel
+    2. The RUN_IN_SEQUENCE() will run the test suites in sequence (one-by-one, next one doesn't start until the previous one is finished)
+    Only use one of them at a time
+*)
+
+TcUnit.RUN();
+//TcUnit.RUN_IN_SEQUENCE();]]></ST>
     </Implementation>
   </POU>
 </TcPlcObject>
\ No newline at end of file
diff --git a/TcUnit/TcUnit/POUs/FB_AdsAssertMessageFormatter.TcPOU b/TcUnit/TcUnit/POUs/FB_AdsAssertMessageFormatter.TcPOU
index 5801398..2a2cc87 100644
--- a/TcUnit/TcUnit/POUs/FB_AdsAssertMessageFormatter.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_AdsAssertMessageFormatter.TcPOU
@@ -11,7 +11,7 @@ FUNCTION_BLOCK FB_AdsAssertMessageFormatter IMPLEMENTS I_AssertMessageFormatter]
       <ST><![CDATA[]]></ST>
     </Implementation>
     <Method Name="LogAssertFailure" Id="{48cbc6b0-5380-44b8-a045-57b6ad9f189d}">
-      <Declaration><![CDATA[METHOD LogAssertFailure
+      <Declaration><![CDATA[METHOD PUBLIC LogAssertFailure
 VAR_INPUT
     Expected : Tc2_System.T_MaxString;
     Actual : Tc2_System.T_MaxString;
diff --git a/TcUnit/TcUnit/POUs/FB_AdsLogStringMessageFifoQueue.TcPOU b/TcUnit/TcUnit/POUs/FB_AdsLogStringMessageFifoQueue.TcPOU
index 2794998..4eb8fc1 100644
--- a/TcUnit/TcUnit/POUs/FB_AdsLogStringMessageFifoQueue.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_AdsLogStringMessageFifoQueue.TcPOU
@@ -60,7 +60,7 @@ Error := NOT MemRingBuffer.bOk;]]></ST>
     </Method>
     <Method Name="WriteLog" Id="{4ca4d063-d389-4869-8fdb-ce7017f310dc}">
       <Declaration><![CDATA[(* Writes a new data set into the ring buffer *)
-METHOD PUBLIC WriteLog
+METHOD INTERNAL WriteLog
 VAR_INPUT
     MsgCtrlMask : DWORD;
     MsgFmtStr : Tc2_System.T_MaxString;
diff --git a/TcUnit/TcUnit/POUs/FB_AssertArrayResultStatic.TcPOU b/TcUnit/TcUnit/POUs/FB_AssertArrayResultStatic.TcPOU
index 1de149f..1f68481 100644
--- a/TcUnit/TcUnit/POUs/FB_AssertArrayResultStatic.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_AssertArrayResultStatic.TcPOU
@@ -151,7 +151,7 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfArrayAssertsForTest" Id="{73e503e0-e1d1-4f6d-bdbf-ae50167481e7}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfArrayAssertsForTest : UINT
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfArrayAssertsForTest : UINT
 VAR_INPUT
     CompleteTestInstancePath : Tc2_System.T_MaxString;
 END_VAR
@@ -202,7 +202,7 @@ GetNumberOfArrayAssertsForTest := NumberOfArrayAsserts;]]></ST>
         the stored detection-count for this combination, create a new report and add +1 to the storage of
         the detection-count.
 *)
-METHOD PUBLIC ReportResult
+METHOD INTERNAL ReportResult
 VAR_INPUT
     ExpectedsSize : UDINT;
     ExpectedsTypeClass : IBaseLibrary.TypeClass;
diff --git a/TcUnit/TcUnit/POUs/FB_AssertResultStatic.TcPOU b/TcUnit/TcUnit/POUs/FB_AssertResultStatic.TcPOU
index f2760e7..7fd7212 100644
--- a/TcUnit/TcUnit/POUs/FB_AssertResultStatic.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_AssertResultStatic.TcPOU
@@ -161,7 +161,7 @@ END_FOR]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfAssertsForTest" Id="{a073fba3-9c9c-44bc-b792-f90e25f50f64}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfAssertsForTest : UINT
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfAssertsForTest : UINT
 VAR_INPUT
     CompleteTestInstancePath : Tc2_System.T_MaxString;
 END_VAR
@@ -209,7 +209,7 @@ GetNumberOfAssertsForTest := NumberOfAsserts;]]></ST>
         the stored detection-count for this combination, create a new report and add +1 to the storage of
         the detection-count.
 *)
-METHOD PUBLIC ReportResult
+METHOD INTERNAL ReportResult
 VAR_INPUT
     ExpectedSize : UDINT;
     ExpectedTypeClass : IBaseLibrary.TypeClass;
diff --git a/TcUnit/TcUnit/POUs/FB_FileControl.TcPOU b/TcUnit/TcUnit/POUs/FB_FileControl.TcPOU
index b4138dc..ff90b1c 100644
--- a/TcUnit/TcUnit/POUs/FB_FileControl.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_FileControl.TcPOU
@@ -14,7 +14,7 @@ END_VAR]]></Declaration>
     </Implementation>
     <Method Name="Close" Id="{519e9011-283c-40b1-afd4-31686c5b81fe}">
       <Declaration><![CDATA[(*
-    Closes the current opened file.
+    Closes the currently opened file.
 *)
 METHOD PUBLIC Close : SysFile.SysTypes.RTS_IEC_RESULT;]]></Declaration>
       <Implementation>
@@ -57,7 +57,7 @@ END_VAR]]></Declaration>
       <Declaration><![CDATA[(*
     Reads a file from disk into the buffer
 *)
-METHOD Read : SysFile.SysTypes.RTS_IEC_RESULT;
+METHOD PUBLIC Read : SysFile.SysTypes.RTS_IEC_RESULT;
 VAR_INPUT
     BufferPointer : POINTER TO BYTE; // Call with ADR();
     Size : UDINT; // Call with SIZEOF(); 
@@ -80,7 +80,7 @@ END_IF]]></ST>
       <Declaration><![CDATA[(* 
     Writes the contents of the buffer into a file.
 *)
-METHOD Write : SysFile.SysTypes.RTS_IEC_RESULT;
+METHOD PUBLIC Write : SysFile.SysTypes.RTS_IEC_RESULT;
 VAR_INPUT
     BufferPointer : POINTER TO BYTE; // Call with ADR();
     Size : UDINT; // Call with SIZEOF();
diff --git a/TcUnit/TcUnit/POUs/FB_TcUnitRunner.TcPOU b/TcUnit/TcUnit/POUs/FB_TcUnitRunner.TcPOU
index b19dd53..9f4903c 100644
--- a/TcUnit/TcUnit/POUs/FB_TcUnitRunner.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_TcUnitRunner.TcPOU
@@ -31,13 +31,14 @@ END_VAR]]></Declaration>
     <Method Name="AbortRunningTestSuiteTests" Id="{3fcbd569-749a-493c-a697-2c976fa6e96a}">
       <Declaration><![CDATA[(* This function sets a flag which makes the runner stop running the tests
    in the test suites *)
-METHOD PUBLIC AbortRunningTestSuiteTests]]></Declaration>
+METHOD INTERNAL AbortRunningTestSuiteTests]]></Declaration>
       <Implementation>
         <ST><![CDATA[AbortRunningTestSuites := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="RunTestSuiteTests" Id="{d333e6c4-a1da-4b5b-91b3-4b4808e6c299}">
-      <Declaration><![CDATA[METHOD RunTestSuiteTests
+      <Declaration><![CDATA[(* This runs all the test suites in parallel *)
+METHOD INTERNAL RunTestSuiteTests
 VAR
     Counter : UINT := 0;
     BusyPrinting : BOOL;
@@ -58,6 +59,7 @@ IF NOT AllTestSuitesFinished THEN
                 NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;
             ELSE
                 GVL_TcUnit.CurrentTestSuiteBeingCalled := GVL_TcUnit.TestSuiteAddresses[Counter];
+                GVL_TcUnit.CurrentTestSuiteBeingCalled^.SetHasStartedRunning();
                 GVL_TcUnit.CurrentTestSuiteBeingCalled^();
             END_IF
         END_FOR
@@ -81,6 +83,62 @@ TestResultLogger.LogTestSuiteResults();
 (* publish the xUnit Xml file once if enabled *)
 XmlTestResultPublisher.LogTestSuiteResults();
 
+(* Run the buffered ADS logger *)
+GVL_TcUnit.AdsMessageQueue();]]></ST>
+      </Implementation>
+    </Method>
+    <Method Name="RunTestSuiteTestsInSequence" Id="{01bbc2d3-b1c5-4bce-a3f3-fa46a50fd167}">
+      <Declaration><![CDATA[(* This runs all the test suites in sequence (one after the other) *)
+METHOD INTERNAL RunTestSuiteTestsInSequence
+VAR
+    BusyPrinting : BOOL;
+    (* We need to hold a temporary state of the statistics 
+       as we don't consider the tests to be completely finished until all test suites have executed completely.
+       The reason we want to do it this way is because a test suite can run over several cycles. Only once all tests
+       are finished (which might take many cycles), do we gather correct statistics *)
+    NumberOfTestSuitesFinished : UINT := 0;
+END_VAR
+VAR_INST
+    (* This variable holds which current test suite is being called, as we are running
+       each one in a sequence (one by one) *)
+     CurrentlyRunningTestSuite : UINT := 1;
+END_VAR]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[(* Run TcUnit test suites *)
+IF NOT AllTestSuitesFinished THEN
+    IF GVL_TcUnit.NumberOfInitializedTestSuites = 0 THEN
+        AllTestSuitesFinished := TRUE;
+    ELSIF GVL_TcUnit.NumberOfInitializedTestSuites > 0 THEN
+        IF GVL_TcUnit.TestSuiteAddresses[CurrentlyRunningTestSuite]^.AreAllTestsFinished() THEN
+            IF CurrentlyRunningTestSuite <> GVL_TcUnit.NumberOfInitializedTestSuites THEN
+                NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;
+                CurrentlyRunningTestSuite := CurrentlyRunningTestSuite + 1;
+            END_IF
+        ELSE
+            GVL_TcUnit.CurrentTestSuiteBeingCalled := GVL_TcUnit.TestSuiteAddresses[CurrentlyRunningTestSuite];
+            GVL_TcUnit.CurrentTestSuiteBeingCalled^.SetHasStartedRunning();
+            GVL_TcUnit.CurrentTestSuiteBeingCalled^();
+        END_IF
+        (* Check if some event triggered an abortion of running the tests, in that case abort it now.
+           This can be accomplished by setting the result of the test suites run to finished. *)
+        IF AbortRunningTestSuites THEN
+            NumberOfTestSuitesFinished := GVL_TcUnit.NumberOfInitializedTestSuites;
+        END_IF
+        IF NumberOfTestSuitesFinished = GVL_TcUnit.NumberOfInitializedTestSuites THEN
+            AllTestSuitesFinished := TRUE;
+        END_IF
+    END_IF
+END_IF
+
+(* Store test suite results continuously *)
+TestResults();
+
+(* Log test suite results continuously *)
+TestResultLogger.LogTestSuiteResults();
+
+(* publish the xUnit Xml file once if enabled *)
+XmlTestResultPublisher.LogTestSuiteResults();
+
 (* Run the buffered ADS logger *)
 GVL_TcUnit.AdsMessageQueue();]]></ST>
       </Implementation>
diff --git a/TcUnit/TcUnit/POUs/FB_Test.TcPOU b/TcUnit/TcUnit/POUs/FB_Test.TcPOU
index bdbfe6b..0599d03 100644
--- a/TcUnit/TcUnit/POUs/FB_Test.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_Test.TcPOU
@@ -20,50 +20,50 @@ END_VAR]]></Declaration>
       <ST><![CDATA[]]></ST>
     </Implementation>
     <Method Name="GetAssertionMessage" Id="{273c4e89-faee-43b5-803d-428cdf75ac48}">
-      <Declaration><![CDATA[METHOD PUBLIC GetAssertionMessage : Tc2_System.T_MaxString]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetAssertionMessage : Tc2_System.T_MaxString]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetAssertionMessage := AssertionMessage;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetAssertionType" Id="{cd1419c3-7b07-4183-b487-40bdbb0bbce3}">
-      <Declaration><![CDATA[METHOD PUBLIC GetAssertionType : E_AssertionType]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetAssertionType : E_AssertionType]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetAssertionType := AssertionType;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetName" Id="{94757f0e-9979-49d0-ad9f-e35c823175d4}">
-      <Declaration><![CDATA[METHOD PUBLIC GetName : Tc2_System.T_MaxString;]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetName : Tc2_System.T_MaxString;]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetName := TestName;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfAssertions" Id="{0cfa1f03-0295-4f8f-bfd9-24d7b7f17e37}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfAssertions : UINT]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfAssertions : UINT]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetNumberOfAssertions := NumberOfAssertions;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IsFailed" Id="{e42409e3-251f-4133-8b14-3630785983d6}">
-      <Declaration><![CDATA[METHOD PUBLIC IsFailed : BOOL]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL IsFailed : BOOL]]></Declaration>
       <Implementation>
         <ST><![CDATA[IsFailed := TestIsFailed;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IsFinished" Id="{813a9067-b864-4739-9c14-830160e0eabc}">
-      <Declaration><![CDATA[METHOD PUBLIC IsFinished : BOOL]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL IsFinished : BOOL]]></Declaration>
       <Implementation>
         <ST><![CDATA[IsFinished := TestIsFinished;]]></ST>
       </Implementation>
     </Method>
     <Method Name="IsSkipped" Id="{ff97feb1-1a4a-4f36-ba1d-f8483e588d4f}">
-      <Declaration><![CDATA[METHOD PUBLIC IsSkipped : BOOL]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL IsSkipped : BOOL]]></Declaration>
       <Implementation>
         <ST><![CDATA[IsSkipped := TestIsSkipped;]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetAssertionMessage" Id="{05091715-93d7-47f7-9b6c-cb2511f88eb7}">
       <Declaration><![CDATA[(* Sets the assertion message. If one already exists, it's not overwritten as we keep the first assertion in the test *)
-METHOD PUBLIC SetAssertionMessage
+METHOD INTERNAL SetAssertionMessage
 VAR_INPUT
     AssertMessage : Tc2_System.T_MaxString;
 END_VAR]]></Declaration>
@@ -75,7 +75,7 @@ END_IF]]></ST>
     </Method>
     <Method Name="SetAssertionType" Id="{f885f3cc-c862-4d38-9dbb-f44d7639f6a8}">
       <Declaration><![CDATA[(* Sets the assertion type. If one already exists, it's not overwritten as we keep the first assertion in the test *)
-METHOD PUBLIC SetAssertionType
+METHOD INTERNAL SetAssertionType
 VAR_INPUT
     AssertType : E_AssertionType;
 END_VAR]]></Declaration>
@@ -86,19 +86,19 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetFailed" Id="{b840b41b-4045-4fd9-b97d-0bf226c46fb3}">
-      <Declaration><![CDATA[METHOD PUBLIC SetFailed]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL SetFailed]]></Declaration>
       <Implementation>
         <ST><![CDATA[TestIsFailed := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetFinished" Id="{e1245d1c-be22-4d60-bc91-fe0262827234}">
-      <Declaration><![CDATA[METHOD SetFinished : BOOL]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL SetFinished : BOOL]]></Declaration>
       <Implementation>
         <ST><![CDATA[TestIsFinished := TRUE;]]></ST>
       </Implementation>
     </Method>
     <Method Name="SetName" Id="{4c12f6eb-bbe4-4872-ac89-4411e2e81414}">
-      <Declaration><![CDATA[METHOD PUBLIC SetName
+      <Declaration><![CDATA[METHOD INTERNAL SetName
 VAR_INPUT
     Name : Tc2_System.T_MaxString;
 END_VAR]]></Declaration>
@@ -107,7 +107,7 @@ END_VAR]]></Declaration>
       </Implementation>
     </Method>
     <Method Name="SetNumberOfAssertions" Id="{94c630e9-29b9-45f4-8716-809aab6fb076}">
-      <Declaration><![CDATA[METHOD PUBLIC SetNumberOfAssertions
+      <Declaration><![CDATA[METHOD INTERNAL SetNumberOfAssertions
 VAR_INPUT
     NoOfAssertions : UINT;
 END_VAR]]></Declaration>
@@ -117,7 +117,7 @@ END_VAR]]></Declaration>
     </Method>
     <Method Name="SetSkipped" Id="{e9a94cad-c60d-4460-92bf-2b70cf2f46b2}">
       <Declaration><![CDATA[(* Sets the test case to skipped *)
-METHOD PUBLIC SetSkipped]]></Declaration>
+METHOD INTERNAL SetSkipped]]></Declaration>
       <Implementation>
         <ST><![CDATA[TestIsSkipped := TRUE;]]></ST>
       </Implementation>
diff --git a/TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU b/TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU
index b0546d0..e78e9cf 100644
--- a/TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU
+++ b/TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU
@@ -36,12 +36,15 @@ VAR
        This assert formatter can be replaced with something else than ADS *)
     AdsAssertMessageFormatter : FB_AdsAssertMessageFormatter;
     AssertMessageFormatter : I_AssertMessageFormatter := AdsAssertMessageFormatter;
+
+    (* Indication whether this test suite has started running its tests *)
+    HasStartedRunning : BOOL;
 END_VAR]]></Declaration>
     <Implementation>
       <ST><![CDATA[]]></ST>
     </Implementation>
     <Method Name="AddTest" Id="{d383011f-6bea-4b05-9018-ea4782ad2837}">
-      <Declaration><![CDATA[METHOD PUBLIC AddTest
+      <Declaration><![CDATA[METHOD INTERNAL AddTest
 VAR_INPUT
     TestName : Tc2_System.T_MaxString;
 END_VAR
@@ -119,7 +122,7 @@ END_IF]]></ST>
       </Implementation>
     </Method>
     <Method Name="AddTestNameToInstancePath" Id="{abecfe2f-b0e2-4118-a1c6-bb248556b776}">
-      <Declaration><![CDATA[METHOD PRIVATE AddTestNameToInstancePath : Tc2_System.T_MaxString
+      <Declaration><![CDATA[METHOD INTERNAL AddTestNameToInstancePath : Tc2_System.T_MaxString
 VAR_INPUT
     TestInstancePath : Tc2_System.T_MaxString;
 END_VAR
@@ -132,10 +135,9 @@ AddTestNameToInstancePath := Tc2_Utilities.CONCAT(STR1 := CompleteTestInstancePa
       </Implementation>
     </Method>
     <Method Name="AreAllTestsFinished" Id="{2b211901-49a8-4e51-90e1-4b1e298f9e0c}">
-      <Declaration><![CDATA[METHOD PUBLIC AreAllTestsFinished : BOOL
+      <Declaration><![CDATA[METHOD INTERNAL AreAllTestsFinished : BOOL
 VAR
     Counter : UINT;
-
     GetCurTaskIndex : Tc2_System.GETCURTASKINDEX;
 END_VAR]]></Declaration>
       <Implementation>
@@ -150,9 +152,9 @@ IF NumberOfTests > 0 THEN
 END_IF
 
 (* If we have been running at least one cycle and no tests are registered it means that this testsuite is empty
-   and doesn't contain any test cases. In that case, add a warning message and ignore this testsuite. *)
+   and doesn't contain any test cases. In that case, ignore this testsuite. *)
 GetCurTaskIndex();
-IF NumberOfTests = 0 AND NOT TwinCAT_SystemInfoVarList._TaskInfo[GetCurTaskIndex.index].FirstCycle THEN
+IF NumberOfTests = 0 AND NOT TwinCAT_SystemInfoVarList._TaskInfo[GetCurTaskIndex.index].FirstCycle AND HasStartedRunning THEN
     AreAllTestsFinished := TRUE;
 END_IF]]></ST>
       </Implementation>
@@ -3576,7 +3578,7 @@ END_VAR]]></Declaration>
       </Implementation>
     </Method>
     <Method Name="CalculateAndSetNumberOfAssertsForTest" Id="{a963cb6a-a176-4774-9e1c-6c7896b6a752}">
-      <Declaration><![CDATA[METHOD PUBLIC CalculateAndSetNumberOfAssertsForTest
+      <Declaration><![CDATA[METHOD INTERNAL CalculateAndSetNumberOfAssertsForTest
 VAR_INPUT
     TestName : Tc2_System.T_MaxString;
 END_VAR
@@ -3624,15 +3626,21 @@ METHOD PRIVATE FindTestSuiteInstancePath : Tc2_System.T_MaxString]]></Declaratio
         <ST><![CDATA[FindTestSuiteInstancePath := GetInstancePath();]]></ST>
       </Implementation>
     </Method>
+    <Method Name="GetHasStartedRunning" Id="{73f869b5-0951-4519-8e1e-dd573837cf2e}">
+      <Declaration><![CDATA[METHOD INTERNAL GetHasStartedRunning : BOOL]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[GetHasStartedRunning := HasStartedRunning;]]></ST>
+      </Implementation>
+    </Method>
     <Method Name="GetInstancePath" Id="{178fa338-5ed3-417b-8f4d-e9f120ace4b9}">
-      <Declaration><![CDATA[METHOD PUBLIC GetInstancePath : Tc2_System.T_MaxString
+      <Declaration><![CDATA[METHOD INTERNAL GetInstancePath : Tc2_System.T_MaxString
 ]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetInstancePath := InstancePath;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfFailedTests" Id="{12e4522b-e67f-439a-af1d-8713231888aa}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfFailedTests : UINT
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfFailedTests : UINT
 VAR
     Counter : UINT;
     FailedTestsCount : UINT;
@@ -3650,7 +3658,7 @@ GetNumberOfFailedTests := FailedTestsCount;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfSkippedTests" Id="{51a75168-98fa-4d92-8093-efb431316cf0}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfSkippedTests : UINT
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfSkippedTests : UINT
 VAR
     Counter : UINT;
     SkippedTestsCount : UINT;
@@ -3668,20 +3676,20 @@ GetNumberOfSkippedTests := SkippedTestsCount;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfSuccessfulTests" Id="{635213dc-96ca-4be6-9c0d-c0454c29d34d}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfSuccessfulTests : UINT]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfSuccessfulTests : UINT]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetNumberOfSuccessfulTests := GetNumberOfTests() - GetNumberOfFailedTests() - GetNumberOfSkippedTests();]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetNumberOfTests" Id="{6f67c6d5-c29e-4577-8651-51bd6db3ab63}">
-      <Declaration><![CDATA[METHOD PUBLIC GetNumberOfTests : UINT]]></Declaration>
+      <Declaration><![CDATA[METHOD INTERNAL GetNumberOfTests : UINT]]></Declaration>
       <Implementation>
         <ST><![CDATA[GetNumberOfTests := NumberOfTests;]]></ST>
       </Implementation>
     </Method>
     <Method Name="GetTestByPosition" Id="{3795ba6c-bb70-4d36-8d46-fa6431157992}">
       <Declaration><![CDATA[(* This method returns the test at the n'th position, ranging from 1.. NumberOfTests *)
-METHOD PUBLIC GetTestByPosition : FB_Test
+METHOD INTERNAL GetTestByPosition : FB_Test
 VAR_INPUT
     Position : UINT(1..GVL_Param_TcUnit.MaxNumberOfTestsForEachTestSuite);
 END_VAR]]></Declaration>
@@ -3690,7 +3698,7 @@ END_VAR]]></Declaration>
       </Implementation>
     </Method>
     <Method Name="IsTestFinished" Id="{1ef139e2-1210-4139-ba5c-329f8493b09c}">
-      <Declaration><![CDATA[METHOD PUBLIC IsTestFinished : BOOL
+      <Declaration><![CDATA[METHOD INTERNAL IsTestFinished : BOOL
 VAR_INPUT
     TestName : Tc2_System.T_MaxString;
 END_VAR
@@ -3709,6 +3717,12 @@ IF NumberOfTests > 0 THEN
 END_IF]]></ST>
       </Implementation>
     </Method>
+    <Method Name="SetHasStartedRunning" Id="{ec167018-f922-4541-86e8-8b70c1684943}">
+      <Declaration><![CDATA[METHOD INTERNAL SetHasStartedRunning]]></Declaration>
+      <Implementation>
+        <ST><![CDATA[HasStartedRunning := TRUE;]]></ST>
+      </Implementation>
+    </Method>
     <Method Name="SetTestFailed" Id="{79b1664f-2570-4cef-bd6e-d7307d9a7818}">
       <Declaration><![CDATA[METHOD PRIVATE SetTestFailed
 VAR_INPUT
@@ -3734,7 +3748,7 @@ END_IF]]></ST>
       <Declaration><![CDATA[(* Marks the test as finished in this testsuite.
    Returns TRUE if test was found, and FALSE if a test with this name was not found in this testsuite
 *)
-METHOD PUBLIC SetTestFinished : BOOL;
+METHOD INTERNAL SetTestFinished : BOOL;
 VAR_INPUT
     TestName : Tc2_System.T_MaxString;
 END_VAR
diff --git a/TcUnit/TcUnit/POUs/Functions/RUN.TcPOU b/TcUnit/TcUnit/POUs/Functions/RUN.TcPOU
index 4bca1fc..22f5450 100644
--- a/TcUnit/TcUnit/POUs/Functions/RUN.TcPOU
+++ b/TcUnit/TcUnit/POUs/Functions/RUN.TcPOU
@@ -3,6 +3,7 @@
   <POU Name="RUN" Id="{bd49b256-e7ba-4b73-b669-380d1f428417}" SpecialFunc="None">
     <Declaration><![CDATA[(*
     This function runs all test suites that have been initialized.
+    The test suites are run in parallel (all at once).
 *)
 FUNCTION RUN]]></Declaration>
     <Implementation>
diff --git a/TcUnit/TcUnit/POUs/Functions/RUN_IN_SEQUENCE.TcPOU b/TcUnit/TcUnit/POUs/Functions/RUN_IN_SEQUENCE.TcPOU
new file mode 100644
index 0000000..2e89805
--- /dev/null
+++ b/TcUnit/TcUnit/POUs/Functions/RUN_IN_SEQUENCE.TcPOU
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
+  <POU Name="RUN_IN_SEQUENCE" Id="{a1bb30cd-f92f-4bab-aa26-6bd18db0fbc1}" SpecialFunc="None">
+    <Declaration><![CDATA[(*
+    This function runs all test suites that have been initialized.
+    The test suites are run in sequence (one after the other).
+*)
+FUNCTION RUN_IN_SEQUENCE]]></Declaration>
+    <Implementation>
+      <ST><![CDATA[GVL_TcUnit.TcUnitRunner.RunTestSuiteTestsInSequence();]]></ST>
+    </Implementation>
+  </POU>
+</TcPlcObject>
\ No newline at end of file
diff --git a/TcUnit/TcUnit/TcUnit.plcproj b/TcUnit/TcUnit/TcUnit.plcproj
index a11152d..b16a115 100644
--- a/TcUnit/TcUnit/TcUnit.plcproj
+++ b/TcUnit/TcUnit/TcUnit.plcproj
@@ -32,7 +32,7 @@ Documentation and examples are available at www.tcunit.org</Description>
     </SelectedLibraryCategories>
     <Company>www.tcunit.org</Company>
     <Author>Jakob Sagatowski and contributors</Author>
-    <ProjectVersion>1.1.0.0</ProjectVersion>
+    <ProjectVersion>1.2.0.0</ProjectVersion>
     <!--    <OutputType>Exe</OutputType>
     <RootNamespace>MyApplication</RootNamespace>
     <AssemblyName>MyApplication</AssemblyName>-->
@@ -163,6 +163,9 @@ Documentation and examples are available at www.tcunit.org</Description>
     <Compile Include="POUs\Functions\RUN.TcPOU">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="POUs\Functions\RUN_IN_SEQUENCE.TcPOU">
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Include="POUs\Functions\TEST.TcPOU">
       <SubType>Code</SubType>
     </Compile>
diff --git a/TcUnit/TcUnit/Version/Global_Version.TcGVL b/TcUnit/TcUnit/Version/Global_Version.TcGVL
index 53c0953..acbed66 100644
--- a/TcUnit/TcUnit/Version/Global_Version.TcGVL
+++ b/TcUnit/TcUnit/Version/Global_Version.TcGVL
@@ -7,7 +7,7 @@
 // This function has been automatically generated from the project information.
 VAR_GLOBAL CONSTANT
 	{attribute 'const_non_replaced'}
-	stLibVersion_TcUnit : ST_LibVersion := (iMajor := 1, iMinor := 1, iBuild := 0, iRevision := 0, sVersion := '1.1.0.0');
+	stLibVersion_TcUnit : ST_LibVersion := (iMajor := 1, iMinor := 2, iBuild := 0, iRevision := 0, sVersion := '1.2.0.0');
 END_VAR
 ]]></Declaration>
   </GVL>
diff --git a/TcUnit/_Config/PLC/TcUnit.xti b/TcUnit/_Config/PLC/TcUnit.xti
index ae2318b..d1f2e81 100644
--- a/TcUnit/_Config/PLC/TcUnit.xti
+++ b/TcUnit/_Config/PLC/TcUnit.xti
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.14" ClassName="CNestedPlcProjDef">
+<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmItem" TcSmVersion="1.0" TcVersion="3.1.4022.32" ClassName="CNestedPlcProjDef">
 	<Project GUID="{BC994085-3B01-480D-AB11-95935FC773EE}" Name="TcUnit" PrjFilePath="..\..\TcUnit\TcUnit.plcproj" TmcFilePath="..\..\TcUnit\TcUnit.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e" SymbolicMapping="true">
-		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcUnit\TcUnit.tmc">
 			<Name>TcUnit Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 		</Instance>