* Better test case from Reinier, Bug ID #19987

git-svn-id: trunk@18215 -

packages/fcl-db/tests/xmlxsdexporttestcase1.pas

@@ -10,19 +10,28 @@ uses
 
 type
 
+  { Ttestxmlxsdexport1 }
+
   Ttestxmlxsdexport1 = class(Ttestcase)
+  const
+    KeepFilesAfterTest = true;
+    //Change if you want to keep export files for further testing
   private
     procedure FillTestData;
   protected
     FTestDataset: TBufDataset;
     FExportTempDir: string; //where we store exported files in these tests
+    procedure FillRecord(const RowNumber: integer; const Teststring: string;
+      const TestGUID: string; const TestInteger: integer;
+      const TestExtended: extended; const TestDatetime: Tdatetime;
+      const TestBoolean: boolean);
     procedure Setup; override;
     procedure Teardown; override;
   published
-    procedure TestXSDExport_Access_NoXSD_Decimal;
-    procedure TestXSDExport_Access_NoXSD_NoDecimal;
-    procedure TestXSDExport_Access_XSD_Decimal;
-    procedure TestXSDExport_Access_XSD_NoDecimal;
+    procedure TestXSDExport_Access_NoXSD_DecimalOverride;
+    procedure TestXSDExport_Access_NoXSD_NoDecimalOverride;
+    procedure TestXSDExport_Access_XSD_DecimalOverride;
+    procedure TestXSDExport_Access_XSD_NoDecimalOverride;
     procedure TestXSDExport_ADONET_NoXSD;
     procedure TestXSDExport_ADONET_XSD;
     procedure TestXSDExport_DelphiClientDataset;
@@ -31,7 +40,7 @@ type
 
 implementation
 
-procedure Ttestxmlxsdexport1.TestXSDExport_Access_NoXSD_NoDecimal;
+procedure Ttestxmlxsdexport1.TestXSDExport_Access_NoXSD_NoDecimalOverride;
 
 var
   Export: TXMLXSDExporter;
@@ -44,24 +53,25 @@ begin
   try
     //Don't override decimal separator
     Settings.CreateXSD := False;
-    Settings.DecimalSeparator := Char(''); //Don't override decimalseparator
+    Settings.DecimalSeparator := char(''); //Don't override decimalseparator
     Settings.ExportFormat := AccessCompatible;
     Export.Dataset := FTestDataset;
     Export.FormatSettings := Settings;
-    Export.FileName := FExportTempDir + 'Access_NoXSD_NoDecimal.xml';
+    Export.FileName := FExportTempDir + 'Access_NoXSD_NoDecimalOverride.xml';
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    { TODO 9 -oAnyone -cNice to have : When initial testing is complete, delete export files. }
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
 
-procedure Ttestxmlxsdexport1.TestXSDExport_Access_NoXSD_Decimal;
+procedure Ttestxmlxsdexport1.TestXSDExport_Access_NoXSD_DecimalOverride;
 var
   Export: TXMLXSDExporter;
   Settings: TXMLXSDFormatSettings;
@@ -77,19 +87,21 @@ begin
     Settings.ExportFormat := AccessCompatible;
     Export.Dataset := FTestDataset;
     Export.FormatSettings := Settings;
-    Export.FileName := FExportTempDir + 'Access_NoXSD_Decimal.xml';
+    Export.FileName := FExportTempDir + 'Access_NoXSD_DecimalOverride.xml';
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
 
-procedure Ttestxmlxsdexport1.TestXSDExport_Access_XSD_NoDecimal;
+procedure Ttestxmlxsdexport1.TestXSDExport_Access_XSD_NoDecimalOverride;
 var
   Export: TXMLXSDExporter;
   Settings: TXMLXSDFormatSettings;
@@ -104,19 +116,21 @@ begin
     Settings.ExportFormat := AccessCompatible;
     Export.Dataset := FTestDataset;
     Export.FormatSettings := Settings;
-    Export.FileName := FExportTempDir + 'Access_XSD_NoDecimal.xml';
+    Export.FileName := FExportTempDir + 'Access_XSD_NoDecimalOverride.xml';
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
 
