From 0fb6a6314dc126b531049e72a2fda63185cdc132 Mon Sep 17 00:00:00 2001 From: Ugochukwu Mmaduekwe Date: Sun, 21 Dec 2025 21:31:48 +0100 Subject: [PATCH] remove unused defines and duplicates --- .../SimpleBaseLib.Tests.TestInsight.dpr | 56 ------------------- .../Delphi.Tests/SimpleBaseLib.Tests.dpr | 24 ++++++-- SimpleBaseLib/src/Include/SimpleBaseLib.inc | 5 -- .../src/Utils/SbpSimpleBaseLibTypes.pas | 19 ------- 4 files changed, 18 insertions(+), 86 deletions(-) delete mode 100644 SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr diff --git a/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr b/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr deleted file mode 100644 index 4b27eea..0000000 --- a/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.TestInsight.dpr +++ /dev/null @@ -1,56 +0,0 @@ -program SimpleBaseLib.Tests.TestInsight; -{ - - Delphi DUnit Test Project - ------------------------- - This project contains the DUnit test framework and the GUI/Console test runners. - Add "CONSOLE_TESTRUNNER" to the conditional defines entry in the project options - to use the console test runner. Otherwise the GUI test runner will be used by - default. - -} - -{$WARN DUPLICATE_CTOR_DTOR OFF} -{$IFDEF CONSOLE_TESTRUNNER} -{$APPTYPE CONSOLE} -{$ENDIF} - -uses - TestInsight.DUnit, - SbpBase58Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase58Alphabet.pas', - SbpIBase58Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase58Alphabet.pas', - SbpBase58 in '..\..\SimpleBaseLib\src\Bases\SbpBase58.pas', - SbpIBase58 in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase58.pas', - SbpBits in '..\..\SimpleBaseLib\src\Utils\SbpBits.pas', - SbpBase16 in '..\..\SimpleBaseLib\src\Bases\SbpBase16.pas', - SbpBase32Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase32Alphabet.pas', - SbpIBase32Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase32Alphabet.pas', - SbpBase32 in '..\..\SimpleBaseLib\src\Bases\SbpBase32.pas', - SbpIBase32 in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase32.pas', - SbpBase64Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase64Alphabet.pas', - SbpIBase64Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase64Alphabet.pas', - SbpBase64 in '..\..\SimpleBaseLib\src\Bases\SbpBase64.pas', - SbpIBase64 in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase64.pas', - SbpEncodingAlphabet in '..\..\SimpleBaseLib\src\Bases\SbpEncodingAlphabet.pas', - SbpIEncodingAlphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIEncodingAlphabet.pas', - SbpBase85Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase85Alphabet.pas', - SbpIBase85Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase85Alphabet.pas', - SbpIBase85 in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase85.pas', - SbpBase85 in '..\..\SimpleBaseLib\src\Bases\SbpBase85.pas', - SbpUtilities in '..\..\SimpleBaseLib\src\Utils\SbpUtilities.pas', - SbpSimpleBaseLibTypes in '..\..\SimpleBaseLib\src\Utils\SbpSimpleBaseLibTypes.pas', - Base16Tests in '..\src\Base16\Base16Tests.pas', - CrockfordTests in '..\src\Base32\CrockfordTests.pas', - Rfc4648Tests in '..\src\Base32\Rfc4648Tests.pas', - ExtendedHexTests in '..\src\Base32\ExtendedHexTests.pas', - Base58Tests in '..\src\Base58\Base58Tests.pas', - Base58AlphabetTests in '..\src\Base58\Base58AlphabetTests.pas', - Base64Tests in '..\src\Base64\Base64Tests.pas', - BaseZ85Tests in '..\src\Base85\BaseZ85Tests.pas', - Ascii85Tests in '..\src\Base85\Ascii85Tests.pas'; - -begin - - TestInsight.DUnit.RunRegisteredTests; - -end. diff --git a/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr b/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr index 44cf46f..55d918c 100644 --- a/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr +++ b/SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr @@ -11,15 +11,22 @@ program SimpleBaseLib.Tests; } {$WARN DUPLICATE_CTOR_DTOR OFF} -{$IFDEF CONSOLE_TESTRUNNER} -{$APPTYPE CONSOLE} + +{$IFNDEF TESTINSIGHT} + {$IFDEF CONSOLE_TESTRUNNER} + {$APPTYPE CONSOLE} + {$ENDIF} {$ENDIF} uses - Forms, - TestFramework, - GUITestRunner, - TextTestRunner, +{$IFDEF TESTINSIGHT} + TestInsight.DUnit, +{$ELSE} + Forms, + TestFramework, + GUITestRunner, + TextTestRunner, +{$ENDIF} SbpBase58Alphabet in '..\..\SimpleBaseLib\src\Bases\SbpBase58Alphabet.pas', SbpIBase58Alphabet in '..\..\SimpleBaseLib\src\Interfaces\SbpIBase58Alphabet.pas', SbpBase58 in '..\..\SimpleBaseLib\src\Bases\SbpBase58.pas', @@ -54,10 +61,15 @@ uses SimpleBaseLibTestBase in '..\src\SimpleBaseLibTestBase.pas'; begin + +{$IFDEF TESTINSIGHT} + TestInsight.DUnit.RunRegisteredTests; +{$ELSE} Application.Initialize; if IsConsole then TextTestRunner.RunRegisteredTests else GUITestRunner.RunRegisteredTests; +{$ENDIF} end. diff --git a/SimpleBaseLib/src/Include/SimpleBaseLib.inc b/SimpleBaseLib/src/Include/SimpleBaseLib.inc index 142b052..88f5f04 100644 --- a/SimpleBaseLib/src/Include/SimpleBaseLib.inc +++ b/SimpleBaseLib/src/Include/SimpleBaseLib.inc @@ -27,11 +27,6 @@ {$STRINGCHECKS OFF} {$WARN DUPLICATE_CTOR_DTOR OFF} - // XE and Above - {$IF CompilerVersion >= 22.0} - {$DEFINE DELPHIXE_UP} - {$IFEND} - {$ENDIF} {========================== Common Compiler Settings ==========================} diff --git a/SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas b/SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas index 7dd36b0..275206a 100644 --- a/SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas +++ b/SimpleBaseLib/src/Utils/SbpSimpleBaseLibTypes.pas @@ -19,23 +19,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException); /// TSimpleBaseLibByteArray = TBytes; -{$IFDEF DELPHIXE_UP} - /// - /// Represents a dynamic array of Char. - /// - TSimpleBaseLibCharArray = TArray; - - /// - /// Represents a dynamic array of String. - /// - TSimpleBaseLibStringArray = TArray; - - /// - /// Represents a dynamic array of array of byte. - /// - TSimpleBaseLibMatrixByteArray = TArray; - -{$ELSE} /// /// Represents a dynamic array of Char. /// @@ -51,8 +34,6 @@ EInvalidOperationSimpleBaseLibException = class(ESimpleBaseLibException); /// TSimpleBaseLibMatrixByteArray = array of TSimpleBaseLibByteArray; -{$ENDIF DELPHIXE_UP} - implementation {$IFDEF FPC}