gui tests fixes for delphi

src/core/URandomHash.pas

@@ -122,7 +122,7 @@ type
       function Hash(const ABlockHeader: TBytes; ARound: Int32) : TArray<TBytes>; overload;
     public
       constructor Create;
-      destructor Destroy;
+      destructor Destroy; override;
       function Hash(const ABlockHeader: TBytes): TBytes; overload; inline;
       class function Compute(const ABlockHeader: TBytes): TBytes; overload; static; inline;
   end;
@@ -201,6 +201,7 @@ begin
  FMurmurHash3_x86_32 := nil;
  for i := Low(FHashAlg) to High(FHashAlg) do
    FHashAlg[i] := nil;
+ inherited Destroy;
 end;
 
 class function TRandomHash.Compute(const ABlockHeader: TBytes): TBytes;

src/libraries/pascalcoin/UUnitTests.pas

@@ -7,7 +7,7 @@ unit UUnitTests;
 interface
 
 uses
-  Classes, SysUtils, {$IFDEF FPC}fpcunit,testregistry {$ELSE}DUnitX.TestFramework, DUnitX.DUnitCompatibility{$ENDIF FPC}, variants;
+  Classes, SysUtils, {$IFDEF FPC}fpcunit,testregistry {$ELSE}TestFramework {$ENDIF FPC}, variants;
 
 type
 
@@ -29,16 +29,16 @@ type
 
   TPascalCoinUnitTest = class(TTestCase)
   protected
-    class function ParseBytes(const AStr : String) : TBytes;   // if stars with 0x parses as input hexstring else ascii
-    class procedure AssertEquals(const AMessage: string; const Expected, Actual: TBytes); overload;
-    class procedure AssertEquals(const Expected, Actual: TBytes); overload;
+     function ParseBytes(const AStr : String) : TBytes;   // if stars with 0x parses as input hexstring else ascii
+     procedure AssertEquals(const AMessage: string; const Expected, Actual: TBytes); overload;
+     procedure AssertEquals(const Expected, Actual: TBytes); overload;
   end;
 
 implementation
 
 uses UCommon;
 
-class function TPascalCoinUnitTest.ParseBytes(const AStr : String) : TBytes;
+function TPascalCoinUnitTest.ParseBytes(const AStr : String) : TBytes;
 begin
   if AStr.StartsWith('0x') then
     Result := Hex2Bytes(AStr)
@@ -46,16 +46,16 @@ begin
     Result := TEncoding.ASCII.GetBytes(AStr);
 end;
 
-class procedure TPascalCoinUnitTest.AssertEquals(const AMessage: string; const Expected, Actual: TBytes);
+procedure TPascalCoinUnitTest.AssertEquals(const AMessage: string; const Expected, Actual: TBytes);
 begin
 {$IFDEF FPC}
   AssertTrue(AMessage, BytesCompare(Expected, Actual) = 0, CallerAddr);
 {$ELSE}
-  Assert.IsTrue(BytesCompare(Expected, Actual) = 0, AMessage);
+  CheckTrue(BytesCompare(Expected, Actual) = 0, AMessage);
 {$ENDIF}
 end;
 
-class procedure TPascalCoinUnitTest.AssertEquals(const Expected, Actual: TBytes);
+procedure TPascalCoinUnitTest.AssertEquals(const Expected, Actual: TBytes);
 begin
 {$IFDEF FPC}
   AssertEquals(ComparisonMsg(Bytes2Hex(Expected, True), Bytes2Hex(Actual, True)), Expected, Actual);

src/tests/RandomHash.Tests.dpr

@@ -7,7 +7,7 @@ program RandomHash.Tests;
 
 uses
   Forms,
-  DUnitX.TestFramework, DUnitX.DUnitCompatibility,
+  TestFramework,
   GUITestRunner,
   TextTestRunner,
   URandomHash in '..\core\URandomHash.pas',

src/tests/URandomHashTests.Delphi.pas

@@ -3,17 +3,15 @@ unit URandomHashTests.Delphi;
 interface
 
 uses
-  Classes, SysUtils, {$IFDEF FPC}fpcunit,testregistry {$ELSE}DUnitX.TestFramework, DUnitX.DUnitCompatibility{$ENDIF FPC},
+  Classes, SysUtils, {$IFDEF FPC}fpcunit,testregistry {$ELSE}TestFramework {$ENDIF FPC},
   UUnitTests, HlpIHash;
 
 type
 
   { TRandomHashTest }
 
-  [TestFixture]
   TRandomHashTest = class(TPascalCoinUnitTest)
-  public
-    [TestCase]
+  published
     procedure TestRandomHash_Standard;
   end;
 
@@ -52,6 +50,6 @@ end;
 
 initialization
 
-  TDUnitX.RegisterTestFixture(TRandomHashTest);
+  RegisterTest(TRandomHashTest.Suite);
 
 end.