-procedure Ttestxmlxsdexport1.TestXSDExport_Access_XSD_Decimal;
+procedure Ttestxmlxsdexport1.TestXSDExport_Access_XSD_DecimalOverride;
 var
   Export: TXMLXSDExporter;
   Settings: TXMLXSDFormatSettings;
@@ -131,14 +145,16 @@ begin
     Settings.ExportFormat := AccessCompatible;
     Export.Dataset := FTestDataset;
     Export.FormatSettings := Settings;
-    Export.FileName := FExportTempDir + 'Access_XSD_Decimal.xml';
+    Export.FileName := FExportTempDir + 'Access_XSD_DecimalOverride.xml';
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
@@ -161,10 +177,12 @@ begin
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
@@ -187,10 +205,12 @@ begin
     NumberExported := Export.Execute;
     FTestDataset.Close;
     AssertEquals('Number of records exported', NumberExported, FTestDataset.RecordCount);
-    //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
@@ -215,7 +235,10 @@ begin
     //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
@@ -240,7 +263,10 @@ begin
     //we should have exported 2 records.
   finally
     Settings.Free;
-    //DeleteFile(Export.FileName); //todo: fix this for release
+    if (KeepFilesAfterTest = False) then
+    begin
+      DeleteFile(Export.FileName);
+    end;
     Export.Free;
   end;
 end;
@@ -248,94 +274,336 @@ end;
 
 procedure Ttestxmlxsdexport1.FillTestData;
 var
-  Utf8teststring: string;
+  RowNumber: integer; //Keep track of how many rows we inserted
+  TestBoolean: boolean;
+  TestDateTime: TDateTime;
+  TestExtended: extended;
+  //yes, a lot of precision; we can convert to single/double if required
+  TestInteger: integer;
+  TestGuid: string;
+  TestString: string;
 begin
   FTestDataset.Close;
+  RowNumber := 0;
   //for memds:
   //FTestDataset.Clear(False); //memds: clear out any data
   //FTestDataset.Fields.Clear; //bufds: clear out any data, but also FIELDDEFS: don't use
   FTestDataset.Open;
 
   // Fill some test data
-  // First row
+  // First row: positive numerical values, late dates/times, strings with special chars (tab, linefeed, ; > <)
   FTestDataset.Append;
-  FTestDataset.FieldByName('IDINTEGER').AsInteger := 42;
-  FTestDataset.FieldByName('NAMESTRING').AsString := 'Douglas Adams';
-  FTestDataset.FieldByName('REMARKSMEMO').AsString :=
-    'So long, and thanks for all the fish.';
-  FTestDataset.FieldByName('BIRTHDAYDATE').AsDateTime :=
-    ScanDateTime('yyyymmdd', '19520311', 1);
-  FTestDataset.FieldByName('CVBLOB').AsString :=
-    'A very succesful and funny writer. He died some years ago.';
-  FTestDataset.FieldByName('POCKETMONEYCURRENCY').AsCurrency := 42.42;
-  FTestDataset.FieldByName('NAUGHTYBOOLEAN').AsBoolean := False;
+  TestBoolean := True;
+  TestDateTime := EncodeDate(9999, 12, 31) + EncodeTime(23, 59, 59, 999);
+  TestExtended := 42.424242424242424242424242424242;
+  TestInteger := Round(TestExtended);
+  TestGuid := '{21EC2020-3AEA-1069-A2DD-08002B30309D}';
+  TestString := 'Douglas Adams less than: < greater than > tab:' +
+    #9 + 'crlf:' + #13 + #10 +
+    '國缺界广欠廣界界东缺. Haddock drinks rosé (ros, e accent aigu), водка (wodka cyrillic) and ούζο (ouzo Greek) but prefers Loch Lomond whiskey.';
+  RowNumber := RowNumber + 1;
+  FillRecord(RowNumber, Teststring, TestGUID, Testinteger, Testextended,
+    Testdatetime, Testboolean);
   FTestDataset.Post;
 
-  // Second row
+  // Second row: negative numerical values, early dates/times, strings with maximum field width and Greek, east asian (multibyte) characters
   FTestDataset.Append;
