(#63) Tests: fix compilation

src/WpfMath.Tests/ApprovalTestUtils.fs

@@ -15,9 +15,9 @@ open Newtonsoft.Json
 open Newtonsoft.Json.Converters
 open Newtonsoft.Json.Serialization
 
-open WpfMath
 open WpfMath.Atoms
 open WpfMath.Fonts
+open WpfMath.Parsers
 open WpfMath.Rendering
 
 type private BomlessFileWriter(data: string, ?extensionWithoutDot: string) =
@@ -119,7 +119,7 @@ let verifyObject: obj -> unit =
     serialize >> Approvals.Verify
 
 let verifyParseResult (formulaText: string): unit =
-    let parser = TexFormulaParser()
+    let parser = WpfTeXFormulaParser.Instance
     let formula = parser.Parse formulaText
     verifyObject formula
 

src/WpfMath.Tests/BoxTests.fs

@@ -3,6 +3,7 @@ module WpfMath.Tests.BoxTests
 open System
 
 open FSharp.Core.Fluent
+open WpfMath.Parsers
 open Xunit
 
 open WpfMath
@@ -12,7 +13,7 @@ open WpfMath.Rendering
 open WpfMath.Tests.ApprovalTestUtils
 
 let private parse(text: string) =
-    let parser = TexFormulaParser()
+    let parser = WpfTeXFormulaParser.Instance
     let result = parser.Parse text
     result.RootAtom
 
@@ -52,7 +53,7 @@ let ``ScriptsAtom should set Shift on the created box when creating box without
 let ``RowAtom creates boxes with proper sources``() =
     let source = "2+2"
     let src = src source
-    let parser = TexFormulaParser()
+    let parser = WpfTeXFormulaParser.Instance
     let formula = parser.Parse source
     let box = formula.CreateBox environment :?> HorizontalBox
     let chars = box.Children.filter (fun x -> x :? CharBox)
@@ -66,7 +67,7 @@ let ``RowAtom creates boxes with proper sources``() =
 let ``BigOperatorAtom creates a box with proper sources``() =
     let source = @"\int_a^b"
     let src = src source
-    let parser = TexFormulaParser()
+    let parser = WpfTeXFormulaParser.Instance
     let formula = parser.Parse source
     let box = formula.CreateBox environment :?> VerticalBox
 

src/WpfMath.Tests/CharBoxTests.fs

@@ -7,15 +7,16 @@ open Xunit
 
 open WpfMath
 open WpfMath.Boxes
+open WpfMath.Exceptions
 open WpfMath.Fonts
+open WpfMath.Parsers
 open WpfMath.Rendering
-open WpfMath.Exceptions
 
 type CharBoxTests() =
     static do Utils.initializeFontResourceLoading()
 
     let parse(text: string) =
-        let parser = TexFormulaParser()
+        let parser = WpfTeXFormulaParser.Instance
         let result = parser.Parse text
         result.RootAtom
 

src/WpfMath.Tests/ParserExceptionTests.fs

@@ -10,6 +10,7 @@ open WpfMath.Atoms
 open WpfMath.Colors
 open WpfMath.Exceptions
 open WpfMath.Parsers
+open WpfMath.Rendering
 open WpfMath.Tests.Utils
 
 [<Fact>]
@@ -69,7 +70,13 @@ let ``Incorrect command parser behavior should be detected``(): unit =
              member _.ProcessCommand _ =
                  CommandProcessingResult(SpaceAtom(null), 0) }
     let parserRegistry = Map([| "dummy", incorrectParser |])
-    let parser = TexFormulaParser(parserRegistry, Dictionary(), PredefinedColorParser.Instance)
+    let parser = TexFormulaParser(
+        parserRegistry,
+        Dictionary(),
+        PredefinedColorParser.Instance,
+        WpfBrushFactory.Instance,
+        Dictionary()
+    )
     let ex = Assert.Throws<TexParseException>(Action(fun () -> ignore <| parser.Parse("\dummy")))
     Assert.Contains("NextPosition = 0", ex.Message)
 

src/WpfMath.Tests/PredefinedColorParserTests.fs

@@ -1,6 +1,5 @@
 module WpfMath.Tests.PredefinedColorParserTests
 
-open System.Windows.Media
 
 open Xunit
 
@@ -10,7 +9,7 @@ let parser = PredefinedColorParser.Instance
 
 [<Fact>]
 let ``PredefinedColorParser parses a correctly defined color``(): unit =
-    Assert.Equal(Color.FromRgb(237uy, 27uy, 35uy), parser.Parse([| "red" |]).Value)
+    Assert.Equal(RgbaColor.FromRgb(237uy, 27uy, 35uy), parser.Parse([| "red" |]).Value)
 
 [<Fact>]
 let ``PredefinedColorParser returns null for wrong input``(): unit =

src/WpfMath.Tests/RenderingTests.fs

@@ -2,12 +2,13 @@ module WpfMath.Tests.RenderingTests
 
 open Xunit
 
-open WpfMath
+open WpfMath.Parsers
 open WpfMath.Rendering
 
+let private parser = WpfTeXFormulaParser.Instance
+
 [<Fact>]
 let ``TexRenderer.RenderToBitmap should create an image of proper size``() =
-    let parser = TexFormulaParser()
     let formula = parser.Parse "2+2=2"
     let environment = WpfTeXEnvironment.Create()
     let bitmap = formula.RenderToBitmap environment
@@ -16,7 +17,6 @@ let ``TexRenderer.RenderToBitmap should create an image of proper size``() =
 
 [<Fact>]
 let ``TexRenderer.RenderToBitmap should create an image of proper size with offset``() =
-    let parser = TexFormulaParser()
     let formula = parser.Parse "2+2=2"
     let environment = WpfTeXEnvironment.Create()
     let margin = 50
@@ -29,7 +29,6 @@ let ``TexRenderer.RenderToBitmap should create an image of proper size with offs
 
 [<Fact>]
 let ``TexRenderer.RenderToBitmap should work with different DPI``() =
-    let parser = TexFormulaParser()
     let formula = parser.Parse "2+2=2"
     let environment = WpfTeXEnvironment.Create()
     let bitmap = formula.RenderToBitmap(environment, dpi = 192.0)

src/WpfMath.Tests/Utils.fs

@@ -3,9 +3,9 @@ module WpfMath.Tests.Utils
 open System
 open System.Windows
 
+open WpfMath.Parsers
 open Xunit
 
-open WpfMath
 
 let initializeFontResourceLoading =
     let monitor = obj()
@@ -15,5 +15,5 @@ let initializeFontResourceLoading =
             then new Application() |> ignore)
 
 let assertParseThrows<'ex when 'ex :> exn>(formula: string): 'ex =
-    let parser = TexFormulaParser()
+    let parser = WpfTeXFormulaParser.Instance
     Assert.Throws<'ex>(Func<obj>(fun () -> upcast parser.Parse formula))