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

* Merging revisions r42191,r42192 from trunk:

Browse Source 
------------------------------------------------------------------------
    r42191 | michael | 2019-06-08 16:41:09 +0200 (Sat, 08 Jun 2019) | 1 line
    
    * Unicode string assertequal
    ------------------------------------------------------------------------
    r42192 | michael | 2019-06-08 16:43:39 +0200 (Sat, 08 Jun 2019) | 1 line
    
    * Unicode string assertequal (removed doubles)
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@42430 -
This commit is contained in:
michael 2019-07-13 13:34:16 +00:00
parent 93ebf5468f
commit 38ab3a3b8a
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,10 +100,8 @@ type
class procedure AssertFalse(ACondition: boolean); overload; class procedure AssertFalse(ACondition: boolean); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual: string); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: string); overload;
class procedure AssertEquals(Expected, Actual: string); overload; class procedure AssertEquals(Expected, Actual: string); overload;
{$IFDEF UNICODE}
class procedure AssertEquals(const AMessage: string; Expected, Actual: UnicodeString); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: UnicodeString); overload;
class procedure AssertEquals(Expected, Actual: UnicodeString); overload; class procedure AssertEquals(Expected, Actual: UnicodeString); overload;
{$ENDIF}
class procedure AssertEquals(const AMessage: string; Expected, Actual: integer); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: integer); overload;
class procedure AssertEquals(Expected, Actual: integer); overload; class procedure AssertEquals(Expected, Actual: integer); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual: int64); overload; class procedure AssertEquals(const AMessage: string; Expected, Actual: int64); overload;
@ -334,9 +332,7 @@ type
end; end;
function ComparisonMsg(const aExpected: string; const aActual: string; const aCheckEqual: boolean=true): string; overload; function ComparisonMsg(const aExpected: string; const aActual: string; const aCheckEqual: boolean=true): string; overload;
{$IFDEF UNICODE} function ComparisonMsg(const aExpected: UnicodeString; const aActual: UnicodeString; const aCheckEqual: boolean=true): Unicodestring; overload;
function ComparisonMsg(const aExpected: UnicodeString; const aActual: UnicodeString; const aCheckEqual: boolean=true): string; overload;
{$ENDIF}
function ComparisonMsg(const aMsg: string; const aExpected: string; const aActual: string; const aCheckEqual: boolean=true): string; overload; function ComparisonMsg(const aMsg: string; const aExpected: string; const aActual: string; const aCheckEqual: boolean=true): string; overload;
// Made public for 3rd party developers extending TTestCase with new AssertXXX methods // Made public for 3rd party developers extending TTestCase with new AssertXXX methods
@ -440,16 +436,15 @@ begin
Result := format(SCompareNotEqual, [aExpected, aActual]); Result := format(SCompareNotEqual, [aExpected, aActual]);
end; end;
{$IFDEF UNICODE} function ComparisonMsg(const aExpected: Unicodestring; const aActual: Unicodestring; const aCheckEqual: boolean=true): Unicodestring;
function ComparisonMsg(const aExpected: UnicodeString; const aActual: UnicodeString; const aCheckEqual: boolean=true): string;
// aCheckEqual=false gives the error message if the test does *not* expect the results to be the same. // aCheckEqual=false gives the error message if the test does *not* expect the results to be the same.
begin begin
if aCheckEqual then if aCheckEqual then
Result := format(UnicodeString(SCompare), [aExpected, aActual]) Result := unicodeformat(SCompare, [aExpected, aActual])
else {check unequal requires opposite error message} else {check unequal requires opposite error message}
Result := format(UnicodeString(SCompareNotEqual), [aExpected, aActual]); Result := unicodeformat(SCompareNotEqual, [aExpected, aActual]);
end; end;
{$ENDIF}
function ComparisonMsg(const aMsg: string; const aExpected: string; const aActual: string; const aCheckEqual: boolean): string; function ComparisonMsg(const aMsg: string; const aExpected: string; const aActual: string; const aCheckEqual: boolean): string;
begin begin
@ -700,18 +695,18 @@ begin
AssertTrue(ComparisonMsg(Expected, Actual), Expected=Actual,CallerAddr); AssertTrue(ComparisonMsg(Expected, Actual), Expected=Actual,CallerAddr);
end; end;
{$IFDEF UNICODE} class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual: Unicodestring);
class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual: UnicodeString);
begin begin
AssertTrue(ComparisonMsg(AMessage,Expected, Actual), (Expected=Actual),CallerAddr); AssertTrue(ComparisonMsg(AMessage ,Expected, Actual), Expected=Actual,CallerAddr);
end; end;
class procedure TAssert.AssertEquals(Expected, Actual: UnicodeString); class procedure TAssert.AssertEquals(Expected, Actual: Unicodestring);
begin begin
AssertTrue(ComparisonMsg(Expected, Actual), (Expected=Actual),CallerAddr); AssertTrue(ComparisonMsg(Expected, Actual), Expected=Actual,CallerAddr);
end; end;
{$ENDIF}
class procedure TAssert.AssertNotNull(const AString: string); class procedure TAssert.AssertNotNull(const AString: string);
begin begin