Add support for .net standard 2.0 (#121)

Closes #120
Galad · May 23, 2019 · eb5deac · eb5deac
1 parent a71eebc
commit eb5deac
Show file tree

Hide file tree

Showing 14 changed files with 109 additions and 13 deletions.
diff --git a/src/Tranquire.Selenium.Tests/HighlightTargetTests.cs b/src/Tranquire.Selenium.Tests/HighlightTargetTests.cs
@@ -0,0 +1,60 @@
+using Moq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Reflection;
+using Tranquire;
+using Tranquire.Selenium;
+using Xunit;
+
+namespace Tranquire.Selenium.Tests
+{
+    public class HighlightTargetTests
+    {
+        public static IEnumerable<object[]> SystemColors
+        {
+            get
+            {
+                return typeof(Color).GetProperties(BindingFlags.Public | BindingFlags.Static)
+                                    .Where(p => p.PropertyType == typeof(Color))
+                                    .Select(p => new object[] { p.GetValue(null), p.Name == "LightGray" ? "LightGrey" : p.Name.ToString() });
+            }
+        }
+
+        [Theory, MemberData(nameof(SystemColors))]
+        public void ToHtml_NamedColor_ShouldReturnCorrectValue(Color color, string expected)
+        {
+            // act
+            var actual = HighlightTarget.ToHtml(color);
+            // assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Theory]
+        [InlineData(131, 67, 140, "#83438C")]
+        [InlineData(129, 131, 201, "#8183C9")]
+        [InlineData(178, 217, 158, "#B2D99E")]
+        public void ToHtml_Other_ShouldReturnCorrectValue(int r, int g, int b, string expected)
+        {
+            // arrange
+            var color = Color.FromArgb(r, g, b);
+            // act
+            var actual = HighlightTarget.ToHtml(color);
+            // assert
+            Assert.Equal(expected, actual);
+        }
+
+        [Fact]
+        public void ToHtml_EmptyColor_ShouldReturnCorrectValue()
+        {
+            // arrange
+            var color = Color.Empty;
+            // act
+            var actual = HighlightTarget.ToHtml(color);
+            // assert
+            Assert.Equal(string.Empty, actual);
+        }
+    }
+}
diff --git a/src/Tranquire.Selenium/Extensions/SeleniumReporter.cs b/src/Tranquire.Selenium/Extensions/SeleniumReporter.cs
@@ -29,11 +29,13 @@ public SeleniumReporter(XmlDocumentObserver xmlDocumentObserver, IObserver<Scree
             ScreenshotInfoObserver = screenshotInfoObserver ?? throw new ArgumentNullException(nameof(screenshotInfoObserver));
         }
 
+#if NET45 || NETSTANDARD2_0
         /// <inheritdoc />
         public string GetHtmlDocument()
         {
             return XmlDocumentObserver.GetHtmlDocument();
         }
+#endif
 
         /// <inheritdoc />
         public XDocument GetXmlDocument()

diff --git a/src/Tranquire.Selenium/HighlightTarget.cs b/src/Tranquire.Selenium/HighlightTarget.cs
@@ -70,10 +70,38 @@ public HighlightTarget(IActor actor) : this(actor, Color.Purple, Color.LightGree
 
         private static string SetBorderJsAction(Color color)
         {
-            var htmlColor = ColorTranslator.ToHtml(color);
+            var htmlColor = ToHtml(color);
             return $"arguments[0].style.border = 'thick solid {htmlColor}';";
         }
 
+        /// <summary>
+        /// Gets the HTML color code from a <see cref="Color"/> value
+        /// </summary>
+        /// <param name="color">The color</param>
+        /// <returns>The HTML encoded color (Ex: #DF0101)</returns>
+        public static string ToHtml(Color color)
+        {
+            if (color.IsEmpty)
+            {
+                return string.Empty;
+            }
+
+            if (color.IsNamedColor)
+            {
+                if (color == Color.LightGray)
+                {
+                    // special case due to mismatch between Html and enum spelling
+                    return "LightGrey";
+                }
+                return color.Name;
+            }
+            var colorString = "#" + color.R.ToString("X2", null) +
+                                    color.G.ToString("X2", null) +
+                                    color.B.ToString("X2", null);
+
+            return colorString;
+        }
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
         public string Name => Actor.Name;
 

diff --git a/src/Tranquire.Selenium/ISeleniumReporter.cs b/src/Tranquire.Selenium/ISeleniumReporter.cs
@@ -12,11 +12,13 @@ public interface ISeleniumReporter
         /// </summary>
         /// <returns></returns>
         XDocument GetXmlDocument();
+#if NET45 || NETSTANDARD2_0
         /// <summary>
         /// Returns a report in an HTML format
         /// </summary>
         /// <returns></returns>
         string GetHtmlDocument();
+#endif
         /// <summary>
         /// Save the screenshots taken during the run to the disk
         /// </summary>

diff --git a/src/Tranquire.Selenium/Tranquire.Selenium.csproj b/src/Tranquire.Selenium/Tranquire.Selenium.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <PackageId>Tranquire.Selenium</PackageId>
     <Authors>Lucas Loegel</Authors>
     <Company />

diff --git a/src/Tranquire.Tests/Reporting/ConsoleObserverTests.cs b/src/Tranquire.Tests/Reporting/ConsoleObserverTests.cs
@@ -1,3 +1,4 @@
+#if NET462 || NETSTANDARD2_0
 using System;
 using System.IO;
 using System.Text;
@@ -26,3 +27,4 @@ public override void Dispose()
         }
     }
 }
