From 9d02a23325fe898a702caba05333576e36fb79b7 Mon Sep 17 00:00:00 2001
From: Clint Rutkas <clint@rutkas.com>
Date: Thu, 3 Dec 2020 16:52:21 -0800
Subject: [PATCH] Adding in FxCop

---
 .../Helpers/ColorConverterTest.cs             | 44 ++++++++++++++-----
 .../Helpers/ColorRepresentationHelperTest.cs  |  2 +-
 .../UnitTest-ColorPickerUI.csproj             |  7 ++-
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorConverterTest.cs b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorConverterTest.cs
index 80de408646..4f3e729eca 100644
--- a/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorConverterTest.cs
+++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorConverterTest.cs
@@ -8,7 +8,7 @@ using System.Globalization;
 using ColorPicker.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTest_ColorPickerUI.Helpers
+namespace Microsoft.ColorPicker.UnitTests
 {
     /// <summary>
     /// Test class to test <see cref="ColorConverter"/>
@@ -184,9 +184,16 @@ namespace UnitTest_ColorPickerUI.Helpers
         [DataRow("7E7EB8", 240.5, 013.5, 057.0)]
         public void ColorRGBtoHSITest(string hexValue, double hue, double saturation, double intensity)
         {
-            var red = int.Parse(hexValue.Substring(0, 2), NumberStyles.HexNumber);
-            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber);
-            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber);
+            if (string.IsNullOrWhiteSpace(hexValue))
+            {
+                Assert.IsNotNull(hexValue);
+            }
+
+            Assert.IsTrue(hexValue.Length >= 6);
+            
+            var red = int.Parse(hexValue.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
             var color = Color.FromArgb(255, red, green, blue);
             var result = ColorHelper.ConvertToHSIColor(color);
@@ -225,9 +232,16 @@ namespace UnitTest_ColorPickerUI.Helpers
         [DataRow("7E7EB8", 240, 049, 028)]
         public void ColorRGBtoHWBTest(string hexValue, double hue, double whiteness, double blackness)
         {
-            var red = int.Parse(hexValue.Substring(0, 2), NumberStyles.HexNumber);
-            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber);
-            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber);
+            if (string.IsNullOrWhiteSpace(hexValue))
+            {
+                Assert.IsNotNull(hexValue);
+            }
+
+            Assert.IsTrue(hexValue.Length >= 6);
+
+            var red = int.Parse(hexValue.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
             var color = Color.FromArgb(255, red, green, blue);
             var result = ColorHelper.ConvertToHWBColor(color);
@@ -266,9 +280,16 @@ namespace UnitTest_ColorPickerUI.Helpers
         [DataRow("7E7EB8", "B0", 049, 028)]
         public void ColorRGBtoNColTest(string hexValue, string hue, double whiteness, double blackness)
         {
-            var red = int.Parse(hexValue.Substring(0, 2), NumberStyles.HexNumber);
-            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber);
-            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber);
+            if (string.IsNullOrWhiteSpace(hexValue))
+            {
+                Assert.IsNotNull(hexValue);
+            }
+
+            Assert.IsTrue(hexValue.Length >= 6);
+
+            var red = int.Parse( hexValue.Substring(0, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var green = int.Parse(hexValue.Substring(2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            var blue = int.Parse(hexValue.Substring(4, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
 
             var color = Color.FromArgb(255, red, green, blue);
             var result = ColorHelper.ConvertToNaturalColor(color);
@@ -300,7 +321,10 @@ namespace UnitTest_ColorPickerUI.Helpers
                         {
                             _ = ColorHelper.ConvertToCMYKColor(color);
                         }
+#pragma warning disable CA1031 // Do not catch general exception types
+                        // intentionally trying to catch
                         catch (Exception ex)
+#pragma warning restore CA1031 // Do not catch general exception types
                         {
                             exception = ex;
                         }
diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
index 0f648bf309..f6139734ab 100644
--- a/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
+++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/Helpers/ColorRepresentationHelperTest.cs
@@ -7,7 +7,7 @@ using ColorPicker.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Enumerations;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace UnitTest_ColorPickerUI.Helpers
+namespace Microsoft.ColorPicker.UnitTests
 {
     [TestClass]
     public class ColorRepresentationHelperTest
diff --git a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
index df881d32e3..2d5be9722b 100644
--- a/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
+++ b/src/modules/colorPicker/UnitTest-ColorPickerUI/UnitTest-ColorPickerUI.csproj
@@ -3,13 +3,14 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <ProjectGuid>{090CD7B7-3B0C-4D1D-BC98-83EB5D799BC1}</ProjectGuid>
-    <RootNamespace>UnitTest_ColorPickerUI</RootNamespace>
+    <RootNamespace>Microsoft.ColorPicker.UnitTests</RootNamespace>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <LangVersion>8.0</LangVersion>
     <OutputType>Library</OutputType>
     <PlatformTarget>x64</PlatformTarget>
     <Platforms>x64</Platforms>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -23,6 +24,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>