paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-17 05:39:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from Graeme Geldenhuys to remove duplicate output strings

Browse Source 
git-svn-id: trunk@30308 -
This commit is contained in:
michael 2015-03-24 13:17:44 +00:00
parent d9a205de45
commit e21ed02d09
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc
View File

@ -181,9 +181,9 @@ class function TAssert.EqualsErrorMessage(const expected, actual: string;
const ErrorMsg: string): string;
begin
if (ErrorMsg <> '') then
Result := Format(sMsgActualEqualsExpFmt, [ErrorMsg + ', ', expected, actual])
Result := Format(sExpectedButWasAndMessageFmt, [ErrorMsg + ', ', expected, actual])
else
Result := Format(sActualEqualsExpFmt, [expected, actual])
Result := Format(sExpectedButWasFmt, [expected, actual])
end;
class function TAssert.NotEqualsErrorMessage(const expected, actual: string;

2
packages/fcl-fpcunit/src/fpcunit.pp
View File

@ -315,8 +315,6 @@ uses
Const
sExpectedButWasFmt = 'Expected:' + LineEnding + '"%s"' + LineEnding + 'But was:' + LineEnding + '"%s"';
sExpectedButWasAndMessageFmt = '%s' + LineEnding + sExpectedButWasFmt;
sMsgActualEqualsExpFmt = '%s' + LineEnding + 'Expected ' + LineEnding + '< %s > ' + LineEnding + 'equals actual ' + LineEnding + '< %s >';
sActualEqualsExpFmt = 'Expected ' + LineEnding + '< %s > ' + LineEnding + 'equals actual ' + LineEnding + '< %s >';
{ This lets us use a single include file for both the Interface and