Commit 19248af

committed

Remove conditional compilation from array tests

Previously, the code that used generics in TestUArraysCatSnippets was not hidden from compilers that don't support generics via conditional compilation. Since the tests are only designed for use with Delphi XE and later, there is no need for this, so all the conditional compilation directives were removed from the test unit.

1 parent a6d67b3 commit 19248afCopy full SHA for 19248af

File tree

1 file changed

-40

lines changed

tests/Cat-Arrays
- TestUArraysCatSnippets.pas

1 file changed

-40

lines changed

`‎tests/Cat-Arrays/TestUArraysCatSnippets.pas‎`

Lines changed: 1 addition & 40 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,34 +1,12 @@`
`1`	`1`	`unit TestUArraysCatSnippets;`
`2`	`2`
`3`		`-{$UNDEF Generics}`
`4`		`-{$IFNDEF FPC}`
`5`		`- {$IFDEF CONDITIONALEXPRESSIONS}`
`6`		`- {$IF CompilerVersion >= 14.00}`
`7`		`- {$WARN SYMBOL_PLATFORM OFF}`
`8`		`- {$WARN SYMBOL_DEPRECATED OFF}`
`9`		`- {$WARN SYMBOL_LIBRARY OFF}`
`10`		`- {$IFEND}`
`11`		`- {$IF CompilerVersion >= 15.00}`
`12`		`- {$WARN UNSAFE_TYPE OFF}`
`13`		`- {$WARN UNSAFE_CAST OFF}`
`14`		`- {$WARN UNSAFE_CODE OFF}`
`15`		`- {$IFEND}`
`16`		`- {$IF CompilerVersion >= 20.00}`
`17`		`- {$WARN EXPLICIT_STRING_CAST OFF}`
`18`		`- {$WARN IMPLICIT_STRING_CAST OFF}`
`19`		`- {$DEFINE Generics}`
`20`		`- {$IFEND}`
`21`		`- {$ENDIF}`
`22`		`-{$ENDIF}`
`23`		`-`
`24`	`3`	`interface`
`25`	`4`
`26`	`5`	`uses`
`27`	`6`	`TestFramework, UArraysCatSnippets;`
`28`	`7`
`29`	`8`	`type`
`30`	`9`
`31`		`- {$IFDEF Generics}`
`32`	`10`	`TestTArrayUtils = class(TTestCase)`
`33`	`11`	`strict private`
`34`	`12`	`fSA0: TArray<string>;`
`@@ -54,7 +32,6 @@ TestTArrayUtils = class(TTestCase)`
`54`	`32`	`procedure TestEqual;`
`55`	`33`	`procedure TestSameStart;`
`56`	`34`	`end;`
`57`		`- {$ENDIF Generics}`
`58`	`35`
`59`	`36`	`TestArraysCatSnippets = class(TTestCase)`
`60`	`37`
`@@ -63,19 +40,11 @@ TestArraysCatSnippets = class(TTestCase)`
`63`	`40`	`implementation`
`64`	`41`
`65`	`42`	`uses`
`66`		`- SysUtils`
`67`		`- {$IFDEF Generics}`
`68`		`- , Generics.Defaults`
`69`		`- {$ENDIF Generics}`
`70`		`- ;`
	`43`	`+ SysUtils, Generics.Defaults;`
`71`	`44`
`72`		`-{$IFDEF Generics}`
`73`	`45`	`var`
`74`	`46`	`IntegerCompareFn: TEqualityComparison<Integer>;`
`75`	`47`	`StringCompareFn: TEqualityComparison<string>;`
`76`		`-{$ENDIF Generics}`
`77`		`-`
`78`		`-{$IFDEF Generics}`
`79`	`48`
`80`	`49`	`{ TestTArrayUtils }`
`81`	`50`
`@@ -229,12 +198,8 @@ procedure TestTArrayUtils.TestSameStart;`
`229`	`198`	`);`
`230`	`199`	`end;`
`231`	`200`
`232`		`-{$ENDIF Generics}`
`233`		`-`
`234`	`201`	`initialization`
`235`	`202`
`236`		`-{$IFDEF Generics}`
`237`		`-`
`238`	`203`	`IntegerCompareFn := function (const Left, Right: Integer): Boolean`
`239`	`204`	`begin`
`240`	`205`	`Result := Left = Right;`
`@@ -245,12 +210,8 @@ initialization`
`245`	`210`	`Result := SameStr(Left, Right);`
`246`	`211`	`end;`
`247`	`212`
`248`		`-{$ENDIF Generics}`
`249`		`-`
`250`	`213`	`// Register any test cases with the test runner`
`251`		`-{$IFDEF Generics}`
`252`	`214`	`RegisterTest(TestTArrayUtils.Suite);`
`253`		`-{$ENDIF Generics}`
`254`	`215`	`RegisterTest(TestArraysCatSnippets.Suite);`
`255`	`216`
`256`	`217`	`end.`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 19248af

File tree

1 file changed

1 file changed

`‎tests/Cat-Arrays/TestUArraysCatSnippets.pas‎`

0 commit comments