-  FTestDataset.FieldByName('IDINTEGER').AsInteger := 444;
-  FTestDataset.FieldByName('NAMESTRING').AsString := 'Captain Haddock';
-  UTF8TestString :=
-    'Drinks rosé (ros, e accent aigu), водка (wodka cyrillic) and ούζο (ouzo Greek) but prefers Loch Lomond whiskey.';
-  FTestDataset.FieldByName('REMARKSMEMO').AsString := (UTF8TestString);
-  //examples of UTF8 code
-  FTestDataset.FieldByName('BIRTHDAYDATE').AsDateTime :=
-    ScanDateTime('yyyymmdd', '19401017', 1);
-  FTestDataset.FieldByName('CVBLOB').AsString := '';
-  FTestDataset.FieldByName('POCKETMONEYCURRENCY').AsCurrency := 12.4866666;
-  FTestDataset.FieldByName('NAUGHTYBOOLEAN').AsBoolean := True;
+  TestBoolean := False;
+  TestDateTime := EncodeDate(1, 1, 1) + EncodeTime(0, 0, 0, 1);
+  TestExtended := -42.424242424242424242424242424242;
+  TestInteger := Round(TestExtended);
+  TestGuid := '{FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF}';
+  TestString := 'ARMA virumque cano, Troiae qui primus ab oris' +
+    #13 + #10 + 'Italiam, fato profugus, Laviniaque venit' + #13 +
+    #10 + 'litora, multum ille et terris iactatus et alto' + #13 +
+    #10 + 'vi superum saevae memorem Iunonis ob iram;' + #13 + #10 +
+    'multa quoque et bello passus, dum conderet urbem,' + #13 + #10 +
+    'inferretque deos Latio, genus unde Latinum,' + #13 + #10 +
+    'Albanique patres, atque altae moenia Romae.' + #13 + #10 + #13 +
+    #10 + 'Musa, mihi causas memora, quo numine laeso,' + #13 + #10 +
+    'quidve dolens, regina deum tot volvere casus' + #13 + #10 +
+    'insignem pietate virum, tot adire labores' + #13 + #10 +
+    'impulerit.  Tantaene animis caelestibus irae?' + #13 + #10 +
+    #13 + #10 + 'Urbs antiqua fuit, Tyrii tenuere coloni,' + #13 +
+    #10 + 'Karthago, Italiam contra Tiberinaque longe' + #13 + #10 +
+    'ostia, dives opum studiisque asperrima belli;' + #13 + #10 +
+    'quam Iuno fertur terris magis omnibus unam' + #13 + #10 +
+    'posthabita coluisse Samo; hic illius arma,' + #13 + #10 +
+    'hic currus fuit; hoc regnum dea gentibus esse,' + #13 + #10 +
+    'si qua fata sinant, iam tum tenditque fovetque.' + #13 + #10 +
+    'Progeniem sed enim Troiano a sanguine duci' + #13 + #10 +
+    'audierat, Tyrias olim quae verteret arces;' + #13 + #10 +
+    'hinc populum late regem belloque superbum' + #13 + #10 +
+    'venturum excidio Libyae:  sic volvere Parcas.' + #13 + #10 +
+    'Id metuens, veterisque memor Saturnia belli,' + #13 + #10 +
+    'prima quod ad Troiam pro caris gesserat Argis---' + #13 + #10 +
+    'necdum etiam causae irarum saevique dolores' + #13 + #10 +
+    'exciderant animo:  manet alta mente repostum' + #13 + #10 +
+    'iudicium Paridis spretaeque iniuria formae,' + #13 + #10 +
+    'et genus invisum, et rapti Ganymedis honores.' + #13 + #10 +
+    'His accensa super, iactatos aequore toto' + #13 + #10 +
+    'Troas, reliquias Danaum atque immitis Achilli,' + #13 + #10 +
+    'arcebat longe Latio, multosque per annos' + #13 + #10 +
+    'errabant, acti fatis, maria omnia circum.' + #13 + #10 +
+    'Tantae molis erat Romanam condere gentem!';
+  RowNumber := RowNumber + 1;
+  FillRecord(RowNumber, Teststring, TestGUID, Testinteger, Testextended,
+    Testdatetime, Testboolean);
   FTestDataset.Post;
