From 859e9f8b04009b2477741d39b3205b02dfec9ea8 Mon Sep 17 00:00:00 2001
From: Arjun Balgovind <32061677+arjunbalgovind@users.noreply.github.com>
Date: Thu, 22 Oct 2020 19:26:48 -0700
Subject: [PATCH] Added ColorPicker unit tests to CI and moved the unit test
 project (#7484)

* Added ColorPicker unit tests to CI and moved the unit test project

* Updated output path
---
 .pipelines/ci/templates/build-powertoys-steps.yml           | 1 +
 PowerToys.sln                                               | 2 +-
 .../UnitTest-ColorPickerUI}/Helpers/ColorHelperTest.cs      | 0
 .../Helpers/ColorRepresentationHelperTest.cs                | 0
 .../UnitTest-ColorPickerUI}/UnitTest-ColorPickerUI.csproj   | 6 ++++--
 5 files changed, 6 insertions(+), 3 deletions(-)
 rename {UnitTest-ColorPickerUI => src/modules/colorPicker/UnitTest-ColorPickerUI}/Helpers/ColorHelperTest.cs (100%)
 rename {UnitTest-ColorPickerUI => src/modules/colorPicker/UnitTest-ColorPickerUI}/Helpers/ColorRepresentationHelperTest.cs (100%)
 rename {UnitTest-ColorPickerUI => src/modules/colorPicker/UnitTest-ColorPickerUI}/UnitTest-ColorPickerUI.csproj (73%)

diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
index 730c16e8fd..aa5aeb5026 100644
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -87,6 +87,7 @@ steps:
       **\Microsoft.Plugin.Uri.UnitTests.dll
       **\Wox.Test.dll
       **\*Microsoft.PowerToys.Settings.UI.UnitTests.dll
+      **\UnitTest-ColorPickerUI.dll
       !**\obj\**
 # .NetFramework assemblies
 - task: VSTest@2
diff --git a/PowerToys.sln b/PowerToys.sln
index 232e5814e6..7b981633f2 100644
--- a/PowerToys.sln
+++ b/PowerToys.sln
@@ -269,7 +269,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Calculator
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Folder.UnitTests", "src\modules\launcher\Plugins\Microsoft.Plugin.Folder.UnitTests\Microsoft.Plugin.Folder.UnitTests.csproj", "{4FA206A5-F69F-4193-BF8F-F6EEB496734C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "UnitTest-ColorPickerUI\UnitTest-ColorPickerUI.csproj", "{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTest-ColorPickerUI", "src\modules\colorPicker\UnitTest-ColorPickerUI\UnitTest-ColorPickerUI.csproj", "{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "logging", "src\logging\logging.vcxproj", "{7E1E3F13-2BD6-3F75-A6A7-873A2B55C60F}"
 EndProject
diff --git a/UnitTest-ColorPickerUI/Helpers/ColorHelperTest.cs b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorHelperTest.cs
similarity index 100%
rename from UnitTest-ColorPickerUI/Helpers/ColorHelperTest.cs
rename to src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorHelperTest.cs
diff --git a/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
similarity index 100%
rename from UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
rename to src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
diff --git a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
similarity index 73%
rename from UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
rename to src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
index 041eed126e..2179570e5e 100644
--- a/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
+++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
@@ -11,10 +11,12 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>..\..\..\..\x64\Debug\modules\ColorPicker\UnitTest-ColorPickerUI\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>x64</PlatformTarget>
+    <OutputPath>..\..\..\..\x64\Release\modules\ColorPicker\UnitTest-ColorPickerUI\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -28,8 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\src\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
-    <ProjectReference Include="..\src\modules\colorPicker\ColorPickerUI\ColorPickerUI.csproj" />
+    <ProjectReference Include="..\..\..\core\Microsoft.PowerToys.Settings.UI.Library\Microsoft.PowerToys.Settings.UI.Library.csproj" />
+    <ProjectReference Include="..\ColorPickerUI\ColorPickerUI.csproj" />
   </ItemGroup>
 
 </Project>