From e21ed02d0938a9214da8928bc35c6eb652e1884d Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 24 Mar 2015 13:17:44 +0000 Subject: [PATCH] * Patch from Graeme Geldenhuys to remove duplicate output strings git-svn-id: trunk@30308 - --- packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc | 4 ++-- packages/fcl-fpcunit/src/fpcunit.pp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc b/packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc index 69c507eaf3..6d01bd3012 100644 --- a/packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc +++ b/packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc @@ -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; diff --git a/packages/fcl-fpcunit/src/fpcunit.pp b/packages/fcl-fpcunit/src/fpcunit.pp index be42a788c5..463b5abd8b 100644 --- a/packages/fcl-fpcunit/src/fpcunit.pp +++ b/packages/fcl-fpcunit/src/fpcunit.pp @@ -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