.test_code improvements (#14)

* * syncing track test framework

* * improving test_code

Author: jimmytty

assets/Makefile

@@ -2,7 +2,7 @@ SHELL       = /bin/bash
 MAKEFLAGS  += --no-print-directory
 DESTDIR     = build
 EXECUTABLE  = $(DESTDIR)/test
-COMMAND     = fpc -l- -v0 -g -gl -Sehnw -Fu./lib test.pas -FE"./$(DESTDIR)"
+COMMAND     = fpc -l- -v0 -g -gl -Sa -Cr -Sehnw -Fu./lib test.pas -FE"./$(DESTDIR)"
 
 .ONESHELL:
 

assets/lib/FPCUnitTAPReporter.pas

@@ -43,8 +43,8 @@ destructor TCustomResultWriter.Destroy;
 
 procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
 var
-  JData                     : TJSONData;
-  LMessage, LGot, LExpected : string;
+  JData                   : TJSONData;
+  LMessage, LGot, LExpect : string;
 begin
 
   FTestPassed := false;
@@ -54,16 +54,22 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
     try
       JData     := GetJSON(AFailure.ExceptionMessage);
       LMessage  := JData.FindPath('message').AsString;
-      if GetEnumName(
-           TypeInfo(TJSONtype), ord(JData.FindPath('expected').JSONType)
-         ) = 'jtArray' then
-        LExpected := JData.FindPath('expected').FormatJSON
-      else LExpected := JData.FindPath('expected').AsString;
-      if GetEnumName(
+      case
+        GetEnumName(
+          TypeInfo(TJSONtype), ord(JData.FindPath('expect').JSONType)
+        ) of
+        'jtArray', 'jtObject' :
+          LExpect := JData.FindPath('expect').FormatJSON;
+        otherwise LExpect := JData.FindPath('expect').AsString;
+      end;
+      case
+        GetEnumName(
            TypeInfo(TJSONtype), ord(JData.FindPath('actual').JSONType)
-         ) = 'jtArray' then
-        LGot := JData.FindPath('actual').FormatJSON
-      else LGot := JData.FindPath('actual').AsString;
+         ) of
+        'jtArray', 'jtObject' :
+          LGot := JData.FindPath('actual').FormatJSON
+        otherwise LGot := JData.FindPath('actual').AsString;
+      end;
     finally
       JData.Free;
     end
@@ -93,12 +99,12 @@ procedure TCustomResultWriter.AddFailure(ATest: TTest; AFailure: TTestFailure);
   else
     writeln('    got: ', LGot);
 
-  if pos(#10, LExpected) > 0 then
+  if pos(#10, LExpect) > 0 then
     begin
-      writeln('    expected: |');
-      writeln('      ' + ReplaceStr(LExpected, #10, #10 + '      '));
+      writeln('    expect: |');
+      writeln('      ' + ReplaceStr(LExpect, #10, #10 + '      '));
     end
-  else writeln('    expect: ', LExpected);
+  else writeln('    expect: ', LExpect);
 
   writeln('  ...');
 end;