Skip to content

54 bug update comprehensive result overwrites failure description instead of accumulating it upd #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbarancek merged 3 commits into from
Jun 12, 2026
Merged

54 bug update comprehensive result overwrites failure description instead of accumulating it upd #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea1a6b8
accumulation results in groups
peterbarancek Jun 12, 2026
e69f56e
Merge branch '54-_BUG_UpdateComprehensiveResult_overwrites_failure_de…
peterbarancek Jun 12, 2026
786912a
Merge branch 'dev' into 54-_BUG_UpdateComprehensiveResult_overwrites_…
peterbarancek Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspectionGroup/TcoInspectionGroup.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,24 +540,18 @@ CASE _currentRunResult.Result OF
eOverallResult.Passed:
;
eOverallResult.Failed:
_refOverallResult:=_originalOverallResult;

_refOverallResult.Result := eOverallResult.Failed;
IF _refOverallResult.Failures<>'' THEN
_refOverallResult.Failures := concat(concat(_originalOverallResult.Failures,';'), _currentRunResult.Failures);
ELSE
_refOverallResult.Failures := _currentRunResult.Failures;
END_IF;

IF _refOverallResult.ErrorCodes<>'' THEN
_refOverallResult.ErrorCodes := concat(concat(_originalOverallResult.ErrorCodes,';'),_currentRunResult.ErrorCodes);
ELSE
_refOverallResult.ErrorCodes := _currentRunResult.ErrorCodes;
END_IF;
_refOverallResult.Failures := _currentRunResult.Failures;
_refOverallResult.ErrorCodes := _currentRunResult.ErrorCodes;
END_CASE


IF(_done) THEN
_refOverallResult.Failures :=concat( _originalOverallResult.Failures,_refOverallResult.Failures);
_refOverallResult.ErrorCodes :=concat( _originalOverallResult.ErrorCodes,_refOverallResult.ErrorCodes);
Comment on lines +551 to +552
_overallResult := _refOverallResult;

END_IF;
]]></ST>
</Implementation>
Expand All @@ -571,9 +565,7 @@ END_IF;
</docu>
~*)
METHOD PROTECTED UpdateDescriptions
VAR_INPUT
inOriginalResult:TcoComprehensiveResult;;
END_VAR

VAR_IN_OUT
inoResult : TcoComprehensiveResult;
END_VAR
Expand All @@ -584,13 +576,13 @@ END_VAR
END_IF
IF(_done AND NOT _done_PV) THEN
inoResult.Failures := THIS^.Context.Environment.Messaging.StringBuilder.Clear()
.Append(inOriginalResult.Failures)
.Append(inoResult.Failures)
.Append(CommonData.FailureDescription)
.Append(';')
.ToString();

inoResult.ErrorCodes := THIS^.Context.Environment.Messaging.StringBuilder.Clear()
.Append(inOriginalResult.ErrorCodes)
.Append(inoResult.ErrorCodes)
.Append(CommonData.ErrorCode)
.Append(';')
.ToString();
Expand Down
20 changes: 10 additions & 10 deletions src/TcoInspectors/src/XAE/XAE/TcoInspectors/POUs/TcoInspector/TcoInspector.TcPOU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,18 +652,20 @@ CASE _inspectorTask.InspectionData.Result OF
eInspectorResult.Passed:
;
eInspectorResult.Failed:
_refOverallResult:=_originalOverallResult;
_refOverallResult.Result := eOverallResult.Failed;
UpdateDescriptions(_originalOverallResult,inoResult);
UpdateDescriptions(inoResult);
eInspectorResult.Inconclusive:
_refOverallResult:=_originalOverallResult;
_refOverallResult.Result := eOverallResult.Failed;
UpdateDescriptions(_originalOverallResult,inoResult);
UpdateDescriptions(inoResult);
eInspectorResult.Excluded:
;
eInspectorResult.Bypassed:
;
END_CASE]]></ST>
END_CASE



]]></ST>
</Implementation>
</Method>
<Method Name="UpdateDescriptions" Id="{5bf8bf48-85f6-0716-2800-f1811bbbe4d3}">
Expand All @@ -675,23 +677,21 @@ END_CASE]]></ST>
</docu>
~*)
METHOD PROTECTED UpdateDescriptions
VAR_INPUT
inOriginalResult:TcoComprehensiveResult;;
END_VAR

VAR_IN_OUT
inoResult : TcoComprehensiveResult;
END_VAR
]]></Declaration>
<Implementation>
<ST><![CDATA[IF(_inspectorTask.OnDoneFlag) THEN
inoResult.Failures := THIS^.Context.Environment.Messaging.StringBuilder.Clear()
.Append(inOriginalResult.Failures)
.Append(inoResult.Failures)
.Append(_inspectorTask.InspectionData.FailureDescription)
.Append(';')
.ToString();

inoResult.ErrorCodes := THIS^.Context.Environment.Messaging.StringBuilder.Clear()
.Append(inOriginalResult.ErrorCodes)
.Append(inoResult.ErrorCodes)
.Append(_inspectorTask.InspectionData.ErrorCode)
.Append(';')
.ToString();
Expand Down
Loading