Skip to content

Commit 6aa988e

Browse files
vincentparrettvincentparrett
committed
Future proofing inc file.
1 parent ab4b59b commit 6aa988e

25 files changed

+1458
-793
lines changed

‎Examples/DUnitX.Examples.General.pas

+4-6
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ implementation
171171
{$ELSE}
172172
SysUtils,
173173
Classes,
174-
{$IFDEF DELPHI_2010_DOWN}
175-
//D2010 doesn't have TThread.Sleep
176-
Windows,
177-
{$ENDIF}
174+
{$IFDEF DELPHI_2010}
175+
//D2010 doesn't have TThread.Sleep
176+
Windows,
177+
{$ENDIF}
178178
{$ENDIF}
179179
DUnitX.DUnitCompatibility;
180180

@@ -357,11 +357,9 @@ initialization
357357
//manual registration for now.
358358

359359
//Register the test fixtures
360-
//{$IFNDEF DELPHI_XE_UP}
361360
TDUnitX.RegisterTestFixture(TMyExampleTests);
362361
TDUnitX.RegisterTestFixture(TExampleFixture2);
363362
TDUnitX.RegisterTestFixture(TExampleFixture3);
364363
TDUnitX.RegisterTestFixture(TExampleFixture5);
365364
TDUnitX.RegisterTestFixture(TExampleFixture7);
366-
//{$ENDIF}
367365
end.

‎Examples/DUnitXExamples_XE2.dproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<Base>true</Base>
6060
</PropertyGroup>
6161
<PropertyGroup Condition="'$(Base)'!=''">
62-
<DCC_UnitSearchPath>..\;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
62+
<DCC_UnitSearchPath>..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6363
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
6464
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
6565
<Manifest_File>None</Manifest_File>

‎Examples/DUnitXExamples_XE3.dproj

