Skip to content

XML Escape the report output #3

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

Open
ammoniak wants to merge 1 commit into
base: 26-0-package-manager
Choose a base branch
from
Open

XML Escape the report output #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 19 additions & 7 deletions DFUnit/AppSrc/DFUnit/Reporting/Reporters/XMLReporter.pkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ Use DFUNit\Results\ResultCollector.pkg

Define XML_NEWLINE_REPLACE for "
"

{ Visibility=Private }
Function DFUnit_XmlEscape Global String sText Returns String
// Escape XML metacharacters so test names and messages stay well-formed
// inside double-quoted attributes. '&' MUST be replaced first, otherwise the
// ampersands in the entities it produces would be escaped again.
Move (Replaces("&", sText, "&")) to sText
Move (Replaces("<", sText, "&lt;")) to sText
Move (Replaces(">", sText, "&gt;")) to sText
Move (Replaces('"', sText, "&quot;")) to sText
Function_Return sText
End_Function

Class cDFUnitXMLReporter is a cDFUnitResultCollector_Mixin

Procedure Construct_Object
Expand Down Expand Up @@ -35,7 +47,7 @@ Class cDFUnitXMLReporter is a cDFUnitResultCollector_Mixin
Move ('time="' + String(SpanTotalSeconds(tsTook)) + "." + String(SpanMilliseconds(tsTook)) + '"') to sTime
End

Send Write (SFormat('<testcase name="%1" assertions="%2" %3>', TestName(oTestResult.hTest), oTestResult.ulFailedAssertions + oTestResult.ulSucceededAssertions, Replaces(",", sTime, ".")))
Send Write (SFormat('<testcase name="%1" assertions="%2" %3>', DFUnit_XmlEscape(TestName(oTestResult.hTest)), oTestResult.ulFailedAssertions + oTestResult.ulSucceededAssertions, Replaces(",", sTime, ".")))

Move (SizeOfArray(oTestResult.aErrors) - 1) to iMaxIndex
For iIterator from 0 to iMaxIndex
Expand All @@ -50,9 +62,9 @@ Class cDFUnitXMLReporter is a cDFUnitResultCollector_Mixin
Move (Append(sMessage, (SFormat("Line: %1." + XML_NEWLINE_REPLACE, oTestResult.aErrors[iIterator].iErrLine)))) to sMessage
Move (Append(sMessage, (SFormat("Error Nr: %1." + XML_NEWLINE_REPLACE, oTestResult.aErrors[iIterator].iErrorCode)))) to sMessage
Move (Append(sMessage, "Error Message:" + XML_NEWLINE_REPLACE)) to sMessage
Move (Append(sMessage, ("'" + oTestResult.aErrors[iIterator].sErrText + "'." + XML_NEWLINE_REPLACE))) to sMessage
Move (Append(sMessage, ("'" + DFUnit_XmlEscape(oTestResult.aErrors[iIterator].sErrText) + "'." + XML_NEWLINE_REPLACE))) to sMessage
Move (Append(sMessage, "CallStack:" + XML_NEWLINE_REPLACE)) to sMessage
Move (Append(sMessage, oTestResult.aErrors[iIterator].sCallStack)) to sMessage
Move (Append(sMessage, DFUnit_XmlEscape(oTestResult.aErrors[iIterator].sCallStack))) to sMessage

Move (Replaces("\n", sMessage, XML_NEWLINE_REPLACE)) to sMessage
Move (Replaces("\r\n", sMessage, XML_NEWLINE_REPLACE)) to sMessage
Expand All @@ -63,12 +75,12 @@ Class cDFUnitXMLReporter is a cDFUnitResultCollector_Mixin

Move (SizeOfArray(oTestResult.aFailedAssertions) - 1) to iMaxIndex
For iIterator from 0 to iMaxIndex
Move (oTestResult.aFailedAssertions[iMaxIndex].sAssertMessage + XML_NEWLINE_REPLACE) to sMessage
Move (DFUnit_XmlEscape(oTestResult.aFailedAssertions[iIterator].sAssertMessage) + XML_NEWLINE_REPLACE) to sMessage

Move oTestResult.aFailedAssertions[iIterator].asMessages to asMessages
Move (SizeOfArray(asMessages) - 1) to iMaxMessageIndex
For iMessageIterator from 0 to iMaxMessageIndex
Move (Append(sMessage, asMessages[iMessageIterator] + XML_NEWLINE_REPLACE)) to sMessage
Move (Append(sMessage, DFUnit_XmlEscape(asMessages[iMessageIterator]) + XML_NEWLINE_REPLACE)) to sMessage
Loop

Move (Replaces("\n", sMessage, XML_NEWLINE_REPLACE)) to sMessage
Expand All @@ -88,7 +100,7 @@ Class cDFUnitXMLReporter is a cDFUnitResultCollector_Mixin
Get ResultOfFixture hFixture to oFixtureResult

Get FixtureName of hFixture to sFixtureName
Send Write (SFormat('<testsuite name="%1" errors="%2" failures="%3">', sFixtureName, oFixtureResult.ulTotalErrors, oFixtureResult.ulTotalFailedAssertions))
Send Write (SFormat('<testsuite name="%1" errors="%2" failures="%3">', DFUnit_XmlEscape(sFixtureName), oFixtureResult.ulTotalErrors, oFixtureResult.ulTotalFailedAssertions))

Integer iIterator iMaxIndex
Move (SizeOfArray(oFixtureResult.ahChildFixtures) - 1) to iMaxIndex
Expand Down