fcl-db: tests: introduce TDBBasicsTestCase as ancestor for other test cases (call DBConnector.StartTest and StopTest from him)

git-svn-id: trunk@24888 -

packages/fcl-db/tests/testdbbasics.pas

@@ -18,14 +18,11 @@ type
 
   { TTestDBBasics }
 
-  TTestDBBasics = class(TTestCase)
+  TTestDBBasics = class(TDBBasicsTestCase)
   private
     procedure TestfieldDefinition(AFieldType : TFieldType;ADatasize : integer;var ADS : TDataset; var AFld: TField);
     procedure TestcalculatedField_OnCalcfields(DataSet: TDataSet);
 
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
   published
     procedure TestSetFieldValues;
     procedure TestGetFieldValues;
@@ -66,13 +63,10 @@ type
 
   { TTestBufDatasetDBBasics }
 {$ifdef fpc}
-  TTestBufDatasetDBBasics = class(TTestCase)
+  TTestBufDatasetDBBasics = class(TDBBasicsTestCase)
   private
     procedure FTestXMLDatasetDefinition(ADataset : TDataset);
     procedure TestAddIndexFieldType(AFieldType : TFieldType; ActiveDS : boolean);
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
   published
     procedure TestClosedIndexFieldNames; // bug 16695
     procedure TestFileNameProperty;
@@ -120,14 +114,11 @@ type
 
   { TTestCursorDBBasics }
 
-  TTestCursorDBBasics = class(TTestCase)
+  TTestCursorDBBasics = class(TDBBasicsTestCase)
   private
     procedure TestOnFilterProc(DataSet: TDataSet; var Accept: Boolean);
     procedure FTestDelete1(TestCancelUpdate : boolean);
     procedure FTestDelete2(TestCancelUpdate : boolean);
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
   published
     procedure TestCancelUpdDelete1;
     procedure TestCancelUpdDelete2;
@@ -175,6 +166,7 @@ type
     procedure OneTimeTearDown; override;
   end;
 {$endif fpc}
+
 implementation
 
 uses
@@ -186,20 +178,10 @@ uses
   strutils,
   FmtBCD;
 
-type THackDataLink=class(TdataLink);
+type THackDataLink=class(TDataLink);
 
 { TTestCursorDBBasics }
 
-procedure TTestCursorDBBasics.SetUp;
-begin
-  DBConnector.StartTest;
-end;
-
-procedure TTestCursorDBBasics.TearDown;
-begin
-  DBConnector.StopTest;
-end;
-
 procedure TTestCursorDBBasics.TestAppendOnEmptyDataset;
 begin
   with DBConnector.GetNDataset(0) do
@@ -616,16 +598,6 @@ begin
 end;
 
 
-procedure TTestDBBasics.SetUp;
-begin
-  DBConnector.StartTest;
-end;
-
-procedure TTestDBBasics.TearDown;
-begin
-  DBConnector.StopTest;
-end;
-
 procedure TTestCursorDBBasics.TestOldValueObsolete;
 var v : variant;
     bufds: TDataset;
@@ -2782,20 +2754,9 @@ begin
   DBConnector.TestUniDirectional:=false;
   inherited OneTimeTearDown;
 end;
-
-{ TTestBufDatasetDBBasics }
-
-procedure TTestBufDatasetDBBasics.SetUp;
-begin
-  DBConnector.StartTest;
-end;
-
-procedure TTestBufDatasetDBBasics.TearDown;
-begin
-  DBConnector.StopTest;
-end;
 {$endif fpc}
 
+
 initialization
 {$ifdef fpc}
   RegisterTestDecorator(TDBBasicsTestSetup, TTestDBBasics);

packages/fcl-db/tests/testsqldb.pas

@@ -14,24 +14,26 @@ uses
 
 type
 
+  { TSQLDBTestCase }
+
+  TSQLDBTestCase = class(TTestCase)
+    protected
+      procedure SetUp; override;
+      procedure TearDown; override;
+  end;
+
   { TTestTSQLQuery }
 
-  TTestTSQLQuery = class(TTestCase)
+  TTestTSQLQuery = class(TSQLDBTestCase)
   private
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
   published
     procedure TestUpdateServerIndexDefs;
   end;
 
   { TTestTSQLConnection }
 
-  TTestTSQLConnection = class(TTestCase)
+  TTestTSQLConnection = class(TSQLDBTestCase)
   private
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
   published
     procedure ReplaceMe;
   end;
@@ -114,38 +116,23 @@ begin
 end;
 
 
-procedure TTestTSQLQuery.SetUp;
-begin
-  inherited;
-  InitialiseDBConnector;
-  DBConnector.StartTest;
-end;
+{ TSQLDBTestCase }
 
-procedure TTestTSQLConnection.SetUp;
+procedure TSQLDBTestCase.SetUp;
 begin
-  inherited;
+  inherited SetUp;
   InitialiseDBConnector;
   DBConnector.StartTest;
 end;
 
-procedure TTestTSQLQuery.TearDown;
-begin
-  DBConnector.StopTest;
-  if assigned(DBConnector) then
-    with TSQLDBConnector(DBConnector) do
-      Transaction.Rollback;
-  FreeDBConnector;
-  inherited;
-end;
-
-procedure TTestTSQLConnection.TearDown;
+procedure TSQLDBTestCase.TearDown;
 begin
   DBConnector.StopTest;
   if assigned(DBConnector) then
     with TSQLDBConnector(DBConnector) do
       Transaction.Rollback;
   FreeDBConnector;
-  inherited;
+  inherited TearDown;
 end;
 
 

packages/fcl-db/tests/toolsunit.pas

@@ -7,7 +7,7 @@ unit ToolsUnit;
 interface
 
 uses
-  Classes, SysUtils, DB, testdecorator;
+  Classes, SysUtils, DB, testdecorator, fpcunit;
 
 Const
   // Number of "N" test datasets (as opposed to FieldDatasets) that will be created
@@ -94,6 +94,14 @@ type
       procedure OneTimeTearDown; override;
     end;
 
+  { TDBBasicsTestCase }
+  TDBBasicsTestCase = class(TTestCase)
+    protected
+      procedure SetUp; override;
+      procedure TearDown; override;
+  end;
+
+
 const
   DataEventnames : Array [TDataEvent] of String[21] =
     ('deFieldChange', 'deRecordChange', 'deDataSetChange', 'deDataSetScroll',
@@ -370,6 +378,20 @@ begin
   FreeDBConnector;
 end;
 
+{ TDBBasicsTestCase }
+
+procedure TDBBasicsTestCase.SetUp;
+begin
+  inherited SetUp;
+  DBConnector.StartTest;
+end;
+
+procedure TDBBasicsTestCase.TearDown;
+begin
+  DBConnector.StopTest;
+  inherited TearDown;
+end;
+
 
 procedure ReadIniFile;