Browse Source

* Use consoletestrunner from fcl-unit. Old output available through --legacy or -g

git-svn-id: trunk@22402 -
michael 13 years ago
parent
commit
f496994f46
1 changed files with 31 additions and 3 deletions
  1. 31 3
      packages/fcl-db/tests/dbtestframework.pas

+ 31 - 3
packages/fcl-db/tests/dbtestframework.pas

@@ -24,14 +24,17 @@ uses
   TestDatasources,
   TestDBBasics,
   TestBufDatasetStreams,
-  TestSpecificTBufDataset;
+  TestSpecificTBufDataset,
+  consoletestrunner;
+
+Procedure LegacyOutput;
 
 var
   FXMLResultsWriter: TXMLResultsWriter;
   FDigestResultsWriter: TDigestResultsWriter;
   testResult: TTestResult;
+
 begin
-  InitialiseDBConnector;
   testResult := TTestResult.Create;
   FXMLResultsWriter := TXMLResultsWriter.Create;
   FDigestResultsWriter := TDigestResultsWriter.Create(nil);
@@ -50,5 +53,30 @@ begin
     FXMLResultsWriter.Free;
     FDigestResultsWriter.Free;
   end;
-  FreeDBConnector;
+end;
+  
+Var
+  Application : TTestRunner;  
+  
+begin
+  InitialiseDBConnector;
+  Try
+    Application:=TTestRunner.Create(nil);
+    With Application do
+      try
+        if HasOption('g','legacy') then
+          LegacyOutput
+        else
+          begin  
+          DefaultFormat:=fplain;
+          DefaultRunAllTests:=True;
+          Initialize;
+          Run;
+          end;
+      finally
+        Free;
+      end;
+  Finally    
+    FreeDBConnector;
+  end;  
 end.