+
+  // Third row: empty/zero numerical values, dates/times, strings
+  FTestDataset.Append;
+  TestBoolean := False;
+  TestDateTime := EncodeDate(1, 1, 1) + EncodeTime(0, 0, 0, 0);
+  TestExtended := 0;
+  TestInteger := Round(TestExtended);
+  TestGuid := '{3F2504E0-4F89-11D3-9A0C-0305E82C3301}';
+  TestString := '';
+  RowNumber := RowNumber + 1;
+  FillRecord(RowNumber, Teststring, TestGUID, Testinteger, Testextended,
+    Testdatetime, Testboolean);
+  FTestDataset.Post;
+
+  // Fourth row: plausible data
+  FTestDataset.Append;
+  TestBoolean := True;
+  TestDateTime := EncodeDate(2005, 9, 10) + EncodeTime(13, 52, 18, 0);
+  TestExtended := 42;
+  TestInteger := Round(TestExtended);
+  TestString := 'The answer to life, the universe, and everything';
+  RowNumber := RowNumber + 1;
+  FillRecord(RowNumber, Teststring, TestGUID, Testinteger, Testextended,
+    Testdatetime, Testboolean);
+  FTestDataset.Post;
+
+  // Make sure recordcount is correct:
   FTestDataset.Last;
   FTestDataset.First;
-  AssertEquals('Number of records in test dataset', 2, FTestDataset.RecordCount);
+  AssertEquals('Number of records in test dataset', RowNumber, FTestDataset.RecordCount);
 end;
 
 procedure Ttestxmlxsdexport1.Setup;
+const
+  NumberOfDecimals = 2;
+  NumberOfBytes = 10;
 var
   FieldDef: TFieldDef;
 begin
   FExportTempDir := GetTempDir(False);
   FTestDataset := TBufDataset.Create(nil);
