From 371251d58c8ab0cf65bab6b546e080025e864e7a Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 22 Mar 2023 13:06:57 +0600
Subject: [PATCH] Review comments

---
 samples/ControlCatalog/App.xaml                            | 4 ++--
 tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs       | 1 +
 .../Avalonia.Direct2D1.RenderTests.csproj                  | 1 +
 tests/Avalonia.RenderTests/TestBase.cs                     | 1 +
 .../Avalonia.Skia.RenderTests.csproj                       | 1 +
 .../Avalonia.UnitTests}/DispatcherTimerHelper.cs           | 7 +------
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename {src/Avalonia.Base/Utilities => tests/Avalonia.UnitTests}/DispatcherTimerHelper.cs (76%)

diff --git a/samples/ControlCatalog/App.xaml b/samples/ControlCatalog/App.xaml
index 2c2e1c4075..3b847adcbb 100644
--- a/samples/ControlCatalog/App.xaml
+++ b/samples/ControlCatalog/App.xaml
@@ -60,7 +60,7 @@
     <Style Selector="Label.h3">
       <Setter Property="FontSize" Value="12" />
     </Style>
-  </Application.Styles><!--
+  </Application.Styles>
   <TrayIcon.Icons>
     <TrayIcons>
       <TrayIcon Icon="/Assets/test_icon.ico" ToolTipText="Avalonia Tray Icon ToolTip">
@@ -81,5 +81,5 @@
         </TrayIcon.Menu>
       </TrayIcon>
     </TrayIcons>
-  </TrayIcon.Icons>-->
+  </TrayIcon.Icons>
 </Application>
diff --git a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
index c53891fa1c..c3630c36b7 100644
--- a/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Input/GesturesTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Avalonia.Base.UnitTests.Utilities;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Input.GestureRecognizers;
diff --git a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
index a99421f107..17e1ab0e50 100644
--- a/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
+++ b/tests/Avalonia.Direct2D1.RenderTests/Avalonia.Direct2D1.RenderTests.csproj
@@ -16,6 +16,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Windows\Avalonia.Direct2D1\Avalonia.Direct2D1.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/tests/Avalonia.RenderTests/TestBase.cs b/tests/Avalonia.RenderTests/TestBase.cs
index a0d8f8bcc3..4732099d60 100644
--- a/tests/Avalonia.RenderTests/TestBase.cs
+++ b/tests/Avalonia.RenderTests/TestBase.cs
@@ -17,6 +17,7 @@ using Avalonia.Controls.Platform.Surfaces;
 using Avalonia.Media;
 using Avalonia.Rendering.Composition;
 using Avalonia.Threading;
+using Avalonia.UnitTests;
 using Avalonia.Utilities;
 using SixLabors.ImageSharp.PixelFormats;
 using Image = SixLabors.ImageSharp.Image;
diff --git a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
index 0d182678ef..ca9f5ed974 100644
--- a/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
+++ b/tests/Avalonia.Skia.RenderTests/Avalonia.Skia.RenderTests.csproj
@@ -17,6 +17,7 @@
     <ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj" />
     <ProjectReference Include="..\..\src\Avalonia.Themes.Simple\Avalonia.Themes.Simple.csproj" />
     <ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj" />
+    <ProjectReference Include="..\Avalonia.UnitTests\Avalonia.UnitTests.csproj" />
   </ItemGroup>
   <Import Project="..\..\build\Moq.props" />
   <Import Project="..\..\build\Rx.props" />
diff --git a/src/Avalonia.Base/Utilities/DispatcherTimerHelper.cs b/tests/Avalonia.UnitTests/DispatcherTimerHelper.cs
similarity index 76%
rename from src/Avalonia.Base/Utilities/DispatcherTimerHelper.cs
rename to tests/Avalonia.UnitTests/DispatcherTimerHelper.cs
index a457388fb2..ef7271a2d3 100644
--- a/src/Avalonia.Base/Utilities/DispatcherTimerHelper.cs
+++ b/tests/Avalonia.UnitTests/DispatcherTimerHelper.cs
@@ -1,11 +1,6 @@
 using Avalonia.Threading;
 
-namespace Avalonia.Utilities;
-
-public class DispatcherTimerHelper
-{
-    
-}
+namespace Avalonia.UnitTests;
 
 public static class DispatcherTimerUtils
 {