+49-43
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Base>true</Base>
7171
</PropertyGroup>
7272
<PropertyGroup Condition="'$(Base)'!=''">
73-
<DCC_UnitSearchPath>..\;$(DelphiMocks);..\..\Delphi-Mocks;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
73+
<DCC_UnitSearchPath>..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
7474
<DCC_DcuOutput>.\$(Platform)\$(Config)</DCC_DcuOutput>
7575
<DCC_ExeOutput>.\$(Platform)\$(Config)</DCC_ExeOutput>
7676
<Manifest_File>None</Manifest_File>
@@ -111,54 +111,55 @@
111111
<Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
112112
</PropertyGroup>
113113
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
114+
<DCC_UnitSearchPath>..\..\Delphi-Mock;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
114115
<VerInfo_Locale>1033</VerInfo_Locale>
115116
</PropertyGroup>
116117
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
117118
<DCC_DebugDCUs>true</DCC_DebugDCUs>
118119
<VerInfo_Locale>1033</VerInfo_Locale>
119120
</PropertyGroup>
120121
<ItemGroup>
121-
<DelphiCompile Include="$(MainSource)">
122-
<MainSource>MainSource</MainSource>
123-
</DelphiCompile>
124-
<DCCReference Include="DUnitX.Examples.General.pas"/>
125-
<DCCReference Include="..\Source\DUnitX.Loggers.Text.pas"/>
126-
<DCCReference Include="..\Source\DUnitX.Loggers.XML.NUnit.pas"/>
127-
<DCCReference Include="..\Source\DUnitX.Loggers.XML.xUnit.pas"/>
128-
<DCCReference Include="..\Source\DUnitX.MacOS.Console.pas"/>
129-
<DCCReference Include="..\Source\DUnitX.Test.pas"/>
130-
<DCCReference Include="..\Source\DUnitX.TestFixture.pas"/>
131-
<DCCReference Include="..\Source\DUnitX.TestFramework.pas"/>
132-
<DCCReference Include="..\Source\DUnitX.TestResult.pas"/>
133-
<DCCReference Include="..\Source\DUnitX.RunResults.pas"/>
134-
<DCCReference Include="..\Source\DUnitX.TestRunner.pas"/>
135-
<DCCReference Include="..\Source\DUnitX.Utils.pas"/>
136-
<DCCReference Include="..\Source\DUnitX.Utils.XML.pas"/>
137-
<DCCReference Include="..\Source\DUnitX.WeakReference.pas"/>
138-
<DCCReference Include="..\Source\DUnitX.Windows.Console.pas"/>
139-
<DCCReference Include="..\Source\DUnitX.StackTrace.EurekaLog7.pas"/>
140-
<DCCReference Include="NonNamespacedExample.pas"/>
141-
<DCCReference Include="DUnitX.Examples.EqualityAsserts.pas"/>
142-
<DCCReference Include="..\Source\DUnitX.Loggers.Null.pas"/>
143-
<DCCReference Include="..\Source\DUnitX.MemoryLeakMonitor.Default.pas"/>
144-
<DCCReference Include="..\Source\DUnitX.AutoDetect.Console.pas"/>
145-
<DCCReference Include="..\Source\DUnitX.ConsoleWriter.Base.pas"/>
146-
<DCCReference Include="..\Source\DUnitX.DUnitCompatibility.pas"/>
147-
<DCCReference Include="..\Source\DUnitX.Extensibility.pas"/>
148-
<DCCReference Include="..\Source\DUnitX.Extensibility.PluginManager.pas"/>
149-
<DCCReference Include="..\Source\DUnitX.FixtureProviderPlugin.pas"/>
150-
<DCCReference Include="..\Source\DUnitX.FixtureResult.pas"/>
151-
<DCCReference Include="..\Source\DUnitX.Generics.pas"/>
152-
<DCCReference Include="..\Source\DUnitX.InternalInterfaces.pas"/>
153-
<DCCReference Include="..\Source\DUnitX.IoC.pas"/>
154-
<DCCReference Include="..\Source\DUnitX.Loggers.Console.pas"/>
155-
<DCCReference Include="..\Source\DUnitX.CommandLine.OptionDef.pas"/>
156-
<DCCReference Include="..\Source\DUnitX.CommandLine.Options.pas"/>
157-
<DCCReference Include="..\Source\DUnitX.CommandLine.Parser.pas"/>
158-
<DCCReference Include="..\Source\DUnitX.OptionsDefinition.pas"/>
159-
<DCCReference Include="..\Source\DUnitX.Banner.pas"/>
160-
<DCCReference Include="..\Source\DUnitX.Filters.pas"/>
161-
<DCCReference Include="..\Source\DUnitX.Init.pas"/>
122+
<DelphiCompile Include="$(MainSource)">
123+
<MainSource>MainSource</MainSource>
124+
</DelphiCompile>
125+
<DCCReference Include="DUnitX.Examples.General.pas"/>
126+
<DCCReference Include="..\Source\DUnitX.Loggers.Text.pas"/>
127+
<DCCReference Include="..\Source\DUnitX.Loggers.XML.NUnit.pas"/>
128+
<DCCReference Include="..\Source\DUnitX.Loggers.XML.xUnit.pas"/>
129+
<DCCReference Include="..\Source\DUnitX.MacOS.Console.pas"/>
130+
<DCCReference Include="..\Source\DUnitX.Test.pas"/>
131+
<DCCReference Include="..\Source\DUnitX.TestFixture.pas"/>
132+
<DCCReference Include="..\Source\DUnitX.TestFramework.pas"/>
133+
<DCCReference Include="..\Source\DUnitX.TestResult.pas"/>
134+
<DCCReference Include="..\Source\DUnitX.RunResults.pas"/>
135+
<DCCReference Include="..\Source\DUnitX.TestRunner.pas"/>
136+
<DCCReference Include="..\Source\DUnitX.Utils.pas"/>
137+
<DCCReference Include="..\Source\DUnitX.Utils.XML.pas"/>
138+
<DCCReference Include="..\Source\DUnitX.WeakReference.pas"/>
139+
<DCCReference Include="..\Source\DUnitX.Windows.Console.pas"/>
140+
<DCCReference Include="..\Source\DUnitX.StackTrace.EurekaLog7.pas"/>
141+
<DCCReference Include="NonNamespacedExample.pas"/>
142+
<DCCReference Include="DUnitX.Examples.EqualityAsserts.pas"/>
143+
<DCCReference Include="..\Source\DUnitX.Loggers.Null.pas"/>
144+
<DCCReference Include="..\Source\DUnitX.MemoryLeakMonitor.Default.pas"/>
145+
<DCCReference Include="..\Source\DUnitX.AutoDetect.Console.pas"/>
146+
<DCCReference Include="..\Source\DUnitX.ConsoleWriter.Base.pas"/>
147+
<DCCReference Include="..\Source\DUnitX.DUnitCompatibility.pas"/>
148+
<DCCReference Include="..\Source\DUnitX.Extensibility.pas"/>
149+
<DCCReference Include="..\Source\DUnitX.Extensibility.PluginManager.pas"/>
150+
<DCCReference Include="..\Source\DUnitX.FixtureProviderPlugin.pas"/>
151+
<DCCReference Include="..\Source\DUnitX.FixtureResult.pas"/>
152+
<DCCReference Include="..\Source\DUnitX.Generics.pas"/>
153+
<DCCReference Include="..\Source\DUnitX.InternalInterfaces.pas"/>
154+
<DCCReference Include="..\Source\DUnitX.IoC.pas"/>
155+
<DCCReference Include="..\Source\DUnitX.Loggers.Console.pas"/>
156+
<DCCReference Include="..\Source\DUnitX.CommandLine.OptionDef.pas"/>
157+
<DCCReference Include="..\Source\DUnitX.CommandLine.Options.pas"/>
158+
<DCCReference Include="..\Source\DUnitX.CommandLine.Parser.pas"/>
159+
<DCCReference Include="..\Source\DUnitX.OptionsDefinition.pas"/>
160+
<DCCReference Include="..\Source\DUnitX.Banner.pas"/>
161+
<DCCReference Include="..\Source\DUnitX.Filters.pas"/>
162+
<DCCReference Include="..\Source\DUnitX.Init.pas"/>
162163
<BuildConfiguration Include="Debug">
163164
<Key>Cfg_2</Key>
164165
<CfgParent>Base</CfgParent>
@@ -212,7 +213,12 @@
212213
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
213214
<VersionInfoKeys Name="Comments"/>
214215
</VersionInfoKeys>
215-
<Excluded_Packages/>
216+
<Excluded_Packages>
217+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k170.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
218+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp170.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
219+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k170.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
220+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp170.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
221+
</Excluded_Packages>
216222
</Delphi.Personality>
217223
<Platforms>
218224
<Platform value="OSX32">False</Platform>

