paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-11 07:50:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug ID #34076 using provided patch: Add QWord overloads to Assert/CheckEquals

Browse Source 
git-svn-id: trunk@39545 -
This commit is contained in:
michael 2018-08-02 06:03:42 +00:00
parent dcf685b835
commit ddb6741c6c
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,11 +10,15 @@
class procedure CheckEquals(expected, actual: integer; msg: string = ''); overload;
class procedure CheckEquals(expected, actual: boolean; msg: string = ''); overload;
class procedure CheckEquals(expected, actual: TClass; msg: string = ''); overload;
class procedure CheckEquals(expected, actual: int64; msg: string = ''); overload;
class procedure CheckEquals(expected, actual: QWord; msg: string = ''); overload;
class procedure CheckNotEquals(expected, actual: string; msg: string = ''); overload;
class procedure CheckNotEquals(expected, actual: unicodestring; msg: string = ''); overload;
class procedure CheckNotEquals(expected, actual: integer; msg: string = ''); overload; virtual;
class procedure CheckNotEquals(expected, actual: boolean; msg: string = ''); overload; virtual;
class procedure CheckNotEquals(expected: extended; actual: extended; delta: extended = 0; msg: string = ''); overload; virtual;
class procedure CheckNotEquals(expected, actual: int64; msg: string = ''); overload; virtual;
class procedure CheckNotEquals(expected, actual: QWord; msg: string = ''); overload; virtual;
class procedure CheckNull(obj: IUnknown; msg: string = ''); overload;
class procedure CheckNull(obj: TObject; msg: string = ''); overload;
class procedure CheckNotNull(obj: TObject; msg: string = ''); overload;
@ -87,6 +91,18 @@ begin
AssertEquals(msg, expected, actual);
end;
class procedure TAssert.CheckEquals(expected, actual: QWord;
msg: string);
begin
AssertEquals(msg, expected, actual);
end;
class procedure TAssert.CheckEquals(expected, actual: int64;
msg: string);
begin
AssertEquals(msg, expected, actual);
end;
class procedure TAssert.CheckNotEquals(expected, actual: string; msg: string);
begin
if AnsiCompareStr(Expected, Actual) = 0 then
@ -128,6 +144,24 @@ begin
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected, actual: QWord;
msg: string);
begin
if (expected = actual) then
Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected, actual: int64;
msg: string);
begin
if (expected = actual) then
Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNull(obj: IUnknown; msg: string);
begin
AssertNullIntf(msg, obj);

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

@ -108,6 +108,8 @@ type
class procedure AssertEquals(Expected, Actual: integer); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual: int64); overload;
class procedure AssertEquals(Expected, Actual: int64); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual: QWord); overload;
class procedure AssertEquals(Expected, Actual: QWord); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual: currency); overload;
class procedure AssertEquals(Expected, Actual: currency); overload;
class procedure AssertEquals(const AMessage: string; Expected, Actual, Delta: double); overload;
@ -741,6 +743,18 @@ begin
end;
class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual: QWord);
begin
AssertTrue(ComparisonMsg(AMessage,IntToStr(Expected), IntToStr(Actual)), Expected = Actual,CallerAddr);
end;
class procedure TAssert.AssertEquals(Expected, Actual: QWord);
begin
AssertTrue(ComparisonMsg(IntToStr(Expected), IntToStr(Actual)), Expected = Actual,CallerAddr);
end;
class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual: currency);
begin
AssertTrue(ComparisonMsg(AMessage,FloatToStr(Expected), FloatToStr(Actual)), Expected = Actual,CallerAddr);