* Moved TDBBasicsTestSetup to toolsunit

git-svn-id: trunk@15373 -

packages/fcl-db/tests/testbufdatasetstreams.pas

@@ -67,14 +67,6 @@ type
     procedure TestFileNameProperty;
   end;
 
-  { TSQLTestSetup }
-
-  TDBBasicsTestSetup = class(TTestSetup)
-  protected
-    procedure OneTimeSetup; override;
-    procedure OneTimeTearDown; override;
-  end;
-
 implementation
 
 uses toolsunit, SQLDBToolsUnit, sqldb, XMLDatapacketReader;
@@ -446,17 +438,6 @@ begin
   TestChangesApplyUpdates(@DeleteAllInsertChange, False);
 end;
 
-{ TSQLTestSetup }
-procedure TDBBasicsTestSetup.OneTimeSetup;
-begin
-  InitialiseDBConnector;
-end;
-
-procedure TDBBasicsTestSetup.OneTimeTearDown;
-begin
-  FreeAndNil(DBConnector);
-end;
-
 initialization
   if uppercase(dbconnectorname)='SQL' then
     RegisterTestDecorator(TDBBasicsTestSetup, TTestBufDatasetStreams);

packages/fcl-db/tests/testdbbasics.pas

@@ -119,14 +119,6 @@ type
     procedure TestCanModifySpecialFields;
   end;
 
-  { TSQLTestSetup }
-
-  TDBBasicsTestSetup = class(TTestSetup)
-  protected
-    procedure OneTimeSetup; override;
-    procedure OneTimeTearDown; override;
-  end;
-
 implementation
 
 uses toolsunit, bufdataset, variants, strutils;
@@ -2173,17 +2165,6 @@ begin
 
 end;
 
-{ TSQLTestSetup }
-procedure TDBBasicsTestSetup.OneTimeSetup;
-begin
-  InitialiseDBConnector;
-end;
-
-procedure TDBBasicsTestSetup.OneTimeTearDown;
-begin
-  FreeAndNil(DBConnector);
-end;
-
 initialization
   RegisterTestDecorator(TDBBasicsTestSetup, TTestDBBasics);
 end.

packages/fcl-db/tests/toolsunit.pas

@@ -7,7 +7,7 @@ unit ToolsUnit;
 interface
 
 uses
-  Classes, SysUtils, DB;
+  Classes, SysUtils, DB, testdecorator;
   
 Const MaxDataSet = 35;
   
@@ -59,6 +59,13 @@ type
        procedure StopTest;
      end;
 
+  { TDBBasicsTestSetup }
+
+  TDBBasicsTestSetup = class(TTestSetup)
+    protected
+      procedure OneTimeSetup; override;
+      procedure OneTimeTearDown; override;
+    end;
 
 { TTestDataLink }
 
@@ -324,6 +331,18 @@ begin
     end;
 end;
 
+{ TDBBasicsTestSetup }
+
+procedure TDBBasicsTestSetup.OneTimeSetup;
+begin
+  InitialiseDBConnector;
+end;
+
+procedure TDBBasicsTestSetup.OneTimeTearDown;
+begin
+  FreeAndNil(DBConnector);
+end;
+
 initialization
   ReadIniFile;
 end.