Use FluentAssertions in unit tests

Author: vzarytovskii

tests/FSharp.Compiler.UnitTests/FsiTests.fs

@@ -87,7 +87,7 @@ module FsiTests =
 
         let values = fsiSession.GetBoundValues() |> List.map (fun x -> x.Value.ReflectionValue)
 
-        Assert.shouldBe [4;7;6;5;1;2;3] values
+        Assert.shouldBeEquivalentTo [4;7;6;5;1;2;3] values
 
     [<Fact>]
     let ``Seven bound values are ordered and have their correct type`` () =
@@ -530,7 +530,6 @@ module FsiTests =
 
     type TestFSharpFunc() =
         inherit FSharpFunc<int, int>()
-
         override _.Invoke x = x
 
     type ``Test2FSharp @ Func``() =

tests/FSharp.Compiler.UnitTests/ManglingNameOfProvidedTypes.fs

@@ -26,19 +26,19 @@ type ManglingNamesOfProvidedTypesWithSingleParameter() =
     member this.DemangleNonDefaultValue() = 
         let name, parameters = PrettyNaming.demangleProvidedTypeName "MyNamespace.Test,Foo=\"xyz\""
         Assert.shouldBe "MyNamespace.Test" name
-        Assert.shouldBe [| "Foo", "xyz" |] parameters
+        Assert.shouldBeEquivalentTo [| "Foo", "xyz" |] parameters
 
     [<Fact>]
     member this.DemangleDefaultValue() = 
         let name, parameters = PrettyNaming.demangleProvidedTypeName "MyNamespace.Test,"
         Assert.shouldBe "MyNamespace.Test" name
-        Assert.shouldBe [||] parameters
+        Assert.shouldBeEquivalentTo [||] parameters
 
     [<Fact>]
     member this.DemangleNewDefaultValue() = 
         let name, parameters = PrettyNaming.demangleProvidedTypeName "MyNamespace.Test"
         Assert.shouldBe "MyNamespace.Test" name
-        Assert.shouldBe [||] parameters
+        Assert.shouldBeEquivalentTo [||] parameters
 
 
 type ManglingNamesOfProvidedTypesWithMultipleParameter() = 
@@ -66,4 +66,4 @@ type ManglingNamesOfProvidedTypesWithMultipleParameter() =
         let name, parameters = PrettyNaming.demangleProvidedTypeName "TestType,Foo=\"xyz\",Foo2=\"abc\""
         Assert.shouldBe "TestType" name
         Assert.shouldBe([| "Foo", "xyz"
-                           "Foo2", "abc" |], parameters)
+                           "Foo2", "abc" |], parameters)

tests/FSharp.Compiler.UnitTests/SuggestionBuffer.fs

@@ -23,7 +23,7 @@ module SuggestionBuffer =
 
         let results = Array.ofSeq buffer
 
-        Assert.shouldBe [| "abce" |] results
+        Assert.shouldBeEquivalentTo [| "abce" |] results
 
     [<Fact>]
     let SmallIdentifierShouldBeIgnored() =
@@ -42,7 +42,7 @@ module SuggestionBuffer =
         let results = Array.ofSeq buffer
 
         Assert.shouldBeTrue buffer.Disabled
-        Assert.shouldBe [||] results
+        Assert.shouldBeEquivalentTo [||] results
 
     [<Fact>]
     let BufferShouldOnlyTakeTop5Elements() =
@@ -57,7 +57,7 @@ module SuggestionBuffer =
 
         let results = Array.ofSeq buffer
 
-        Assert.shouldBe [| "abce"; "abcg"; "abch"; "abci"; "abcj"|] results
+        Assert.shouldBeEquivalentTo [| "abce"; "abcg"; "abch"; "abci"; "abcj"|] results
 
     [<Fact>]
     let BufferShouldUseEarlierElementsIfTheyHaveSameScore() =
@@ -71,7 +71,7 @@ module SuggestionBuffer =
 
         let results = Array.ofSeq buffer
 
-        Assert.shouldBe [| "abce"; "abcf"; "abcg"; "abch"; "abci"|] results
+        Assert.shouldBeEquivalentTo [| "abce"; "abcf"; "abcg"; "abch"; "abci"|] results
 
 
     [<Fact>]
@@ -101,4 +101,4 @@ module SuggestionBuffer =
 
         let results = Array.ofSeq buffer
 
-        Assert.shouldBe [| "abc"; "abce" |] results
+        Assert.shouldBeEquivalentTo [| "abc"; "abce" |] results

tests/FSharp.Test.Utilities/Assert.fs

@@ -4,6 +4,9 @@ module Assert =
     open FluentAssertions
     open System.Collections
 
+    let inline shouldBeEquivalentTo (expected : ^T) (actual : ^U) =
+        actual.Should().BeEquivalentTo(expected, "") |> ignore
+
     let inline shouldBe (expected : ^T) (actual : ^U) =
         actual.Should().Be(expected, "") |> ignore
 

tests/fsharp/FSharpSuite.Tests.fsproj

@@ -20,9 +20,7 @@
     <Compile Include="..\..\src\scripts\scriptlib.fsx">
       <Link>scriptlib.fsx</Link>
     </Compile>
-    <Compile Include="..\FSharp.Compiler.UnitTests\NunitHelpers.fs">
-      <Link>NunitHelpers.fs</Link>
-    </Compile>
+    <Compile Include="NUnitHelpers.fs" />
     <Compile Include="HandleExpects.fs" />
     <Compile Include="single-test.fs" />
     <Compile Include="TypeProviderTests.fs" />
@@ -96,7 +94,7 @@
   <ItemGroup>
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
     <ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
-    <ProjectReference Include="..\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
+    <ProjectReference Include="$(FSharpTestsRoot)\FSharp.Test.Utilities\FSharp.Test.Utilities.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

tests/fsharp/NUnitHelpers.fs

@@ -0,0 +1,14 @@
+namespace NUnit.Framework
+
+module Assert =
+
+    let inline fail message = Assert.Fail message
+
+    let inline failf fmt = Printf.kprintf fail fmt
+
+    let inline areEqual (expected: ^T) (actual: ^T) =
+        Assert.AreEqual(expected, actual)
+
+module StringAssert =
+
+    let inline contains expected actual = StringAssert.Contains(expected, actual)