diff options
| author | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-03-24 13:17:44 +0000 |
|---|---|---|
| committer | michael <michael@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-03-24 13:17:44 +0000 |
| commit | a33f4cbc02a56301e7f479fd2fedb2094e2d9346 (patch) | |
| tree | beae1094568285bf1a605d1ff3d3d2d4ceb5f78c /packages/fcl-fpcunit/src | |
| parent | 9ea967529ed99edb994099cb03bfaa93bb09d276 (diff) | |
| download | fpc-a33f4cbc02a56301e7f479fd2fedb2094e2d9346.tar.gz | |
* Patch from Graeme Geldenhuys to remove duplicate output strings
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@30308 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fcl-fpcunit/src')
| -rw-r--r-- | packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc | 4 | ||||
| -rw-r--r-- | 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 |