-  {for memds - or can we use the lines below, too?:
-  FTestDataset.FieldDefs.Add('IDINTEGER', ftInteger);
-  FTestDataset.FieldDefs.Add('NAMESTRING', ftString, 50);
-  //memds probably won't support memo
-  //TestDataset.FieldDefs.Add('REMARKSMEMO', ftMemo);
-  TestDataset.FieldDefs.Add('BIRTHDAYDATE', ftDate);
-  // No support for blobs in this dataset.
-  //TestDataset.FieldDefs.Add('CVBLOB', ftBlob); // A blob containing e.g. text
-  TestDataset.FieldDefs.Add('POCKETMONEYCURRENCY', ftCurrency);
+
+  {We should cover all data types defined in FPC:
+
+  FPC maps "external" types such as ftOracleBlob to
+  internal types, but that can be overridden, which is done
+  by e.g. IBX and mseide.
+  So it makes sense to keep as many datatypes in the exporter code as possible: it documents the mappings and allows other people to use these types without the exporter breaking.
   }
-  //for Bufdataset:
+  {Sorted by datatype; commented out what doesn't work at the moment in bufdataset
+  See http://docwiki.embarcadero.com/VCL/en/DB.TField.Size for overview of field sizes in the competition product ;)
+  Apparently ftGuid also needs size...
+  }
+
+  {
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'IDINTEGER';
-  FieldDef.DataType := ftInteger;
+  FieldDef.Name := 'ftADT';
+  FieldDef.DataType := ftADT;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+  }
 
+  {
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'NAMESTRING';
-  FieldDef.DataType := ftString;
-  FieldDef.Size := 50;
+  FieldDef.Name := 'ftArray';
+  FieldDef.DataType := ftArray;
+  FieldDef.Size := 10;//the number of elements in the array
 
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'REMARKSMEMO';
-  FieldDef.DataType := ftMemo;
+  FieldDef.Name := 'ftAutoInc';
+  FieldDef.DataType := ftAutoInc;
+  }
 
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'BIRTHDAYDATE';
-  FieldDef.DataType := ftDate;
+  FieldDef.Name := 'ftBCD';
+  FieldDef.DataType := ftBCD;
+  FieldDef.Size := NumberOfDecimals;
+  //Size is the number of digits after the decimal place
 
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'CVBLOB';
+  FieldDef.Name := 'ftBlob_4096';
   FieldDef.DataType := ftBlob;
-  FieldDef.Size := 16384;//large but hopefully not too large for memory.
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
 
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'POCKETMONEYCURRENCY';
+  FieldDef.Name := 'ftBoolean';
+  FieldDef.DataType := ftBoolean;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftBytes';
+  FieldDef.DataType := ftBytes;
+  FieldDef.Size := NumberOfBytes;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftCurrency';
   FieldDef.DataType := ftCurrency;
 
+  {
   FieldDef := FTestDataset.FieldDefs.AddFieldDef;
-  FieldDef.Name := 'NAUGHTYBOOLEAN';
-  FieldDef.DataType := ftBoolean;
+  FieldDef.Name := 'ftCursor';
+  FieldDef.DataType := ftCursor;
+  }
+
+  {
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftDataSet';
+  FieldDef.DataType := ftDataSet;
+  }
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftDate';
+  FieldDef.DataType := ftDate;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftDateTime';
+  FieldDef.DataType := ftDateTime;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftDBaseOle';
+  FieldDef.DataType := ftDBaseOle;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftFixedChar_2';
+  FieldDef.DataType := ftFixedChar;
+  FieldDef.Size := NumberOfDecimals;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftFixedWideChar_2';
+  FieldDef.DataType := ftFixedWideChar;
+  FieldDef.Size := NumberOfBytes;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftFloat';
+  FieldDef.DataType := ftFloat;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftFMTBcd';
+  FieldDef.DataType := ftFMTBcd;
+  FieldDef.Size := NumberOfDecimals; //the number of digits after the decimal place.
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftFmtMemo';
+  FieldDef.DataType := ftFmtMemo;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftGraphic';
+  FieldDef.DataType := ftGraphic;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftGuid';
+  FieldDef.DataType := ftGuid;
+  FieldDef.Size := 38;
+  //Apparently right answer is not 42; had to look up 38 in source code.
+
+  {
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftIDispatch';
+  FieldDef.DataType := ftIDispatch;
+  }
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftInteger';
+  FieldDef.DataType := ftInteger;
+
+  {
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftInterface';
+  FieldDef.DataType := ftInterface;
+  }
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftLargeint';
+  FieldDef.DataType := ftLargeint;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftMemo';
+  FieldDef.DataType := ftMemo;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftOraBlob';
+  FieldDef.DataType := ftOraBlob;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftOraClob';
+  FieldDef.DataType := ftOraClob;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftParadoxOle';
+  FieldDef.DataType := ftParadoxOle;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  {
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftReference';
+  FieldDef.DataType := ftReference;
+  }
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftSmallInt';
+  FieldDef.DataType := ftInteger;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftString_1';
+  FieldDef.DataType := ftString;
+  FieldDef.Size := 1;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftString_256'; //1 character more than many db string types support
+  FieldDef.DataType := ftString;
+  FieldDef.Size := 256;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftTime';
+  FieldDef.DataType := ftTime;
+
+  {
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftTimeStamp';
+  FieldDef.DataType := ftTimeStamp;
+  }
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftTypedBinary';
+  FieldDef.DataType := ftTypedBinary;
+  FieldDef.Size := 4096;//large but hopefully not too large for memory.
+
+  { ftVariant and ftVarBytes don't work; see bug 19930
+  However, there's more wront in bufdataset; if I don't
+  include these field definitions, I get access violations later on.}
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftVariant';
+  FieldDef.DataType := ftVariant;
+  FieldDef.Size := NumberOfBytes;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftVarBytes';
+  FieldDef.DataType := ftVarBytes;
+  FieldDef.Size := NumberOfBytes;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftWideMemo';
+  FieldDef.DataType := ftWideMemo;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftWideString256';
+  FieldDef.DataType := ftWideString;
+  FieldDef.Size := 256;
+
+  FieldDef := FTestDataset.FieldDefs.AddFieldDef;
+  FieldDef.Name := 'ftWord';
+  FieldDef.DataType := ftWord;
 
   //Createtable is needed if you use a memds
   //FTestDataset.CreateTable;
@@ -346,6 +614,77 @@ begin
   FillTestData;
 end;
 
+procedure Ttestxmlxsdexport1.FillRecord(const RowNumber: integer;
+  const TestString: string; const TestGUID: string; const TestInteger: integer;
+  const TestExtended: extended; const TestDatetime: Tdatetime;
+  const TestBoolean: boolean);
+var
+  FieldCounter: integer;
+begin
+  writeln('*** Starting to fill row ' + IntToStr(RowNumber));
+  {As our bufdataset doesn't support these datatypes, don't use them:
+ftAutoInc -> exists but doesn't seem to return any data.
+ftCursor
+ftDataSet
+ftInterface
+ftReference
+ftTimeStamp}
+
+  FTestDataset.FieldByName('ftBCD').AsFloat := Testextended;
+  FTestDataset.FieldByName('ftBlob_4096').AsString := Teststring;
+  FTestDataset.FieldByName('ftBoolean').AsBoolean := Testboolean;
+  FTestDataset.FieldByName('ftBytes').AsString := Teststring;
+  FTestDataset.FieldByName('ftCurrency').Ascurrency := Testextended;
+  FTestDataset.FieldByName('ftDate').AsDateTime := Testdatetime;
+  FTestDataset.FieldByName('ftDateTime').AsDateTime := Testdatetime;
+  FTestDataset.FieldByName('ftDBaseOle').AsString := Teststring;
+  FTestDataset.FieldByName('ftFixedChar_2').AsString := Teststring;
+  FTestDataset.FieldByName('ftFixedWideChar_2').AsString := Teststring;
+  FTestDataset.FieldByName('ftFloat').AsFloat := Testextended;
+  FTestDataset.FieldByName('ftFMTBcd').AsFloat := Testextended;
+  FTestDataset.FieldByName('ftFmtMemo').AsString := Teststring;
+  FTestDataset.FieldByName('ftGraphic').AsString := Teststring;
+  FTestDataset.FieldByName('ftGuid').AsString := TestGUID;
+  FTestDataset.FieldByName('ftInteger').AsInteger := Testinteger;
+  FTestDataset.FieldByName('ftLargeint').AsInteger := Testinteger;
+  FTestDataset.FieldByName('ftMemo').AsString := Teststring;
+  FTestDataset.FieldByName('ftOraBlob').AsString := Teststring;
+  FTestDataset.FieldByName('ftOraClob').AsString := Teststring;
+  FTestDataset.FieldByName('ftParadoxOle').AsString := Teststring;
+  FTestDataset.FieldByName('ftSmallInt').AsInteger := Testinteger;
+  FTestDataset.FieldByName('ftString_1').AsString := Teststring;
+  FTestDataset.FieldByName('ftString_256').AsString := Teststring;
+  FTestDataset.FieldByName('ftTime').AsDateTime := Testdatetime;
+  FTestDataset.FieldByName('ftTypedBinary').AsString := Teststring;
+  { ftVarBytes and ftVariant don't work; see bug 19930}
+  {
+  FTestDataSet.FieldByName('ftVarBytes').AsString := TestString;
+  FTestDataSet.FieldByName('ftVariant').AsString := TestString;
+  }
+  FTestDataset.FieldByName('ftWideMemo').AsString := Teststring;
+  FTestDataset.FieldByName('ftWideString256').AsString := Teststring;
+  FTestDataset.FieldByName('ftWord').AsInteger := Abs(Testinteger);
+  //If I keep the output code below on Win32, I don't get an access violation.
+  //If I remove it, I do. Probably bug 19930 again?
+  for Fieldcounter := 0 to FTestDataset.Fields.Count - 1 do
+  begin
+    try
+      writeln('Field: ' + FTestDataset.Fields[FieldCounter].FieldName +
+        ' has value ' + FTestDataset.Fields[FieldCounter].AsString);
+      {writeln('Field: ' + FTestDataset.Fields[FieldCounter].FieldName +
+        ' has displaytext ' + FTestDataset.Fields[FieldCounter].DisplayText);}
+    except
+      on E: Exception do
+      begin
+        writeln('Field: ' + FTestDataset.Fields[FieldCounter].FieldName +
+          ': error retrieving value: ');
+        writeln(E.ClassName, '; detailed error message: ', E.message);
+      end;
+    end;
+  end;
+  writeln('*** Finished filling row ' + IntToStr(RowNumber));
+end;
+
 procedure Ttestxmlxsdexport1.Teardown;
 begin
   FTestDataset.Free;