Skip to content

Commit 0fb6a63

Browse files
committed
remove unused defines and duplicates
1 parent 894a6a9 commit 0fb6a63

File tree

4 files changed

+18
-86
lines changed

4 files changed

+18
-86
lines changed

SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr

Lines changed: 0 additions & 56 deletions
This file was deleted.

SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,22 @@ program SimpleBaseLib.Tests;
1111
}
1212

1313
{$WARN DUPLICATE_CTOR_DTOR OFF}
14-
{$IFDEF CONSOLE_TESTRUNNER}
15-
{$APPTYPE CONSOLE}
14+
15+
{$IFNDEF TESTINSIGHT}
16+
{$IFDEF CONSOLE_TESTRUNNER}
17+
{$APPTYPE CONSOLE}
18+
{$ENDIF}
1619
{$ENDIF}
1720

1821
uses
19-
Forms,
20-
TestFramework,
21-
GUITestRunner,
22-
TextTestRunner,
22+
{$IFDEF TESTINSIGHT}
23+
TestInsight.DUnit,
24+
{$ELSE}
25+
Forms,
26+
TestFramework,
27+
GUITestRunner,
28+
TextTestRunner,
29+
{$ENDIF}
2330
SbpBase58Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase58Alphabet.pas',
2431
SbpIBase58Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase58Alphabet.pas',
2532
SbpBase58 in '..\..\SimpleBaseLib\src\Bases\SbpBase58.pas',
@@ -54,10 +61,15 @@ uses
5461
SimpleBaseLibTestBase in '..\src\SimpleBaseLibTestBase.pas';
5562

5663
begin
64+
65+
{$IFDEF TESTINSIGHT}
66+
TestInsight.DUnit.RunRegisteredTests;
67+
{$ELSE}
5768
Application.Initialize;
5869
if IsConsole then
5970
TextTestRunner.RunRegisteredTests
6071
else
6172
GUITestRunner.RunRegisteredTests;
73+
{$ENDIF}
6274

6375
end.

SimpleBaseLib/src/Include/SimpleBaseLib.inc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
{$STRINGCHECKS OFF}
2828
{$WARN DUPLICATE_CTOR_DTOR OFF}
2929

30-
// XE and Above
31-
{$IF CompilerVersion >= 22.0}
32-
{$DEFINE DELPHIXE_UP}
33-
{$IFEND}
34-
3530
{$ENDIF}
3631

3732
{========================== Common Compiler Settings ==========================}

SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException);
1919
/// </summary>
2020
TSimpleBaseLibByteArray = TBytes;
2121

22-
{$IFDEF DELPHIXE_UP}
23-
/// <summary>
24-
/// Represents a dynamic array of Char.
25-
/// </summary>
26-
TSimpleBaseLibCharArray = TArray<Char>;
27-
28-
/// <summary>
29-
/// Represents a dynamic array of String.
30-
/// </summary>
31-
TSimpleBaseLibStringArray = TArray<String>;
32-
33-
/// <summary>
34-
/// Represents a dynamic array of array of byte.
35-
/// </summary>
36-
TSimpleBaseLibMatrixByteArray = TArray<TSimpleBaseLibByteArray>;
37-
38-
{$ELSE}
3922
/// <summary>
4023
/// Represents a dynamic array of Char.
4124
/// </summary>
@@ -51,8 +34,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException);
5134
/// </summary>
5235
TSimpleBaseLibMatrixByteArray = array of TSimpleBaseLibByteArray;
5336

54-
{$ENDIF DELPHIXE_UP}
55-
5637
implementation
5738

5839
{$IFDEF FPC}

0 commit comments

Comments
 (0)