+#endif
diff --git a/src/Tranquire.Tests/Reporting/DebugObserverTests.cs b/src/Tranquire.Tests/Reporting/DebugObserverTests.cs
@@ -1,4 +1,4 @@
-#if DEBUG
+#if DEBUG && NET462
 using System.Diagnostics;
 using System.IO;
 using System.Text;

diff --git a/src/Tranquire.Tests/Reporting/TraceObserverTests.cs b/src/Tranquire.Tests/Reporting/TraceObserverTests.cs
@@ -1,4 +1,4 @@
-#if NET462
+#if NET462 || NETSTANDARD2_0
 using System.Diagnostics;
 using System.IO;
 using System.Text;

diff --git a/src/Tranquire.Tests/Reporting/XmlDocumentObserverTests.cs b/src/Tranquire.Tests/Reporting/XmlDocumentObserverTests.cs
@@ -427,7 +427,7 @@ public void GetXmlDocument_WhenNotificationsDidNotEnd_ShouldThrow(
             // arrange
             sut.OnNext(new ActionNotification(action, 1, new BeforeActionNotificationContent(DateTimeOffset.MinValue, CommandType.Action)));
             // act and assert
-            new Action(() => sut.GetHtmlDocument()).Should().ThrowExactly<InvalidOperationException>();
+            new Action(() => sut.GetXmlDocument()).Should().ThrowExactly<InvalidOperationException>();
         }
 
         [Theory, DomainAutoData]
@@ -536,6 +536,7 @@ public static void AssertRootAreEqual(XmlReportRoot expected, XmlReportRoot actu
         #endregion
 
         #region GetHtmlDocument
+#if NET462 || NETSTANDARD2_0
         [Theory, DomainAutoData]
         public void GetHtmlDocument_ShouldReturnCorrectValue(
             XmlDocumentObserver sut,
@@ -721,11 +722,12 @@ public void GetHtmlDocument_WithGivenWhen_ShouldReturnCorrectValue(
             titleCount.Should().Be(1);
 
         }
-        #endregion
+#endif
+#endregion
 
         private static int CountStringOccurences(string input, string value)
         {
             return input.Split(new[] { value }, StringSplitOptions.None).Length - 1;
         }
     }
-}
+}
diff --git a/src/Tranquire.Tests/Tranquire.Tests.csproj b/src/Tranquire.Tests/Tranquire.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFrameworks>net462;netcoreapp2.0;netstandard2.0</TargetFrameworks>
     <SonarQubeTestProject>true</SonarQubeTestProject>
     <CodeAnalysisRuleSet>..\SonarQube\DisableSonarRules.ruleset</CodeAnalysisRuleSet>
     <LangVersion>latest</LangVersion>

diff --git a/src/Tranquire/Reporting/ConsoleObserver.cs b/src/Tranquire/Reporting/ConsoleObserver.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if NET45 || NETSTANDARD2_0
 using System;
 
 namespace Tranquire.Reporting

diff --git a/src/Tranquire/Reporting/TraceObserver.cs b/src/Tranquire/Reporting/TraceObserver.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if NET45 || NETSTANDARD2_0
 using System;
 using System.Diagnostics;
 

diff --git a/src/Tranquire/Reporting/XmlDocumentObserver.Net45.cs b/src/Tranquire/Reporting/XmlDocumentObserver.Net45.cs
@@ -1,4 +1,4 @@
-#if NET45
+#if NET45 || NETSTANDARD2_0
 using System;
 using System.Collections.Generic;
 using System.Reflection;

diff --git a/src/Tranquire/Tranquire.csproj b/src/Tranquire/Tranquire.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.0;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;net45;netstandard2.0</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>http://galad.github.io/tranquire/?utm_source=nuget&amp;utm_medium=referral</PackageProjectUrl>
@@ -44,6 +44,6 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="System.Collections.Immutable" version="1.5.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Condition="'$(TargetFramework)'!='netstandard2.0'" Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 </Project>