From 759549168fce3c3c17afc68ac31bc5735f8126c2 Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 24 Mar 2015 15:46:16 +0000 Subject: [PATCH] * Output new error address, unit and line info git-svn-id: trunk@30319 - --- packages/fcl-fpcunit/src/plaintestreport.pp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/packages/fcl-fpcunit/src/plaintestreport.pp b/packages/fcl-fpcunit/src/plaintestreport.pp index 1cd19bc554..8ae58ce3ab 100644 --- a/packages/fcl-fpcunit/src/plaintestreport.pp +++ b/packages/fcl-fpcunit/src/plaintestreport.pp @@ -124,10 +124,8 @@ begin begin FDoc[FDoc.Count -1] := FDoc[FDoc.Count -1] + ' Error: ' + FTempFailure.ExceptionClassName; FDoc.Add(StringOfChar(' ',ALevel*2) + ' Exception: ' + FTempFailure.ExceptionMessage); - FDoc.Add(StringOfChar(' ',ALevel*2) + ' Source unit: ' + FTempFailure.SourceUnitName); - FDoc.Add(StringOfChar(' ',ALevel*2) + ' Method name: ' + FTempFailure.FailedMethodName); - FDoc.Add(StringOfChar(' ',ALevel*2) + ' Line number: ' - + IntToStr(FTempFailure.LineNumber)); + FDoc.Add(StringOfChar(' ',ALevel*2) + ' at ' + FTempFailure.LocationInfo); + // TODO: Add stack dump output info end else if FTempFailure.IsIgnoredTest then @@ -136,9 +134,13 @@ begin + FTempFailure.ExceptionMessage; end else + begin //is a failure FDoc[FDoc.Count -1] := FDoc[FDoc.Count -1] + ' Failed: ' + FTempFailure.ExceptionMessage; + FDoc.Add(StringOfChar(' ',ALevel*2) + ' Exception: ' + FTempFailure.ExceptionMessage); + FDoc.Add(StringOfChar(' ',ALevel*2) + ' at ' + FTempFailure.LocationInfo); + end; end; FTempFailure := nil; end; @@ -225,9 +227,7 @@ begin Result := Result + ' Message: ' + f.AsString + System.sLineBreak; Result := Result + ' Exception class: ' + f.ExceptionClassName + System.sLineBreak; Result := Result + ' Exception message: ' + f.ExceptionMessage + System.sLineBreak; - Result := Result + ' Source unitname: ' + f.SourceUnitName + System.sLineBreak; - Result := Result + ' Line number: ' + IntToStr(f.LineNumber) + System.sLineBreak; - Result := Result + ' Failed methodname: ' + f.FailedMethodName + System.sLineBreak; + Result := Result + ' at ' + f.LocationInfo + System.sLineBreak; end; end; if NumberOfFailures <> 0 then @@ -242,6 +242,7 @@ begin Result := Result + ' Message: ' + f.AsString + System.sLineBreak; Result := Result + ' Exception class: ' + f.ExceptionClassName + System.sLineBreak; Result := Result + ' Exception message: ' + f.ExceptionMessage + System.sLineBreak; + Result := Result + ' at ' + f.LocationInfo + System.sLineBreak; end; end; if NumberOfIgnoredTests <> 0 then