Merge pull request #1328 from chuacw/master

Fix missing scope and removed unused units

Author: joachimmarder

Tests/Tests.dpr

@@ -4,7 +4,7 @@ program Tests;
 {$APPTYPE CONSOLE}
 {$ENDIF}{$STRONGLINKTYPES ON}
 uses
-  SysUtils,
+  System.SysUtils,
   {$IFDEF TESTINSIGHT}
   TestInsight.DUnitX,
   {$ENDIF }

Tests/Tests.dproj

@@ -7,7 +7,7 @@
         <MainSource>Tests.dpr</MainSource>
         <Platform Condition="'$(Platform)'==''">Win32</Platform>
         <ProjectGuid>{D37CFA56-3B13-4C93-91F7-DDC227C20116}</ProjectGuid>
-        <ProjectVersion>20.3</ProjectVersion>
+        <ProjectVersion>20.4</ProjectVersion>
         <TargetedPlatforms>3</TargetedPlatforms>
         <ProjectName Condition="'$(ProjectName)'==''">Tests</ProjectName>
     </PropertyGroup>
@@ -725,6 +725,9 @@
                     <Platform Name="Win64x">
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="WinARM64EC">
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="ProjectiOSDeviceDebug">
                     <Platform Name="iOSDevice32">
@@ -763,6 +766,10 @@
                         <RemoteDir>Assets</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="WinARM64EC">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="UWP_DelphiLogo44">
                     <Platform Name="Win32">
@@ -773,6 +780,10 @@
                         <RemoteDir>Assets</RemoteDir>
                         <Operation>1</Operation>
                     </Platform>
+                    <Platform Name="WinARM64EC">
+                        <RemoteDir>Assets</RemoteDir>
+                        <Operation>1</Operation>
+                    </Platform>
                 </DeployClass>
                 <DeployClass Name="iOS_AppStore1024">
                     <Platform Name="iOSDevice64">
@@ -986,6 +997,7 @@
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64x" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="WinARM64EC" Name="$(PROJECTNAME)"/>
             </Deployment>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>

Tests/VTOnEditCancelledTests.pas

@@ -1,50 +1,48 @@
-unit VTOnEditCancelledTests;
-
-interface
-
-uses
-  DUnitX.TestFramework,
-  Classes,
-  Vcl.Forms,
-  VirtualTrees;
-
-type
-
-  [TestFixture]
-  TVTOnEditCancelledTests = class
-  strict private
-    fTree: TVirtualStringTree;
-    fForm: TForm;
-    FEditCancelled: Boolean;
-    procedure TreeEditCancelled(Sender: TBaseVirtualTree; Column: TColumnIndex);
-  public
-    [Setup]
-    procedure Setup;
-    [TearDown]
-    procedure TearDown;
-
-    [Test]
-    procedure TestOnEditCancelled;
-  end;
-
-implementation
-
-uses
-  VirtualTrees.WorkerThread, VirtualTrees.EditLink,
-  System.SysUtils;
-
-procedure TVTOnEditCancelledTests.Setup;
-begin
-  fForm := TForm.Create(nil);
-  fTree := TVirtualStringTree.Create(fForm);
-end;
-
-procedure TVTOnEditCancelledTests.TearDown;
-begin
-  FreeAndNil(fForm);
-end;
-
-procedure TVTOnEditCancelledTests.TestOnEditCancelled;
+unit VTOnEditCancelledTests;
+
+interface
+
+uses
+  DUnitX.TestFramework,
+  Vcl.Forms,
+  VirtualTrees;
+
+type
+
+  [TestFixture]
+  TVTOnEditCancelledTests = class
+  strict private
+    fTree: TVirtualStringTree;
+    fForm: TForm;
+    FEditCancelled: Boolean;
+    procedure TreeEditCancelled(Sender: TBaseVirtualTree; Column: TColumnIndex);
+  public
+    [Setup]
+    procedure Setup;
+    [TearDown]
+    procedure TearDown;
+
+    [Test]
+    procedure TestOnEditCancelled;
+  end;
+
+implementation
+
+uses
+  System.SysUtils;
+
+procedure TVTOnEditCancelledTests.Setup;
+begin
+  fForm := TForm.Create(nil);
+  fTree := TVirtualStringTree.Create(fForm);
+end;
+
+procedure TVTOnEditCancelledTests.TearDown;
+begin
+  FreeAndNil(fForm);
+end;
+
+procedure TVTOnEditCancelledTests.TestOnEditCancelled;
 begin
   fForm.Show;
   FEditCancelled := False;
@@ -58,12 +56,12 @@ procedure TVTOnEditCancelledTests.TestOnEditCancelled;
   Assert.IsTrue(FEditCancelled);
 end;
 
-procedure TVTOnEditCancelledTests.TreeEditCancelled(Sender: TBaseVirtualTree;
+procedure TVTOnEditCancelledTests.TreeEditCancelled(Sender: TBaseVirtualTree;
   Column: TColumnIndex);
 begin
   FEditCancelled := True;
 end;
 
-initialization
-  TDUnitX.RegisterTestFixture(TVTOnEditCancelledTests);
-end.
+initialization
+  TDUnitX.RegisterTestFixture(TVTOnEditCancelledTests);
+end.