[Instantobjects-cvscommit] Source/Tests TestInstantScheme.pas,1.3,1.4

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28465/Tests

Modified Files:
	TestInstantScheme.pas 
Log Message:
changes to support the database evolution refactorings

Index: TestInstantScheme.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Tests/TestInstantScheme.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestInstantScheme.pas	10 Jun 2005 01:25:34 -0000	1.3
--- TestInstantScheme.pas	18 Jun 2005 09:55:24 -0000	1.4
***************
*** 7,14 ****
  type
  
!   // Test methods for class TInstantRelationalScheme
!   TestTInstantRelationalScheme = class(TTestCase)
    private
!     FInstantRelationalScheme: TInstantRelationalScheme;
    public
      procedure SetUp; override;
--- 7,14 ----
  type
  
!   // Test methods for class TInstantScheme
!   TestTInstantScheme = class(TTestCase)
    private
!     FInstantScheme: TInstantScheme;
    public
      procedure SetUp; override;
***************
*** 27,31 ****
  uses SysUtils, testregistry, InstantClasses, InstantConsts;
  
! procedure TestTInstantRelationalScheme.SetUp;
  begin
    if InstantModel.ClassMetadatas.Count > 0 then
--- 27,31 ----
  uses SysUtils, testregistry, InstantClasses, InstantConsts;
  
! procedure TestTInstantScheme.SetUp;
  begin
    if InstantModel.ClassMetadatas.Count > 0 then
***************
*** 33,55 ****
    InstantModel.LoadFromResFile(ChangeFileExt(ParamStr(0), '.mdr'));
  
!   FInstantRelationalScheme := TInstantRelationalScheme.Create(InstantModel);
  end;
  
! procedure TestTInstantRelationalScheme.TearDown;
  begin
    InstantModel.ClassMetadatas.Clear;
!   FreeAndNil(FInstantRelationalScheme);
  end;
  
! procedure TestTInstantRelationalScheme.TestBlobStreamFormat;
  begin
    AssertTrue('BlobStreamFormat',
!     sfBinary = FInstantRelationalScheme.BlobStreamFormat);
!   FInstantRelationalScheme.BlobStreamFormat := sfXML;
    AssertTrue('BlobStreamFormat',
!     sfXML = FInstantRelationalScheme.BlobStreamFormat);
  end;
  
! procedure TestTInstantRelationalScheme.TestFindTableMetadata;
  var
    vReturnValue: TInstantTableMetadata;
--- 33,56 ----
    InstantModel.LoadFromResFile(ChangeFileExt(ParamStr(0), '.mdr'));
  
!   FInstantScheme := TInstantScheme.Create;
!   FInstantScheme.Catalog := TInstantModelCatalog.Create(FInstantScheme, InstantModel);
  end;
  
! procedure TestTInstantScheme.TearDown;
  begin
    InstantModel.ClassMetadatas.Clear;
!   FreeAndNil(FInstantScheme);
  end;
  
! procedure TestTInstantScheme.TestBlobStreamFormat;
  begin
    AssertTrue('BlobStreamFormat',
!     sfBinary = FInstantScheme.BlobStreamFormat);
!   FInstantScheme.BlobStreamFormat := sfXML;
    AssertTrue('BlobStreamFormat',
!     sfXML = FInstantScheme.BlobStreamFormat);
  end;
  
! procedure TestTInstantScheme.TestFindTableMetadata;
  var
    vReturnValue: TInstantTableMetadata;
***************
*** 57,90 ****
  begin
    vName := 'Contact';
!   vReturnValue := FInstantRelationalScheme.FindTableMetadata(vName);
    AssertNotNull('Could not find TableMetadata!', vReturnValue);
    AssertEquals('', vName, vReturnValue.Name);
  end;
  
! procedure TestTInstantRelationalScheme.TestIdDataType;
  begin
!   AssertTrue('IdDataType', dtString = FInstantRelationalScheme.IdDataType);
!   FInstantRelationalScheme.IdDataType := dtInteger;
!   AssertTrue('IdDataType', dtInteger = FInstantRelationalScheme.IdDataType);
  end;
  
! procedure TestTInstantRelationalScheme.TestIdSize;
  begin
    AssertEquals(InstantDefaultFieldSize,
!     FInstantRelationalScheme.IdSize);
!   FInstantRelationalScheme.IdSize := 10;
!   AssertEquals(10, FInstantRelationalScheme.IdSize);
  end;
  
! procedure TestTInstantRelationalScheme.TestTableMetadataCount;
  begin
!   AssertEquals(8, FInstantRelationalScheme.TableMetadataCount);
  end;
  
! procedure TestTInstantRelationalScheme.TestTableMetadatas;
  var
    vReturnValue: TInstantTableMetadata;
  begin
!   vReturnValue := FInstantRelationalScheme.TableMetadatas[0];
    AssertNotNull(vReturnValue);
    AssertEquals('Address', vReturnValue.Name);
--- 58,91 ----
  begin
    vName := 'Contact';
!   vReturnValue := FInstantScheme.FindTableMetadata(vName);
    AssertNotNull('Could not find TableMetadata!', vReturnValue);
    AssertEquals('', vName, vReturnValue.Name);
  end;
  
! procedure TestTInstantScheme.TestIdDataType;
  begin
!   AssertTrue('IdDataType', dtString = FInstantScheme.IdDataType);
!   FInstantScheme.IdDataType := dtInteger;
!   AssertTrue('IdDataType', dtInteger = FInstantScheme.IdDataType);
  end;
  
! procedure TestTInstantScheme.TestIdSize;
  begin
    AssertEquals(InstantDefaultFieldSize,
!     FInstantScheme.IdSize);
!   FInstantScheme.IdSize := 10;
!   AssertEquals(10, FInstantScheme.IdSize);
  end;
  
! procedure TestTInstantScheme.TestTableMetadataCount;
  begin
!   AssertEquals(8, FInstantScheme.TableMetadataCount);
  end;
  
! procedure TestTInstantScheme.TestTableMetadatas;
  var
    vReturnValue: TInstantTableMetadata;
  begin
!   vReturnValue := FInstantScheme.TableMetadatas[0];
    AssertNotNull(vReturnValue);
    AssertEquals('Address', vReturnValue.Name);
***************
*** 94,98 ****
    // Register any test cases with the test runner
  {$IFNDEF CURR_TESTS}
!   RegisterTests([TestTInstantRelationalScheme]);
  {$ENDIF}
  
--- 95,99 ----
    // Register any test cases with the test runner
  {$IFNDEF CURR_TESTS}
!   RegisterTests([TestTInstantScheme]);
  {$ENDIF}