Move test utils into TestBase project

Author: kMutagene

tests/Common/FSharpTestBase/FSharpTestBase.fsproj

@@ -17,6 +17,12 @@
     <Compile Include="TestCharts\Chart2DTestCharts.fs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Deedle" Version="2.4.1" />
+    <PackageReference Include="Expecto" Version="9.*" />
+    <PackageReference Include="FSharp.Data" Version="4.2.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Plotly.NET\Plotly.NET.fsproj" />
   </ItemGroup>

tests/Common/FSharpTestBase/TestCharts/Chart2DTestCharts.fs

@@ -283,7 +283,7 @@ module Image =
         |> Chart.withTitle "ARGB image chart"
 
     let ``Image chart from base64 string`` = 
-        let base64String = TestUtils.getLogoPNG()
+        let base64String = TestUtils.HtmlCodegen.getLogoPNG()
         Chart.Image(
             Source=($"data:image/jpg;base64,{base64String}"),
             UseDefaults = false

tests/Common/FSharpTestBase/TestCharts/ChartDomainTestCharts.fs

@@ -2,7 +2,6 @@
 
 open Plotly.NET
 
-
 module Pie = 
 
     let ``Simple pie chart`` =

tests/Common/FSharpTestBase/TestUtils.fs

@@ -2,16 +2,55 @@
 
 open System.Reflection
 open System.IO
+open Expecto
+open Plotly.NET
+open DynamicObj
+open Newtonsoft.Json
+
+module HtmlCodegen =
+
+    let getLogoPNG() =
+        let assembly = Assembly.GetExecutingAssembly()
+        use str = assembly.GetManifestResourceStream($"FSharpTestBase.logo.png")
+        use r = new BinaryReader(str)
+        r.ReadBytes(int(str.Length))
+        |> System.Convert.ToBase64String
+
+    let getFullPlotlyJS() =
+        let assembly = Assembly.GetExecutingAssembly()
+        use str = assembly.GetManifestResourceStream($"FSharpTestBase.plotly-{Globals.PLOTLYJS_VERSION}.min.js")
+        use r = new StreamReader(str)
+        r.ReadToEnd()
+
+    let substringIsInChart chart htmlizer substring =
+        chart
+        |> htmlizer
+        |> Expect.stringContains
+        |> (fun expecting -> expecting substring $"Should've contained {substring}")
+
+
+    let substringListIsInChart chart htmlizer substringList =
+        for substring in substringList do
+            substringIsInChart chart htmlizer substring
+
+
+    let chartGeneratedContains chart substring =
+        substringIsInChart chart GenericChart.toChartHTML substring
+        substringIsInChart chart GenericChart.toEmbeddedHTML substring
+
+
+    let chartGeneratedContainsList chart substringList =
+        for substring in substringList do
+            chartGeneratedContains chart substring
+
+    let emptyLayout chart =
+        "var layout = {};" |> chartGeneratedContains chart
+
+module Objects =
+
+    let jsonFieldIsSetWith fieldName expected (object:#DynamicObj) =
+        Expect.equal
+            ((object :> DynamicObj)?($"{fieldName}") |> JsonConvert.SerializeObject) 
+            expected
+            ($"Field `{fieldName}` not set correctly in serialized dynamic object.")
 
-let getLogoPNG() =
-    let assembly = Assembly.GetExecutingAssembly()
-    use str = assembly.GetManifestResourceStream($"FSharpTestBase.logo.png")
-    use r = new BinaryReader(str)
-    r.ReadBytes(int(str.Length))
-    |> System.Convert.ToBase64String
-
-let getFullPlotlyJS() =
-    let assembly = Assembly.GetExecutingAssembly()
-    use str = assembly.GetManifestResourceStream($"FSharpTestBase.plotly-{Globals.PLOTLYJS_VERSION}.min.js")
-    use r = new StreamReader(str)
-    r.ReadToEnd()

tests/CoreTests/CoreTests/CoreTests.fsproj

@@ -10,7 +10,6 @@
   <ItemGroup>
     <EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.19.1.min.js" />
     <EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.19.1.min.js.LICENSE.txt" />
-    <Compile Include="TestUtils.fs" />
     <!--Test charts-->
     <Compile Include="HTMLCodegen\Chart2D.fs" />
     <!--HTMLCodegen-->

tests/CoreTests/CoreTests/HTMLCodegen/SimpleCharts.fs

@@ -229,6 +229,4 @@ let ``Image charts`` =
             """var layout = {"title":{"text":"This is Plotly.NET:"}};"""
             |> chartGeneratedContains Image.``Image chart from base64 string``
         );        
-
-       
     ]