refactor tests to use applyGridToImageAsync function.

TestCentre/LibraryTests.fs

@@ -102,6 +102,7 @@
         open FsCheck.Xunit
         open DeathSocket
         open System.Drawing
+        open DeathSocket
         open DeathSocket.GridPainter
         open TestingHelpers
         open System.IO
@@ -116,13 +117,13 @@
             resetSavingTestArea ()
             let oPath = generateLoadPath ()
             let sPath = generateSavePath oPath
-            { originalPath = oPath
+            Brush ({ originalPath = oPath
-              savePath = sPath
+                     savePath = sPath
-              colour = randomBrush () :?> Brush
+                     colour = randomBrush () :?> Brush
-              penWidth = float32 (newPenWidth())
+                     penWidth = float32 (newPenWidth())
-              rows = 10
+                     rows = 10
-              columns = 10 }
+                     columns = 10 })
-            |> applyBrushSpecGridAsync
+            |> applyGridToImageAsync
             |> Async.RunSynchronously
             (File.Exists sPath) = true
 
@@ -131,16 +132,16 @@
             resetSavingTestArea ()
             let oPath = generateLoadPath ()
             let sPath = generateSavePath oPath
-            { originalPath = oPath
+            RGBA ({ originalPath = oPath
-              savePath = sPath
+                    savePath = sPath
-              alpha = float (newRGBANum ())
+                    alpha = float (newRGBANum ())
-              red = float (newRGBANum ())
+                    red = float (newRGBANum ())
-              green = float (newRGBANum ())
+                    green = float (newRGBANum ())
-              blue = float (newRGBANum ())
+                    blue = float (newRGBANum ())
-              penWidth = float32 (newPenWidth())
+                    penWidth = float32 (newPenWidth())
-              rows = 10
+                    rows = 10
-              columns = 10 }
+                    columns = 10 })
-            |> applyRGBAGridAsync
+            |> applyGridToImageAsync
             |> Async.RunSynchronously
             (File.Exists sPath) = true
 
@@ -180,13 +181,13 @@
             resetSavingTestArea()
             let oPath = generateLoadPath ()
             let sPath = generateSavePath oPath
-            { originalPath = oPath
+            Skia ({ originalPath = oPath
-              savePath= sPath
+                    savePath= sPath
-              skColour = randomSKColour ()
+                    skColour = randomSKColour ()
-              penWidth = float32 (newPenWidth())
+                    penWidth = float32 (newPenWidth())
-              rows = newNum ()
+                    rows = newNum ()
-              columns = newNum () }
+                    columns = newNum () })
-            |> applySkiaGridAsync
+            |> applyGridToImageAsync
             |> Async.RunSynchronously
             (File.Exists sPath) = true
 
@@ -195,15 +196,15 @@
             resetSavingTestArea()
             let oPath = generateLoadPath ()
             let sPath = generateSavePath oPath
-            { originalPath = oPath
+            SkiaRGB ({ originalPath = oPath
-              savePath= sPath
+                       savePath= sPath
-              red = float32 (newRGBANum ())
+                       red = float32 (newRGBANum ())
-              green = float32 (newRGBANum ())
+                       green = float32 (newRGBANum ())
-              blue = float32 (newRGBANum ())
+                       blue = float32 (newRGBANum ())
-              penWidth = float32 (newPenWidth())
+                       penWidth = float32 (newPenWidth())
-              rows = newNum ()
+                       rows = newNum ()
-              columns = newNum () }
+                       columns = newNum () })
-            |> applySkiaRGBGridAsync
+            |> applyGridToImageAsync
             |> Async.RunSynchronously
             (File.Exists sPath) = true