‎Expert/DUnitX.Expert.CodeGen.NewTestProject.pas

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ interface
3737
type
3838
TReportLeakOptions = (rloNone, rloFastMM4, rloFastMM5);
3939

40-
TTestProjectFile = class({$IFNDEF DELPHIX_SEATTLE_UP}TNewProject{$ELSE}TNewProjectEx{$ENDIF})
40+
TTestProjectFile = class({$IFNDEF DELPHI_SEATTLE_UP}TNewProject{$ELSE}TNewProjectEx{$ENDIF})
4141
private
4242
FReportLeakOptions: TReportLeakOptions;
4343
protected
@@ -74,18 +74,18 @@ constructor TTestProjectFile.Create(const ReportLeakOptions: TReportLeakOptions)
7474
constructor TTestProjectFile.Create(const APersonality: String; const ReportLeakOptions: TReportLeakOptions);
7575
begin
7676
Create(ReportLeakOptions);
77-
{$IFDEF DELPHIX_SEATTLE_UP}
77+
{$IFDEF DELPHI_SEATTLE_UP}
7878
Personality := APersonality;
7979
{$ENDIF}
8080
end;
8181

8282
function TTestProjectFile.NewProjectSource(const ProjectName: string): IOTAFile;
83-
{$IFDEF DELPHIX_SEATTLE_UP}
83+
{$IFDEF DELPHI_SEATTLE_UP}
8484
var
8585
TestProjectCode: string;
8686
{$ENDIF}
8787
begin
88-
{$IFNDEF DELPHIX_SEATTLE_UP}
88+
{$IFNDEF DELPHI_SEATTLE_UP}
8989
result := TSourceFile.Create(STestDPR,[ProjectName, REPORT_LEAK_DECLARATION[FReportLeakOptions]]);
9090
{$ELSE}
9191
if Personality.isEmpty or SameText(Personality, sDelphiPersonality) then

‎Source/DUnitX.Assert.pas

+24-6
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,14 @@ Assert = class
7777
class procedure AreEqual(const expected, actual : Currency; const message : string = '');overload;
7878
class procedure AreEqual(const expected, actual : TClass; const message : string = '');overload;
7979
class procedure AreEqual(const expected, actual : TStream; const message : string = '');overload;
80-
{$IFNDEF DELPHI_XE_DOWN}
80+
{$IFDEF DELPHI_XE2_UP}
8181
//Delphi 2010 and XE compiler bug breaks this
8282
class procedure AreEqual<T>(const expected, actual : T; const message : string = '');overload;
8383
class procedure AreEqual<T>(const expected, actual : TArray<T>; const message : string = '');overload;
8484
{$ENDIF}
8585
class procedure AreEqual(const expected, actual : word; const message : string = '');overload;
8686
class procedure AreEqual(const expected, actual : Integer; const message : string = '');overload;
87+
class procedure AreEqual(const expected, actual : Int64; const message : string = '');overload;
8788
class procedure AreEqual(const expected, actual : cardinal; const message : string = '');overload;
8889
class procedure AreEqual(const expected, actual : boolean; const message : string = '');overload;
8990

