Browse Source

* Patch from Graeme Geldenhuys to fix changed output format in case of error

git-svn-id: trunk@30320 -
michael 10 years ago
parent
commit
1768e35daa
1 changed files with 3 additions and 3 deletions
  1. 3 3
      packages/fcl-fpcunit/src/tests/asserttest.pp

+ 3 - 3
packages/fcl-fpcunit/src/tests/asserttest.pp

@@ -236,7 +236,7 @@ end;
 procedure TMyTest.RaiseIgnoreTest;
 procedure TMyTest.RaiseIgnoreTest;
 begin
 begin
   Ignore('This is an ignored test');
   Ignore('This is an ignored test');
-  AssertEquals('the compiler can count', 3, 1+1); 
+  AssertEquals('the compiler can count', 3, 2);
 end;
 end;
 
 
 procedure TTestIgnore.TestIgnoreResult;
 procedure TTestIgnore.TestIgnoreResult;
@@ -262,14 +262,14 @@ var
 begin
 begin
   t := TMyTest.CreateWithName('RaiseIgnoreTest');
   t := TMyTest.CreateWithName('RaiseIgnoreTest');
   t.EnableIgnores := false;
   t.EnableIgnores := false;
-  res := t.CreateResultandRun;
+  res := t.CreateResultAndRun;
   assertEquals('no test was run', 1, res.RunTests);
   assertEquals('no test was run', 1, res.RunTests);
   assertEquals('Ignored Test reported even if the switch is not active', 0, res.NumberOfIgnoredTests);
   assertEquals('Ignored Test reported even if the switch is not active', 0, res.NumberOfIgnoredTests);
   assertEquals('no failure caught', 1, res.NumberOfFailures);
   assertEquals('no failure caught', 1, res.NumberOfFailures);
   assertFalse('failure is signalled as Ignored Test and the switch is not active', 
   assertFalse('failure is signalled as Ignored Test and the switch is not active', 
     TTestFailure(res.Failures[0]).IsIgnoredTest);
     TTestFailure(res.Failures[0]).IsIgnoredTest);
   assertEquals('wrong failure name', 'EAssertionFailedError', TTestFailure(res.Failures[0]).ExceptionClassName);
   assertEquals('wrong failure name', 'EAssertionFailedError', TTestFailure(res.Failures[0]).ExceptionClassName);
-  assertEquals('wrong message', 'the compiler can count expected: <3> but was: <2>', TTestFailure(res.Failures[0]).ExceptionMessage);
+  assertEquals('wrong message', '"the compiler can count" expected: <3> but was: <2>', TTestFailure(res.Failures[0]).ExceptionMessage);
   t.Free;
   t.Free;
   res.Free;
   res.Free;
 end;
 end;