Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bin/verify-exercises
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ for path in build/*; do
make -B test=all 2>&1 |
sed -e '1{/^TAP version 14$/d}' \
-e '2{/^1\.\.[0-9]\+$/d}' \
-e '3{/^not ok 0 - Please implement your solution.$/d}'
-e '3{/^not ok 0 - Please implement your solution.$/d}' \
-e '4{/^make: \*\*\* \[Makefile:[0-9]\+: test\] Error [0-9]\+$/d}'
)
if [[ "$path" == 'build/hello-world' ]]; then
if ! grep -q '^not ok 1 - SayHi$' <<< "$make_test_stub"; then
Expand Down
29 changes: 19 additions & 10 deletions exercises/practice/acronym/lib/FPCUnitTAPReporter.pas
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ interface
type
TCustomResultWriter = class(TNoRefCountObject, ITestListener)
private
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestFailuresCount : integer;
public
constructor Create;
destructor Destroy; override;
Expand All @@ -21,17 +22,19 @@ TCustomResultWriter = class(TNoRefCountObject, ITestListener)
procedure EndTest(ATest: TTest);
procedure StartTestSuite(ATestSuite: TTestSuite);
procedure EndTestSuite(ATestSuite: TTestSuite);
function HasFailures : boolean;
end;

implementation

uses TestRegistry, SysUtils, FpJson, JSONParser, StrUtils, TypInfo;

constructor TCustomResultWriter.Create ;
constructor TCustomResultWriter.Create;
begin
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestFailuresCount := 0;

writeln('TAP version 14');
writeln(format('1..%d', [FTestCasesCount]));
Expand All @@ -46,9 +49,9 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
JData : TJSONData;
LMessage, LGot, LExpect : string;
begin

FTestPassed := false;
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;

try
try
Expand Down Expand Up @@ -121,12 +124,13 @@ procedure PrintDumpExceptionBackTrace;
procedure TCustomResultWriter.AddError(ATest: TTest; AError: TTestFailure);
begin
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;
if (AError.ExceptionClassName = 'ENotImplemented') and
(AError.ExceptionMessage = 'Please implement your solution.') then
begin
writeln(format('not ok %d - %s', [0, AError.ExceptionMessage]));
halt;
halt(1);
end;

writeln(format('not ok %d - %s', [FTestCount, ATest.TestName]));
Expand Down Expand Up @@ -169,4 +173,9 @@ procedure TCustomResultWriter.EndTestSuite(ATestSuite: TTestSuite);
end;
{$HINTS ON}

function TCustomResultWriter.HasFailures : boolean;
begin
result := FTestFailuresCount > 0;
end;

end.
4 changes: 4 additions & 0 deletions exercises/practice/acronym/test.pas
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
TestResult : TTestResult;
RunAll : boolean;
TestNumber : integer = 0;
HasFail : boolean;
i : integer;
begin

Expand Down Expand Up @@ -71,9 +72,12 @@
try
TestResult.AddListener(FResultWriter);
GetTestRegistry.Run(TestResult);
HasFail := FResultWriter.HasFailures;
finally
FResultWriter.Free;
TestResult.Free;

if HasFail then halt(1);
end;

end.
29 changes: 19 additions & 10 deletions exercises/practice/all-your-base/lib/FPCUnitTAPReporter.pas
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ interface
type
TCustomResultWriter = class(TNoRefCountObject, ITestListener)
private
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestFailuresCount : integer;
public
constructor Create;
destructor Destroy; override;
Expand All @@ -21,17 +22,19 @@ TCustomResultWriter = class(TNoRefCountObject, ITestListener)
procedure EndTest(ATest: TTest);
procedure StartTestSuite(ATestSuite: TTestSuite);
procedure EndTestSuite(ATestSuite: TTestSuite);
function HasFailures : boolean;
end;

implementation

uses TestRegistry, SysUtils, FpJson, JSONParser, StrUtils, TypInfo;

constructor TCustomResultWriter.Create ;
constructor TCustomResultWriter.Create;
begin
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestFailuresCount := 0;

writeln('TAP version 14');
writeln(format('1..%d', [FTestCasesCount]));
Expand All @@ -46,9 +49,9 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
JData : TJSONData;
LMessage, LGot, LExpect : string;
begin

FTestPassed := false;
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;

try
try
Expand Down Expand Up @@ -121,12 +124,13 @@ procedure PrintDumpExceptionBackTrace;
procedure TCustomResultWriter.AddError(ATest: TTest; AError: TTestFailure);
begin
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;
if (AError.ExceptionClassName = 'ENotImplemented') and
(AError.ExceptionMessage = 'Please implement your solution.') then
begin
writeln(format('not ok %d - %s', [0, AError.ExceptionMessage]));
halt;
halt(1);
end;

writeln(format('not ok %d - %s', [FTestCount, ATest.TestName]));
Expand Down Expand Up @@ -169,4 +173,9 @@ procedure TCustomResultWriter.EndTestSuite(ATestSuite: TTestSuite);
end;
{$HINTS ON}

function TCustomResultWriter.HasFailures : boolean;
begin
result := FTestFailuresCount > 0;
end;

end.
4 changes: 4 additions & 0 deletions exercises/practice/all-your-base/test.pas
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
TestResult : TTestResult;
RunAll : boolean;
TestNumber : integer = 0;
HasFail : boolean;
i : integer;
begin

Expand Down Expand Up @@ -71,9 +72,12 @@
try
TestResult.AddListener(FResultWriter);
GetTestRegistry.Run(TestResult);
HasFail := FResultWriter.HasFailures;
finally
FResultWriter.Free;
TestResult.Free;

if HasFail then halt(1);
end;

end.
29 changes: 19 additions & 10 deletions exercises/practice/allergies/lib/FPCUnitTAPReporter.pas
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ interface
type
TCustomResultWriter = class(TNoRefCountObject, ITestListener)
private
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestFailuresCount : integer;
public
constructor Create;
destructor Destroy; override;
Expand All @@ -21,17 +22,19 @@ TCustomResultWriter = class(TNoRefCountObject, ITestListener)
procedure EndTest(ATest: TTest);
procedure StartTestSuite(ATestSuite: TTestSuite);
procedure EndTestSuite(ATestSuite: TTestSuite);
function HasFailures : boolean;
end;

implementation

uses TestRegistry, SysUtils, FpJson, JSONParser, StrUtils, TypInfo;

constructor TCustomResultWriter.Create ;
constructor TCustomResultWriter.Create;
begin
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestFailuresCount := 0;

writeln('TAP version 14');
writeln(format('1..%d', [FTestCasesCount]));
Expand All @@ -46,9 +49,9 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
JData : TJSONData;
LMessage, LGot, LExpect : string;
begin

FTestPassed := false;
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;

try
try
Expand Down Expand Up @@ -121,12 +124,13 @@ procedure PrintDumpExceptionBackTrace;
procedure TCustomResultWriter.AddError(ATest: TTest; AError: TTestFailure);
begin
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;
if (AError.ExceptionClassName = 'ENotImplemented') and
(AError.ExceptionMessage = 'Please implement your solution.') then
begin
writeln(format('not ok %d - %s', [0, AError.ExceptionMessage]));
halt;
halt(1);
end;

writeln(format('not ok %d - %s', [FTestCount, ATest.TestName]));
Expand Down Expand Up @@ -169,4 +173,9 @@ procedure TCustomResultWriter.EndTestSuite(ATestSuite: TTestSuite);
end;
{$HINTS ON}

function TCustomResultWriter.HasFailures : boolean;
begin
result := FTestFailuresCount > 0;
end;

end.
4 changes: 4 additions & 0 deletions exercises/practice/allergies/test.pas
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
TestResult : TTestResult;
RunAll : boolean;
TestNumber : integer = 0;
HasFail : boolean;
i : integer;
begin

Expand Down Expand Up @@ -71,9 +72,12 @@
try
TestResult.AddListener(FResultWriter);
GetTestRegistry.Run(TestResult);
HasFail := FResultWriter.HasFailures;
finally
FResultWriter.Free;
TestResult.Free;

if HasFail then halt(1);
end;

end.
29 changes: 19 additions & 10 deletions exercises/practice/anagram/lib/FPCUnitTAPReporter.pas
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ interface
type
TCustomResultWriter = class(TNoRefCountObject, ITestListener)
private
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestCasesCount : integer;
FTestCount : integer;
FTestPassed : boolean;
FTestFailuresCount : integer;
public
constructor Create;
destructor Destroy; override;
Expand All @@ -21,17 +22,19 @@ TCustomResultWriter = class(TNoRefCountObject, ITestListener)
procedure EndTest(ATest: TTest);
procedure StartTestSuite(ATestSuite: TTestSuite);
procedure EndTestSuite(ATestSuite: TTestSuite);
function HasFailures : boolean;
end;

implementation

uses TestRegistry, SysUtils, FpJson, JSONParser, StrUtils, TypInfo;

constructor TCustomResultWriter.Create ;
constructor TCustomResultWriter.Create;
begin
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestCasesCount := GetTestRegistry.CountTestCases;
FTestCount := 0;
FTestPassed := true;
FTestFailuresCount := 0;

writeln('TAP version 14');
writeln(format('1..%d', [FTestCasesCount]));
Expand All @@ -46,9 +49,9 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
JData : TJSONData;
LMessage, LGot, LExpect : string;
begin

FTestPassed := false;
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;

try
try
Expand Down Expand Up @@ -121,12 +124,13 @@ procedure PrintDumpExceptionBackTrace;
procedure TCustomResultWriter.AddError(ATest: TTest; AError: TTestFailure);
begin
inc(FTestCount);
inc(FTestFailuresCount);
FTestPassed := false;
if (AError.ExceptionClassName = 'ENotImplemented') and
(AError.ExceptionMessage = 'Please implement your solution.') then
begin
writeln(format('not ok %d - %s', [0, AError.ExceptionMessage]));
halt;
halt(1);
end;

writeln(format('not ok %d - %s', [FTestCount, ATest.TestName]));
Expand Down Expand Up @@ -169,4 +173,9 @@ procedure TCustomResultWriter.EndTestSuite(ATestSuite: TTestSuite);
end;
{$HINTS ON}

function TCustomResultWriter.HasFailures : boolean;
begin
result := FTestFailuresCount > 0;
end;

end.
4 changes: 4 additions & 0 deletions exercises/practice/anagram/test.pas
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
TestResult : TTestResult;
RunAll : boolean;
TestNumber : integer = 0;
HasFail : boolean;
i : integer;
begin

Expand Down Expand Up @@ -71,9 +72,12 @@
try
TestResult.AddListener(FResultWriter);
GetTestRegistry.Run(TestResult);
HasFail := FResultWriter.HasFailures;
finally
FResultWriter.Free;
TestResult.Free;

if HasFail then halt(1);
end;

end.
Loading