Remove ExpectoExtra.fs and fix files affected

Author: Jamil Maqdis Anton

tests/AppendTests.fs

@@ -2,7 +2,6 @@ module SqlStreamStore.FSharp.Tests.AppendTests
 
 open Expecto
 open SqlStreamStore.FSharp
-open SqlStreamStore.FSharp.Tests
 
 
 [<Tests>]
@@ -24,7 +23,7 @@ let tests =
 
               let! appendResult = Append.appendNewMessage inMemStore streamName appendVersion msg
 
-              ExpectExtra.equal 0 appendResult.CurrentVersion
+              Expect.equal appendResult.CurrentVersion 0 "Error: message version doesn't match."
           }
 
           testAsync "Should append a list of messages to stream." {
@@ -49,5 +48,5 @@ let tests =
               let msgList = [ msg1; msg2 ]
 
               let! appendResult = Append.appendNewMessages inMemStore streamName appendVersion msgList
-              ExpectExtra.equal 1 appendResult.CurrentVersion
+              Expect.equal appendResult.CurrentVersion 1 "Error: message version doesn't match."
           } ]

tests/ExpectoExtra.fs

@@ -2,8 +2,6 @@ module SqlStreamStore.FSharp.Tests.ReadTests
 
 open Expecto
 open SqlStreamStore.FSharp
-open SqlStreamStore.FSharp.Tests
-
 
 let newTestMessage: string -> MessageDetails =
     fun guid ->
@@ -43,8 +41,8 @@ let tests =
               readResult.Messages
               |> Array.sortBy (fun msg -> msg.MessageId)
               |> fun sorted ->
-                  ExpectExtra.equal guidString1 (sorted.[0].MessageId.ToString())
-                  ExpectExtra.equal guidString2 (sorted.[1].MessageId.ToString())
+                  Expect.equal (sorted.[0].MessageId.ToString()) guidString1 "Error: first message in stream doesn't match."
+                  Expect.equal (sorted.[1].MessageId.ToString()) guidString2 "Error: second message in stream doesn't match."
           }
           testAsync "Should read Backward from specific stream." {
               let inMemStore = new SqlStreamStore.InMemoryStreamStore()
@@ -69,8 +67,8 @@ let tests =
               readResult.Messages
               |> Array.sortBy (fun msg -> msg.MessageId)
               |> fun sorted ->
-                  ExpectExtra.equal guidString2 (sorted.[1].MessageId.ToString())
-                  ExpectExtra.equal guidString1 (sorted.[0].MessageId.ToString())
+                  Expect.equal (sorted.[1].MessageId.ToString()) guidString2 "Error: second message in stream doesn't match."
+                  Expect.equal (sorted.[0].MessageId.ToString()) guidString1 "Error: first message in stream doesn't match."
           }
 
           testAsync "Should read from all streams forward." {
@@ -97,8 +95,8 @@ let tests =
               readResult.Messages
               |> Array.sortBy (fun msg -> msg.MessageId)
               |> fun sorted ->
-                  ExpectExtra.equal guidString1 (sorted.[0].MessageId.ToString())
-                  ExpectExtra.equal guidString2 (sorted.[1].MessageId.ToString())
+                  Expect.equal (sorted.[0].MessageId.ToString()) guidString1 "Error: first message in stream doesn't match."
+                  Expect.equal (sorted.[1].MessageId.ToString()) guidString2 "Error: second message in stream doesn't match."
           }
 
           testAsync "Should read from all streams backward." {
@@ -125,6 +123,6 @@ let tests =
               readResult.Messages
               |> Array.sortBy (fun msg -> msg.MessageId)
               |> fun sorted ->
-                  ExpectExtra.equal guidString2 (sorted.[1].MessageId.ToString())
-                  ExpectExtra.equal guidString1 (sorted.[0].MessageId.ToString())
+                  Expect.equal (sorted.[1].MessageId.ToString()) guidString2 "Error: second message in stream doesn't match."
+                  Expect.equal (sorted.[0].MessageId.ToString()) guidString1 "Error: first message in stream doesn't match."
           } ]

tests/ReadTests.fs

@@ -7,7 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Compile Include="ExpectoExtra.fs" />
         <Compile Include="AppendTests.fs" />
         <Compile Include="ReadTests.fs" />
         <Compile Include="Program.fs" />