Diff of /trunk/Library/POUs/FB_CfUnitRunner/RunTestSuiteTests/svnobj [r377] .. [r378]  Maximize  Restore

Switch to side-by-side view

--- a/trunk/Library/POUs/FB_CfUnitRunner/RunTestSuiteTests/svnobj
+++ b/trunk/Library/POUs/FB_CfUnitRunner/RunTestSuiteTests/svnobj
@@ -1,50 +1,48 @@
-Gx_l»!0…jüo
-óð%‰¨@×System.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
-longTagText
8(* Run TcUnit test suites *)BIF NOT AllTestSuitesFinished THENp    IF GVL_CfUnit.NumberOfInitializedTestSuites = 0 THENL        AllTestSuitesFinished := TRUE;v    ELSIF GVL_CfUnit.NumberOfInitializedTestSuites > 0 THEN˜        FOR Counter := 1 TO GVL_CfUnit.NumberOfInitializedTestSuites BY 1 DO¢            IF GVL_CfUnit.TestSuiteAddresses[Counter]^.AreAllTestsFinished() THENš                NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;             ELSEÂ                GVL_CfUnit.CurrentTestSuiteBeingCalled := GVL_CfUnit.TestSuiteAddresses[Counter];t                GVL_CfUnit.CurrentTestSuiteBeingCalled^();$            END_IF        END_FORÊ        (* 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. *)L        IF AbortRunningTestSuites THEN¦            NumberOfTestSuitesFinished := GVL_CfUnit.NumberOfInitializedTestSuites;		END_IFª        IF NumberOfTestSuitesFinished = GVL_CfUnit.NumberOfInitializedTestSuites THEN T            AllTestSuitesFinished := TRUE;!        END_IF"    END_IF#END_IF$%V(* Store test suite results continuously *)&TestResults();'R(* Log test suite results continuously *)(NTestResultLogger.LogTestSuiteResults();)`(* publish the xUnit Xml file once if enabled *)*ZXmlTestResultPublisher.LogTestSuiteResults();+B(* Run the buffered ADS logger *),>//GVL_CfUnit.AdsMessageQueue();-Interface.L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}/0METHOD RunTestSuiteTests0VAR10    Counter : UINT := 0;20    BusyPrinting : BOOL;3END_VAR4VAR_INST5Þ    (* We need to hold a temporary state of the statistics (failed, successful, total number of test cases etc)6Þ       as we don't consider the tests to be completely finished until all test suites have executed completely.7è       The reason we want to do it this way is because a test suite can run over several cycles. Only once all tests8¬       are finished (which might take many cycles), do we gather correct statistics *)9V    NumberOfTestSuitesFinished : UINT := 0;ÐÐÐE#ÐÐ	
-­„ÚÐ-
ÐÐ	
-­YÚÐ-ÐÐ	
-­ZÚÐ-ÐÐ	
-­[ÚÐ-ÐÐ	
-­\ÚÐ-ÐÐ	
-­]ÚÐ-ÐÐ	
-­…ÚÐ-ÐÐ	
-­†ÚÐ-ÐÐ	
-­‡ÚÐ-ÐÐ	
-­ˆÚÐ-ÐÐ	
-­‰ÚÐ-ÐÐ	
-­fÚÐ-ÐÐ	
-­gÚÐ-ÐÐ	
-­hÚÐ-ÐÐ	
-­iÚÐ-ÐÐ	
-­jÚÐ-ÐÐ	
-­kÚÐ-ÐÐ	
-­lÚÐ-ÐÐ	
-­mÚÐ-ÐÐ	
-­nÚÐ- ÐÐ	
-­oÚÐ-!ÐÐ	
-­pÚÐ-"ÐÐ	
-­MÚÐ-#ÐÐ	
-­NÚÐ-$ÐÐ	
-­ÚÐ-%ÐÐ	
-­€ÚÐ-&ÐÐ	
-­ÚÐ-$ÐÐ	
-­‚ÚÐ-'ÐÐ	
-­XÚÐ-(ÐÐ	
-­ŒÚÐ-$ÐÐ	
-­ŽÚÐ-)ÐÐ	
-­ƒÚÐ-*ÐÐ	
-­ÚÐ-$ÐÐ	
-­UÚÐ-+ÐÐ	
-­qÚÐ-,Ð-.ÐEÐÐ	
-­kÚÐ-/ÐÐ	
-­lÚÐ-0ÐÐ	
-­uÚÐ-1ÐÐ	
-­vÚÐ-2ÐÐ	
-­ŠÚÐ-3ÐÐ	
-­wÚÐ-4ÐÐ	
-­xÚÐ-5ÐÐ	
-­yÚÐ-6ÐÐ	
-­zÚÐ-7ÐÐ	
-­{ÚÐ-8ÐÐ	
-­wÚÐ-9ÐÐ	
-­ÚÐ-3+Gx_lg!0…jüoæ‰ÙÙ?Y׉þ¦System.StringL{f8a58466-d7f6-439f-bbb8-d4600e41d099}ImplementationL{3b83b776-fb25-43b8-99f2-3c507c9143fc}TextDocumentL{f3878285-8e4f-490b-bb1b-9acbb7eb04db}TextLinesL{a5de0b0b-1cb5-4913-ac21-9d70293ec00d}	Id
+longTagText
8(* Run CfUnit test suites *)BIF NOT AllTestSuitesFinished THENp    IF GVL_CfUnit.NumberOfInitializedTestSuites = 0 THENL        AllTestSuitesFinished := TRUE;v    ELSIF GVL_CfUnit.NumberOfInitializedTestSuites > 0 THEN˜        FOR Counter := 1 TO GVL_CfUnit.NumberOfInitializedTestSuites BY 1 DO¢            IF GVL_CfUnit.TestSuiteAddresses[Counter]^.AreAllTestsFinished() THENš                NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;             ELSEÂ                GVL_CfUnit.CurrentTestSuiteBeingCalled := GVL_CfUnit.TestSuiteAddresses[Counter];t                GVL_CfUnit.CurrentTestSuiteBeingCalled^();$            END_IF        END_FORÊ        (* 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. *)L        IF AbortRunningTestSuites THEN¦            NumberOfTestSuitesFinished := GVL_CfUnit.NumberOfInitializedTestSuites;        END_IFª        IF NumberOfTestSuitesFinished = GVL_CfUnit.NumberOfInitializedTestSuites THEN T            AllTestSuitesFinished := TRUE;!    END_IF"END_IF#$V(* Store test suite results continuously *)%TestResults();&R(* Log test suite results continuously *)'NTestResultLogger.LogTestSuiteResults();(`(* publish the xUnit Xml file once if enabled *))ZXmlTestResultPublisher.LogTestSuiteResults();*B(* Run the buffered ADS logger *)+>//GVL_CfUnit.AdsMessageQueue();,Interface-L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}.0METHOD RunTestSuiteTests/VAR00    Counter : UINT := 0;10    BusyPrinting : BOOL;2Þ    (* We need to hold a temporary state of the statistics (failed, successful, total number of test cases etc)3Þ       as we don't consider the tests to be completely finished until all test suites have executed completely.4è       The reason we want to do it this way is because a test suite can run over several cycles. Only once all tests5¬       are finished (which might take many cycles), do we gather correct statistics *)6V    NumberOfTestSuitesFinished : UINT := 0;7END_VARÐÐÐE#ÐÐ	
+­ÚÐ-
ÐÐ	
+­ÚÐ-ÐÐ	
+­‘ÚÐ-ÐÐ	
+­’ÚÐ-ÐÐ	
+­“ÚÐ-ÐÐ	
+­”ÚÐ-ÐÐ	
+­•ÚÐ-ÐÐ	
+­–ÚÐ-ÐÐ	
+­—ÚÐ-ÐÐ	
+­˜ÚÐ-ÐÐ	
+­™ÚÐ-ÐÐ	
+­šÚÐ-ÐÐ	
+­›ÚÐ-ÐÐ	
+­œÚÐ-ÐÐ	
+­ÚÐ-ÐÐ	
+­žÚÐ-ÐÐ	
+­ŸÚÐ-ÐÐ	
+­ ÚÐ-ÐÐ	
+­¡ÚÐ-ÐÐ	
+­¢ÚÐ- ÐÐ	
+­£ÚÐ-ÐÐ	
+­¤ÚÐ-!ÐÐ	
+­MÚÐ-"ÐÐ	
+­NÚÐ-#ÐÐ	
+­ÚÐ-$ÐÐ	
+­€ÚÐ-%ÐÐ	
+­ÚÐ-#ÐÐ	
+­‚ÚÐ-&ÐÐ	
+­XÚÐ-'ÐÐ	
+­ŒÚÐ-#ÐÐ	
+­ŽÚÐ-(ÐÐ	
+­ƒÚÐ-)ÐÐ	
+­ÚÐ-#ÐÐ	
+­UÚÐ-*ÐÐ	
+­qÚÐ-+Ð,-ÐE
+ÐÐ	
+­kÚÐ-.ÐÐ	
+­lÚÐ-/ÐÐ	
+­uÚÐ-0ÐÐ	
+­vÚÐ-1ÐÐ	
+­xÚÐ-2ÐÐ	
+­yÚÐ-3ÐÐ	
+­zÚÐ-4ÐÐ	
+­{ÚÐ-5ÐÐ	
+­wÚÐ-6ÐÐ	
+­ÚÐ-7