Browse Source

* Reverted accidently committed files in r12278

git-svn-id: trunk@12279 -
joost 16 years ago
parent
commit
c3112bd7cb
2 changed files with 5 additions and 28 deletions
  1. 3 4
      packages/fcl-db/tests/dbtestframework.pas
  2. 2 24
      packages/fcl-db/tests/testdbbasics.pas

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

@@ -17,11 +17,10 @@ uses
   memdstoolsunit,
   SdfDSToolsUnit,
 // Units wich contains the tests
-//  testbasics,
+  testbasics,
   testfieldtypes,
-//  TestDatasources,
-//  testdbbasics,
-  TestBufDatasetStreams;
+  TestDatasources,
+  testdbbasics;
 
 var
   FXMLResultsWriter: TXMLResultsWriter;

+ 2 - 24
packages/fcl-db/tests/testdbbasics.pas

@@ -126,7 +126,7 @@ type
 
 implementation
 
-uses toolsunit, bufdataset, variants, strutils, XMLDatapacketReader;
+uses toolsunit, bufdataset, variants, strutils;
 
 type THackDataLink=class(TdataLink);
 
@@ -1526,14 +1526,6 @@ begin
     AddIndex('testindex','F'+FieldTypeNames[AfieldType],[]);
     IndexName:='testindex';
     open;
-
-{    while not eof do
-      begin
-      writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString);
-      next;
-      end;
-    first;}
-
     OldStringValue:=FieldByName('F'+FieldTypeNames[AfieldType]).AsString;
     next;
     AssertTrue(OldStringValue<=FieldByName('F'+FieldTypeNames[AfieldType]).AsString);
@@ -1545,23 +1537,10 @@ begin
     edit;
     FieldByName('F'+FieldTypeNames[AfieldType]).AsString := 'ZZZ';
     post;
-
-writeln('----');
-    first;
-    while not eof do
-      begin
-      writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString);
-      next;
-      end;
-    first;
-
-
     prior;
-    writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString);
-//    AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)>=0);
+    AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)>=0);
     next;
     next;
-    writeln(FieldByName('F'+FieldTypeNames[AfieldType]).AsString);
     AssertTrue(AnsiCompareStr('ZZZ',FieldByName('F'+FieldTypeNames[AfieldType]).AsString)<=0);
     close;
     end;
@@ -1827,7 +1806,6 @@ begin
 
   for i := 0 to testValuesCount-1 do
     begin
-    AssertEquals(CurrToStr(testCurrencyValues[i]),Fld.AsString);
     AssertEquals(testCurrencyValues[i],Fld.AsCurrency);
     AssertEquals(testCurrencyValues[i],Fld.AsFloat);
     ds.Next;