diff --git a/packages/fcl-db/tests/dbtestframework.pas b/packages/fcl-db/tests/dbtestframework.pas index 58e0cc757b..b5b92e87a7 100644 --- a/packages/fcl-db/tests/dbtestframework.pas +++ b/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; diff --git a/packages/fcl-db/tests/testdbbasics.pas b/packages/fcl-db/tests/testdbbasics.pas index efc48ef391..abcee4aee5 100644 --- a/packages/fcl-db/tests/testdbbasics.pas +++ b/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;