@@ -107,11 +108,12 @@ Assert = class
107108
class procedure AreNotEqual(const expected, actual : TClass; const message : string = '');overload;
108109

109110
class procedure AreNotEqual(const expected, actual : TStream; const message : string = '');overload;
110-
{$IFNDEF DELPHI_XE_DOWN}
111+
{$IFDEF DELPHI_XE2_UP}
111112
//Delphi 2010 and XE compiler bug breaks this
112113
class procedure AreNotEqual<T>(const expected, actual : T; const message : string = '');overload;
113114
{$ENDIF}
114115
class procedure AreNotEqual(const expected, actual : Integer; const message : string = '');overload;
116+
class procedure AreNotEqual(const expected, actual : Int64; const message : string = '');overload;
115117
class procedure AreNotEqual(const expected, actual : TGUID; const message : string = '');overload;
116118
class procedure AreNotEqualMemory(const expected : Pointer; const actual : Pointer; const size : Cardinal; const message : string = '');
117119

@@ -285,7 +287,7 @@ Assert = class
285287
class constructor Create;
286288
end;
287289

288-
{$IFDEF DELPHI_XE_DOWN}
290+
{$IFNDEF DELPHI_XE2_UP}
289291
function ReturnAddress: Pointer; assembler;
290292
{$ENDIF}
291293

@@ -320,7 +322,7 @@ implementation
320322
Variants;
321323
{$ENDIF}
322324

323-
{$IFDEF DELPHI_XE_DOWN}
325+
{$IFNDEF DELPHI_XE2_UP}
324326
function IsBadPointer(P: Pointer):Boolean;register;
325327
begin
326328
try
@@ -416,7 +418,7 @@ class procedure Assert.AreEqual(const expected, actual: TClass; const message: s
416418
end;
417419
end;
418420

419-
{$IFNDEF DELPHI_XE_DOWN}
421+
{$IFDEF DELPHI_XE2_UP}
420422
//Delphi 2010 and XE compiler bug breaks this
421423
class procedure Assert.AreEqual<T>(const expected, actual: T; const message: string);
422424
var
@@ -473,6 +475,13 @@ class procedure Assert.AreEqual(const expected, actual: Integer; const message:
473475
FailFmt(SUnexpectedErrorInt ,[expected, actual, message], ReturnAddress);
474476
end;
475477

478+
class procedure Assert.AreEqual(const expected, actual: Int64; const message: string);
479+
begin
480+
DoAssert;
481+
if expected <> actual then
482+
FailFmt(SUnexpectedErrorInt ,[expected, actual, message], ReturnAddress);
483+
end;
484+
476485
class procedure Assert.AreEqual(const expected, actual: boolean; const message: string);
477486
begin
478487
DoAssert;
@@ -487,6 +496,7 @@ class procedure Assert.AreEqual(const expected, actual: cardinal; const message:
487496
FailFmt(SUnexpectedErrorInt ,[expected, actual, message], ReturnAddress);
488497
end;
489498

499+
490500
class procedure Assert.AreEqual(const expected, actual, tolerance: Double; const message: string);
491501
begin
492502
DoAssert;
@@ -572,7 +582,7 @@ class procedure Assert.AreNotEqual(const expected, actual: TClass; const message
572582
end;
573583
end;
574584

575-
{$IFNDEF DELPHI_XE_DOWN}
585+
{$IFDEF DELPHI_XE2_UP}
576586
//Delphi 2010 and XE compiler bug breaks this
577587
class procedure Assert.AreNotEqual<T>(const expected, actual: T; const message: string);
578588
var
@@ -598,6 +608,14 @@ class procedure Assert.AreNotEqual(const expected, actual: Integer; const messag
598608
FailFmt(SEqualsErrorInt ,[expected, actual, message], ReturnAddress);
599609
end;
600610

611+
class procedure Assert.AreNotEqual(const expected, actual: Int64; const message: string);
612+
begin
613+
DoAssert;
614+
if expected = actual then
615+
FailFmt(SEqualsErrorInt ,[expected, actual, message], ReturnAddress);
616+
end;
617+
618+
601619
class procedure Assert.AreNotEqual(const expected, actual: Extended; const message: string);
602620
var
603621
tolerance : Extended;

0 commit comments

Comments
 (0)