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

git-svn-id: trunk@39545 -

packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc

@@ -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);

packages/fcl-fpcunit/src/fpcunit.pp

@@ -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);