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

* Fix bug ID #34075 using provided patch: some methods not updating assert call count.

Browse Source 
git-svn-id: trunk@39544 -
This commit is contained in:
michael 2018-08-02 05:59:20 +00:00
parent ac48cd1343
commit dcf685b835
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,32 +90,42 @@ end;
class procedure TAssert.CheckNotEquals(expected, actual: string; msg: string);
begin
if AnsiCompareStr(Expected, Actual) = 0 then
Fail(msg + ComparisonMsg(Expected, Actual, false));
Fail(msg + ComparisonMsg(Expected, Actual, false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected, actual: unicodestring; msg: string);
begin
if (Expected=Actual) then
Fail(msg + ComparisonMsg(Expected, Actual, false));
Fail(msg + ComparisonMsg(Expected, Actual, false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected, actual: integer; msg: string);
begin
if (expected = actual) then
Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false));
Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected, actual: boolean; msg: string);
begin
if (expected = actual) then
Fail(msg + ComparisonMsg(BoolToStr(expected), BoolToStr(actual), false));
Fail(msg + ComparisonMsg(BoolToStr(expected), BoolToStr(actual), false))
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNotEquals(expected: extended; actual: extended;
delta: extended; msg: string);
begin
if (abs(expected-actual) <= delta) then
FailNotEquals(FloatToStr(expected), FloatToStr(actual), msg, nil);
FailNotEquals(FloatToStr(expected), FloatToStr(actual), msg, nil)
else
Inc(AssertCount);
end;
class procedure TAssert.CheckNull(obj: IUnknown; msg: string);
@ -155,13 +165,17 @@ end;
class procedure TAssert.CheckTrue(condition: Boolean; msg: string);
begin
if (not condition) then
FailNotEquals(BoolToStr(true, true), BoolToStr(false, true), msg, nil);
FailNotEquals(BoolToStr(true, true), BoolToStr(false, true), msg, nil)
else
Inc(AssertCount);
end;
class procedure TAssert.CheckFalse(condition: Boolean; msg: string);
begin
if (condition) then
FailNotEquals(BoolToStr(false, true), BoolToStr(true, true), msg, nil);
FailNotEquals(BoolToStr(false, true), BoolToStr(true, true), msg, nil)
else
Inc(AssertCount);
end;