Browse Source

* Patch from Dean Zobec for BoolToStr changes

git-svn-id: trunk@6460 -
michael 18 years ago
parent
commit
74ef50a650
2 changed files with 12 additions and 2 deletions
  1. 11 1
      fcl/fpcunit/exampletests/fpcunittests.pp
  2. 1 1
      fcl/inc/fpcunit.pp

+ 11 - 1
fcl/fpcunit/exampletests/fpcunittests.pp

@@ -110,6 +110,8 @@ type
     procedure AddError(ATest: TTest; AError: TTestFailure);
     procedure StartTest(ATest: TTest);
     procedure EndTest(ATest: TTest);
+    procedure StartTestSuite(ATestSuite: TTestSuite);
+    procedure EndTestSuite(ATestSuite: TTestSuite);
     procedure AddExpectedLine(ALine: string);
     procedure Verify(ActualList: TStrings);
   end;
@@ -517,7 +519,7 @@ end;
 
 procedure TAssertTest.TestFailEqualsBoolean;
 begin
-  InterceptFailure(@FailEqualsBoolean, ' expected: <TRUE> but was: <FALSE>');
+  InterceptFailure(@FailEqualsBoolean, ' expected: <True> but was: <False>');
 end;
 
 procedure TAssertTest.TestFailEqualsChar;
@@ -612,6 +614,14 @@ begin
   FList.Add('Ended: ' + ATest.TestName)
 end;
 
+procedure TMockListener.StartTestSuite(ATestSuite: TTestSuite);
+begin
+end;
+    
+procedure TMockListener.EndTestSuite(ATestSuite: TTestSuite);
+begin
+end;
+
 procedure TMockListener.AddExpectedLine(ALine: string);
 begin
   FExpectedList.Add(ALine)

+ 1 - 1
fcl/inc/fpcunit.pp

@@ -547,7 +547,7 @@ end;
 
 class procedure TAssert.AssertEquals(const AMessage: string; Expected, Actual: boolean);
 begin
-  AssertTrue(AMessage + ComparisonMsg(BoolToStr(Expected), BoolToStr(Actual)), Expected = Actual);
+  AssertTrue(AMessage + ComparisonMsg(BoolToStr(Expected, true), BoolToStr(Actual, true)), Expected = Actual);
 end;