* Fix bug #34164 - Fix use of AssertCount and use overloaded ComparisonMsg

git-svn-id: trunk@39660 -

packages/fcl-fpcunit/src/DUnitCompatibleInterface.inc

@@ -106,7 +106,7 @@ end;
 class procedure TAssert.CheckNotEquals(expected, actual: string; msg: string);
 begin
   if AnsiCompareStr(Expected, Actual) = 0 then
-    Fail(msg + ComparisonMsg(Expected, Actual, false))
+    Fail(ComparisonMsg(msg, Expected, Actual, false))
   else
     Inc(AssertCount);
 end;
@@ -114,7 +114,7 @@ end;
 class procedure TAssert.CheckNotEquals(expected, actual: unicodestring; msg: string);
 begin
   if (Expected=Actual) then
-    Fail(msg + ComparisonMsg(Expected, Actual, false))
+    Fail(ComparisonMsg(msg, Expected, Actual, false))
   else
     Inc(AssertCount);
 end;
@@ -122,7 +122,7 @@ end;
 class procedure TAssert.CheckNotEquals(expected, actual: integer; msg: string);
 begin
   if (expected = actual) then
-    Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
+    Fail(ComparisonMsg(msg, IntToStr(expected), IntToStr(actual), false))
   else
     Inc(AssertCount);
 end;
@@ -130,7 +130,7 @@ end;
 class procedure TAssert.CheckNotEquals(expected, actual: boolean; msg: string);
 begin
   if (expected = actual) then
-    Fail(msg + ComparisonMsg(BoolToStr(expected), BoolToStr(actual), false))
+    Fail(ComparisonMsg(msg, BoolToStr(expected), BoolToStr(actual), false))
   else
     Inc(AssertCount);
 end;
@@ -148,7 +148,7 @@ class procedure TAssert.CheckNotEquals(expected, actual: QWord;
   msg: string);
 begin
   if (expected = actual) then
-    Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
+    Fail(ComparisonMsg(msg, IntToStr(expected), IntToStr(actual), false))
   else
     Inc(AssertCount);
 end;
@@ -157,7 +157,7 @@ class procedure TAssert.CheckNotEquals(expected, actual: int64;
   msg: string);
 begin
   if (expected = actual) then
-    Fail(msg + ComparisonMsg(IntToStr(expected), IntToStr(actual), false))
+    Fail(ComparisonMsg(msg, IntToStr(expected), IntToStr(actual), false))
   else
     Inc(AssertCount);
 end;
@@ -188,7 +188,9 @@ begin
   if obj = nil then
     Fail(ComparisonMsg(msg, pClass.ClassName, 'nil'))
   else if not obj.ClassType.InheritsFrom(pClass) then
-    Fail(ComparisonMsg(msg, pClass.ClassName, obj.ClassName));
+    Fail(ComparisonMsg(msg, pClass.ClassName, obj.ClassName))
+  else
+    Inc(AssertCount);
 end;
 
 class procedure TAssert.CheckSame(expected, actual: TObject; msg: string);