Diff of /trunk/coUnit/coUnit/Unit Test Framework for CODESYS/POUs/FB_coUnitRunner/RunTestSuiteTests/svnobj [r447] .. [r448]  Maximize  Restore

Switch to side-by-side view

--- a/trunk/coUnit/coUnit/Unit Test Framework for CODESYS/POUs/FB_coUnitRunner/RunTestSuiteTests/svnobj
+++ b/trunk/coUnit/coUnit/Unit Test Framework for CODESYS/POUs/FB_coUnitRunner/RunTestSuiteTests/svnobj
@@ -1,5 +1,5 @@
-Gx_l!0…jüo™Æ*ê^YMÓq%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 coUnit test suites *)BIF NOT AllTestSuitesFinished THENp    IF GVL_coUnit.NumberOfInitializedTestSuites = 0 THENL        AllTestSuitesFinished := TRUE;v    ELSIF GVL_coUnit.NumberOfInitializedTestSuites > 0 THEN˜        FOR Counter := 1 TO GVL_coUnit.NumberOfInitializedTestSuites BY 1 DO¢            IF GVL_coUnit.TestSuiteAddresses[Counter]^.AreAllTestsFinished() THENš                NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;             ELSEÂ                GVL_coUnit.CurrentTestSuiteBeingCalled := GVL_coUnit.TestSuiteAddresses[Counter];ž                GVL_coUnit.CurrentTestSuiteBeingCalled^.SetHasStartedRunning();t                GVL_coUnit.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_coUnit.NumberOfInitializedTestSuites;         END_IF!ª        IF NumberOfTestSuitesFinished = GVL_coUnit.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_coUnit.AdsMessageQueue();-Interface.L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}/BMETHOD INTERNAL RunTestSuiteTests0VAR10    Counter : UINT := 0;20    BusyPrinting : BOOL;3Þ    (* We need to hold a temporary state of the statistics (failed, successful, total number of test cases etc)4Þ       as we don't consider the tests to be completely finished until all test suites have executed completely.5è       The reason we want to do it this way is because a test suite can run over several cycles. Only once all tests6¬       are finished (which might take many cycles), do we gather correct statistics *)7V    NumberOfTestSuitesFinished : UINT := 0;8END_VARÐÐÐE#ÐÐ	
+Gx_lf!0…jüoøVâi)‡'­•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 coUnit test suites *)BIF NOT AllTestSuitesFinished THENp    IF GVL_coUnit.NumberOfInitializedTestSuites = 0 THENL        AllTestSuitesFinished := TRUE;v    ELSIF GVL_coUnit.NumberOfInitializedTestSuites > 0 THEN˜        FOR Counter := 1 TO GVL_coUnit.NumberOfInitializedTestSuites BY 1 DO¢            IF GVL_coUnit.TestSuiteAddresses[Counter]^.AreAllTestsFinished() THENš                NumberOfTestSuitesFinished := NumberOfTestSuitesFinished + 1;             ELSEÂ                GVL_coUnit.CurrentTestSuiteBeingCalled := GVL_coUnit.TestSuiteAddresses[Counter];ž                GVL_coUnit.CurrentTestSuiteBeingCalled^.SetHasStartedRunning();t                GVL_coUnit.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_coUnit.NumberOfInitializedTestSuites;         END_IF!ª        IF NumberOfTestSuitesFinished = GVL_coUnit.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();+Interface,L{a9ed5b7e-75c5-4651-af16-d2c27e98cb94}-BMETHOD INTERNAL RunTestSuiteTests.VAR/0    Counter : UINT := 0;00    BusyPrinting : BOOL;1Þ    (* We need to hold a temporary state of the statistics (failed, successful, total number of test cases etc)2Þ       as we don't consider the tests to be completely finished until all test suites have executed completely.3è       The reason we want to do it this way is because a test suite can run over several cycles. Only once all tests4¬       are finished (which might take many cycles), do we gather correct statistics *)5V    NumberOfTestSuitesFinished : UINT := 0;6END_VARÐÐÐE!ÐÐ	
 ­[ÚÐ-
ÐÐ	
 ­\ÚÐ-ÐÐ	
 ­]ÚÐ-ÐÐ	
@@ -32,17 +32,15 @@
 ­xÚÐ-'ÐÐ	
 ­yÚÐ-(ÐÐ	
 ­zÚÐ-)ÐÐ	
-­{ÚÐ-*ÐÐ	
-­|ÚÐ-+ÐÐ	
-­qÚÐ-,Ð-.ÐE
+­{ÚÐ-*Ð+,ÐE
 ÐÐ	
-­RÚÐ-/ÐÐ	
-­SÚÐ-0ÐÐ	
-­TÚÐ-1ÐÐ	
-­UÚÐ-2ÐÐ	
-­VÚÐ-3ÐÐ	
-­WÚÐ-4ÐÐ	
-­XÚÐ-5ÐÐ	
-­YÚÐ-6ÐÐ	
-­ZÚÐ-7ÐÐ	
-­ÚÐ-8
\ No newline at end of file
+­RÚÐ--ÐÐ	
+­SÚÐ-.ÐÐ	
+­TÚÐ-/ÐÐ	
+­UÚÐ-0ÐÐ	
+­VÚÐ-1ÐÐ	
+­WÚÐ-2ÐÐ	
+­XÚÐ-3ÐÐ	
+­YÚÐ-4ÐÐ	
+­ZÚÐ-5ÐÐ	
+­ÚÐ-6
\ No newline at end of file