Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects:[913] trunk
|
From: <dav...@us...> - 2010-09-15 02:55:48
|
Revision: 913
http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=913&view=rev
Author: davidvtaylor
Date: 2010-09-15 02:55:41 +0000 (Wed, 15 Sep 2010)
Log Message:
-----------
* Fix deprecation warnings in the TestIO unit test runner when compiled with Delphi XE
+ Add Delphi XE specific version of TestIO (Delphi XE uses a new project file version)
Modified Paths:
--------------
trunk/Source/PackageGroups/D2011/CorePackages.groupproj
trunk/Tests/TestInstantClasses.pas
trunk/Tests/TestInstantCurrency.pas
trunk/Tests/TestInstantFloat.pas
trunk/Tests/TestInstantNumeric.pas
trunk/Tests/TestInstantRtti.pas
trunk/Tests/TestInstantString.pas
Added Paths:
-----------
trunk/Tests/TestIO_D2011.dpr
trunk/Tests/TestIO_D2011.res
Modified: trunk/Source/PackageGroups/D2011/CorePackages.groupproj
===================================================================
--- trunk/Source/PackageGroups/D2011/CorePackages.groupproj 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Source/PackageGroups/D2011/CorePackages.groupproj 2010-09-15 02:55:41 UTC (rev 913)
@@ -21,7 +21,7 @@
<Projects Include="..\..\Brokers\XML\D2011\DclIOXML.dproj">
<Dependencies/>
</Projects>
- <Projects Include="..\..\..\Tests\TestIO_D2009.dproj">
+ <Projects Include="..\..\..\Tests\TestIO_D2011.dproj">
<Dependencies/>
</Projects>
</ItemGroup>
@@ -86,23 +86,23 @@
<Target Name="DclIOXML:Make">
<MSBuild Targets="Make" Projects="..\..\Brokers\XML\D2011\DclIOXML.dproj"/>
</Target>
- <Target Name="TestIO_D2009">
- <MSBuild Projects="..\..\..\Tests\TestIO_D2009.dproj"/>
+ <Target Name="TestIO_D2011">
+ <MSBuild Projects="..\..\..\Tests\TestIO_D2011.dproj"/>
</Target>
- <Target Name="TestIO_D2009:Clean">
- <MSBuild Targets="Clean" Projects="..\..\..\Tests\TestIO_D2009.dproj"/>
+ <Target Name="TestIO_D2011:Clean">
+ <MSBuild Targets="Clean" Projects="..\..\..\Tests\TestIO_D2011.dproj"/>
</Target>
- <Target Name="TestIO_D2009:Make">
- <MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_D2009.dproj"/>
+ <Target Name="TestIO_D2011:Make">
+ <MSBuild Targets="Make" Projects="..\..\..\Tests\TestIO_D2011.dproj"/>
</Target>
<Target Name="Build">
- <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_D2009"/>
+ <CallTarget Targets="IOCore;DclIOCore;IOBDE;DclIOBDE;IOXML;DclIOXML;TestIO_D2011"/>
</Target>
<Target Name="Clean">
- <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_D2009:Clean"/>
+ <CallTarget Targets="IOCore:Clean;DclIOCore:Clean;IOBDE:Clean;DclIOBDE:Clean;IOXML:Clean;DclIOXML:Clean;TestIO_D2011:Clean"/>
</Target>
<Target Name="Make">
- <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_D2009:Make"/>
+ <CallTarget Targets="IOCore:Make;DclIOCore:Make;IOBDE:Make;DclIOBDE:Make;IOXML:Make;DclIOXML:Make;TestIO_D2011:Make"/>
</Target>
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
</Project>
Added: trunk/Tests/TestIO_D2011.dpr
===================================================================
--- trunk/Tests/TestIO_D2011.dpr (rev 0)
+++ trunk/Tests/TestIO_D2011.dpr 2010-09-15 02:55:41 UTC (rev 913)
@@ -0,0 +1,68 @@
+program TestIO_D2011;
+
+{$I '..\Source\InstantDefines.inc'}
+
+{$IFDEF FPC}
+{$mode objfpc}{$H+}
+{$ENDIF}
+
+uses
+ Forms,
+ guitestrunner,
+ fpcunit,
+ testregistry,
+ testutils,
+ testreport,
+ InstantPersistence,
+ InstantMock in 'InstantMock.pas',
+ TestMockConnector in 'TestMockConnector.pas',
+ TestMockBroker in 'TestMockBroker.pas',
+ TestModel in 'TestModel.pas',
+ TestInstantMetadata in 'TestInstantMetadata.pas',
+ TestInstantFieldMetadata in 'TestInstantFieldMetadata.pas',
+ TestInstantClassMetadata in 'TestInstantClassMetadata.pas',
+ TestInstantAttributeMetadata in 'TestInstantAttributeMetadata.pas',
+ TestInstantIndexMetadata in 'TestInstantIndexMetadata.pas',
+ TestInstantTableMetadata in 'TestInstantTableMetadata.pas',
+ TestInstantScheme in 'TestInstantScheme.pas',
+ TestInstantClasses in 'TestInstantClasses.pas',
+ TestInstantRtti in 'TestInstantRtti.pas',
+ TestMinimalModel in 'TestMinimalModel.pas',
+ TestInstantAttributeMap in 'TestInstantAttributeMap.pas',
+ TestInstantAttribute in 'TestInstantAttribute.pas',
+ TestInstantNumeric in 'TestInstantNumeric.pas',
+ TestInstantInteger in 'TestInstantInteger.pas',
+ TestInstantString in 'TestInstantString.pas',
+ TestInstantDateTime in 'TestInstantDateTime.pas',
+ TestInstantDate in 'TestInstantDate.pas',
+ TestInstantTime in 'TestInstantTime.pas',
+ TestInstantBoolean in 'TestInstantBoolean.pas',
+ TestInstantFloat in 'TestInstantFloat.pas',
+ TestInstantCurrency in 'TestInstantCurrency.pas',
+ TestInstantBlob in 'TestInstantBlob.pas',
+ TestInstantComplex in 'TestInstantComplex.pas',
+ TestInstantPart in 'TestInstantPart.pas',
+ TestInstantReference in 'TestInstantReference.pas',
+ TestInstantObject in 'TestInstantObject.pas',
+ TestInstantObjectState in 'TestInstantObjectState.pas',
+ TestInstantCache in 'TestInstantCache.pas',
+ TestInstantObjectStore in 'TestInstantObjectStore.pas',
+ TestInstantParts in 'TestInstantParts.pas',
+ TestInstantReferences in 'TestInstantReferences.pas',
+ TestInstantCircularReferences in 'TestInstantCircularReferences.pas',
+ TestInstantObjectReference in 'TestInstantObjectReference.pas',
+ MinimalModel in 'MinimalModel.pas',
+ TestXMLBroker in 'TestXMLBroker.pas',
+ TestInstantCode in 'TestInstantCode.pas';
+
+{$R *.res}
+{$R *.mdr} {TestModel}
+
+begin
+ Application.Initialize;
+ InstantModel.ClassMetadatas.Clear;
+ Application.CreateForm(TGUITestRunner, TestRunner);
+ //Application.CreateForm(TTestRunner, TestRunner);
+ Application.Run;
+end.
+
Property changes on: trunk/Tests/TestIO_D2011.dpr
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Added: trunk/Tests/TestIO_D2011.res
===================================================================
(Binary files differ)
Property changes on: trunk/Tests/TestIO_D2011.res
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/Tests/TestInstantClasses.pas
===================================================================
--- trunk/Tests/TestInstantClasses.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantClasses.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantClasses;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses
@@ -400,7 +406,8 @@
AssertEquals('TInstantGuineaPig', ic.Reader.ReadStr); //la stringa con il classname
c.ConvertToText(ic);
ic.Producer.eof; //to flush the buffer
- AssertEquals('ConvertToText', '<Age>2</Age>' + LLineBreak + '<Weight>1' + DecimalSeparator +
+ AssertEquals('ConvertToText', '<Age>2</Age>' + LLineBreak + '<Weight>1' +
+ {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
'123</Weight>' + LLineBreak + '<PigName>Miss piggy</PigName>' + LLineBreak, outs.DataString);
finally
ic.Free;
@@ -420,7 +427,8 @@
InstantObjectBinaryToText(ins, outs);
AssertEquals('InstantObjectBinaryToText',
'<TInstantGuineaPig>' + LLineBreak + LIndentation + '<Age>2</Age>' + LLineBreak + LIndentation +
- '<Weight>1' + DecimalSeparator + '123</Weight>' + LLineBreak + LIndentation +
+ '<Weight>1' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '123</Weight>' + LLineBreak + LIndentation +
'<PigName>Miss piggy</PigName>' + LLineBreak + '</TInstantGuineaPig>' + LLineBreak,
outs.DataString);
finally
@@ -454,7 +462,8 @@
AssertEquals('InstantWriteObject(sfXML)',
'<TInstantGuineaPig>' + LLineBreak + LIndentation + '<Age>2</Age>' + LLineBreak + LIndentation +
- '<Weight>1' + DecimalSeparator + '123</Weight>' + LLineBreak + LIndentation +
+ '<Weight>1' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '123</Weight>' + LLineBreak + LIndentation +
'<PigName>Miss piggy</PigName>' + LLineBreak + '</TInstantGuineaPig>' + LLineBreak,
ms.DataString);
finally
Modified: trunk/Tests/TestInstantCurrency.pas
===================================================================
--- trunk/Tests/TestInstantCurrency.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantCurrency.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantCurrency;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses fpcunit, InstantPersistence, InstantMock, TestModel;
@@ -128,9 +134,11 @@
procedure TestTInstantCurrency.TestAsString;
begin
- FInstantCurrency.AsString := '15' + DecimalSeparator + '7';
+ FInstantCurrency.AsString := '15' +
+ {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator + '7';
AssertEquals(15.7, FInstantCurrency.Value);
- AssertEquals('15' + DecimalSeparator + '7', FInstantCurrency.AsString);
+ AssertEquals('15' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '7', FInstantCurrency.AsString);
end;
procedure TestTInstantCurrency.TestAsVariant;
@@ -147,7 +155,8 @@
FInstantCurrency.Reset;
AssertEquals(1.3, FInstantCurrency.Value);
- FInstantCurrency.Metadata.DefaultValue := '15' + DecimalSeparator + '7';
+ FInstantCurrency.Metadata.DefaultValue := '15' +
+ {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator + '7';
FInstantCurrency.Reset;
AssertEquals(15.7, FInstantCurrency.Value);
Modified: trunk/Tests/TestInstantFloat.pas
===================================================================
--- trunk/Tests/TestInstantFloat.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantFloat.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantFloat;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses fpcunit, InstantPersistence, InstantMock, TestModel;
@@ -123,9 +129,11 @@
procedure TestTInstantFloat.TestAsString;
begin
- FInstantFloat.AsString := '1' + DecimalSeparator + '3';
+ FInstantFloat.AsString := '1' +
+ {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator + '3';
AssertEquals(1.3, FInstantFloat.Value);
- AssertEquals('1' + DecimalSeparator + '3', FInstantFloat.AsString);
+ AssertEquals('1' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '3', FInstantFloat.AsString);
end;
procedure TestTInstantFloat.TestAsVariant;
@@ -142,7 +150,8 @@
FInstantFloat.Reset;
AssertEquals(1.3, FInstantFloat.Value);
- FInstantFloat.Metadata.DefaultValue := '15' + DecimalSeparator + '7';
+ FInstantFloat.Metadata.DefaultValue := '15' +
+ {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator + '7';
FInstantFloat.Reset;
AssertEquals(15.7, FInstantFloat.Value);
Modified: trunk/Tests/TestInstantNumeric.pas
===================================================================
--- trunk/Tests/TestInstantNumeric.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantNumeric.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantNumeric;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses fpcunit, InstantPersistence, InstantMock, TestModel;
@@ -134,7 +140,8 @@
FInstantNumeric.Value := 1000;
FInstantNumeric.Metadata.EditMask := '#,000'; //EditMask don't use ThousandSeparator var
- AssertEquals('1' + ThousandSeparator + '000', FInstantNumeric.DisplayText);
+ AssertEquals('1' + {$IFDEF D15+}FormatSettings.{$ENDIF}ThousandSeparator +
+ '000', FInstantNumeric.DisplayText);
end;
procedure TestTInstantNumeric.TestIsDefault;
Modified: trunk/Tests/TestInstantRtti.pas
===================================================================
--- trunk/Tests/TestInstantRtti.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantRtti.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantRtti;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses
@@ -190,8 +196,8 @@
var
ds, ts : string;
begin
- ds := DateSeparator;
- ts := TimeSeparator;
+ ds := {$IFDEF D15+}FormatSettings.{$ENDIF}DateSeparator;
+ ts := {$IFDEF D15+}FormatSettings.{$ENDIF}TimeSeparator;
AssertEquals('123', FormatMaskText('###','1234'));
AssertEquals('(123)_ - ', FormatMaskText('(000)_000-0000;0;*','123'));
@@ -209,7 +215,7 @@
AssertEquals('13'+ds+'02'+ds+'95',FormatMaskText('!99/99/00;0;','130295'));
AssertEquals('13'+ds+'02'+ds+'1995',FormatMaskText('!99/99/\1\900;0;','130295'));
AssertEquals('13 Gen 1995',FormatMaskText('!99 >L<LL \1\900;0;','13Gen95'));
- AssertEquals('21'+ts+'05'+TimeSeparator+'15',FormatMaskText('!90:00:00;0;','210515'));
+ AssertEquals('21'+ts+'05'+{$IFDEF D15+}FormatSettings.{$ENDIF}TimeSeparator+'15',FormatMaskText('!90:00:00;0;','210515'));
AssertEquals('13'+ts+'45',FormatMaskText('!90:00;0;','1345'));
end;
Modified: trunk/Tests/TestInstantString.pas
===================================================================
--- trunk/Tests/TestInstantString.pas 2010-09-15 02:38:52 UTC (rev 912)
+++ trunk/Tests/TestInstantString.pas 2010-09-15 02:55:41 UTC (rev 913)
@@ -30,6 +30,12 @@
unit TestInstantString;
+{$IFDEF LINUX}
+{$I '../../InstantDefines.inc'}
+{$ELSE}
+{$I '..\..\InstantDefines.inc'}
+{$ENDIF}
+
interface
uses fpcunit, InstantPersistence, InstantMock, TestModel;
@@ -104,7 +110,8 @@
begin
vCurr := 23.45;
FInstantString.AsCurrency := vCurr;
- AssertEquals('23' + DecimalSeparator + '45', FInstantString.Value);
+ AssertEquals('23' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '45', FInstantString.Value);
AssertEquals(vCurr, FInstantString.AsCurrency);
end;
@@ -118,7 +125,8 @@
procedure TestTInstantString.TestAsFloat;
begin
FInstantString.AsFloat := 89.45;
- AssertEquals('89' + DecimalSeparator + '45', FInstantString.Value);
+ AssertEquals('89' + {$IFDEF D15+}FormatSettings.{$ENDIF}DecimalSeparator +
+ '45', FInstantString.Value);
AssertEquals(89.45, FInstantString.AsFloat);
end;
|
