Skip to content

Commit 8c0589b

Browse files
committed
fix: reverted xti to 4022.32 format
1 parent 14ec70a commit 8c0589b

3 files changed

Lines changed: 4 additions & 28 deletions

File tree

TcUnit/TcUnit/POUs/FB_TestSuite.TcPOU

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3832,7 +3832,7 @@ END_VAR]]></Declaration>
38323832
NumberOfTestsToAnalyse := GetNumberOfTestsToAnalyse();
38333833
FOR IteratorCounter := 1 TO NumberOfTestsToAnalyse BY 1 DO
38343834
IF Tests[IteratorCounter].GetName() = TestName THEN
3835-
Tests[IteratorCounter].SetFinished(FinishedAt := FinishedAt);
3835+
Tests[IteratorCounter].SetFinished(FinishedAt := FinishedAt);
38363836
SetTestFinished := TRUE;
38373837
RETURN;
38383838
END_IF

TcUnit/TcUnit/POUs/Functions/TEST_FINISHED_NAMED.TcPOU

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,22 @@
22
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4022.18">
33
<POU Name="TEST_FINISHED_NAMED" Id="{7a3926c3-51ee-4f1e-953f-089cfa833d72}" SpecialFunc="None">
44
<Declaration><![CDATA[(* Sets a test defined by TestName as finished. Note that the TestName-input must match
5-
65
a TestName that has been previously defined in this test suite. *)
7-
86
FUNCTION TEST_FINISHED_NAMED
9-
107
VAR_INPUT
11-
128
TestName : Tc2_System.T_MaxString;
13-
149
END_VAR
15-
1610
VAR
17-
1811
Counter : UINT := 0;
19-
2012
FoundTestName : BOOL := FALSE;
21-
2213
FinishedAt : UDINT;
23-
2414
END_VAR
25-
2615
VAR_STAT
27-
2816
FailedLookupCounter : UINT := 0;
29-
3017
AlreadyPrintedFinalWarning : BOOL := FALSE;
31-
3218
END_VAR
33-
3419
VAR CONSTANT
35-
3620
MaxNumberOfNonExistentTestNamesFailedLookups : UINT := 3;
37-
3821
END_VAR]]></Declaration>
3922
<Implementation>
4023
<ST><![CDATA[TestName := F_LTrim(in := F_RTrim(in := TestName));
@@ -44,7 +27,6 @@ GVL_TcUnit.GetCpuAccount(cpuAccountDW => FinishedAt);
4427
1. Set the test in that test suite as finished
4528
2. Calculate and set the number of asserts made for that test
4629
*)
47-
4830
FOR Counter := 1 TO GVL_TcUnit.NumberOfInitializedTestSuites BY 1 DO
4931
IF GVL_TcUnit.TestSuiteAddresses[Counter] = GVL_TcUnit.CurrentTestSuiteBeingCalled THEN
5032
FoundTestName := GVL_TcUnit.TestSuiteAddresses[Counter]^.SetTestFinished(TestName := TestName, FinishedAt := FinishedAt);
@@ -71,4 +53,4 @@ FOR Counter := 1 TO GVL_TcUnit.NumberOfInitializedTestSuites BY 1 DO
7153
END_FOR]]></ST>
7254
</Implementation>
7355
</POU>
74-
</TcPlcObject>
56+
</TcPlcObject>

TcUnit/_Config/PLC/TcUnit.xti

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
<?xml version="1.0"?>
2-
<TcSmItem xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.beckhoff.com/schemas/2012/07/TcSmProject" TcSmVersion="1.0" TcVersion="3.1.4024.22" ClassName="CNestedPlcProjDef">
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2+
<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">
33
<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">
44
<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="TcUnit\TcUnit.tmc">
55
<Name>TcUnit Instance</Name>
66
<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
7-
<Contexts>
8-
<Context>
9-
<Id>1</Id>
10-
<Name>Default</Name>
11-
</Context>
12-
</Contexts>
137
</Instance>
148
</Project>
159
</TcSmItem>

0 commit comments

Comments
 (0)