Merge pull request #5 from akhansari/feature/diffract

Use Diffract as assertion lib

Directory.Build.props

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
+    <!--<LangVersion>6.0</LangVersion>-->
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <MSBuildTreatWarningsAsErrors>true</MSBuildTreatWarningsAsErrors>
     <WarningLevel>5</WarningLevel>

EsBankAccount.Tests/Domain/BankAccountTests.fs

@@ -38,7 +38,7 @@ let ``when withdrawing, the threshold limit should not be exceeded`` () =
         When
             ( Withdraw (1m, DateTime.MinValue, Some thresholdLimit) )
         ThenError
-            ( ThresholdExceeded (-501m, thresholdLimit) |> WithdrawingError )
+            ( ThresholdExceeded (-501m, thresholdLimit) |> WithdrawalError )
     }
 
 [<Fact>]

EsBankAccount.Tests/Dsl/DeciderSpecs.fs

@@ -1,12 +1,12 @@
 namespace EsBankAccount.Tests.Domain
 
-open Swensen.Unquote
+open Diffract
 
 type DeciderSpecState<'State, 'Outcome> =
     { State: 'State
       Outcome: 'Outcome }
 
-type DeciderSpecList<'State, 'Command, 'Event>
+type DeciderSpecList<'State, 'Command, 'Event when 'Event: equality>
     (initialState: 'State
     , evolve: 'State -> 'Event -> 'State
     , decide: 'Command -> 'State -> 'Event list)
@@ -28,12 +28,13 @@ type DeciderSpecList<'State, 'Command, 'Event>
             Outcome = events }
 
     [<CustomOperation "Then">]
-    member _.Then (spec, expected) =
-        let events = spec.Outcome
-        test <@ events = expected @>
+    member _.Then (spec, expected: 'Event list) =
+        if not (expected = spec.Outcome) then
+            Diffract.Assert (expected, spec.Outcome)
         spec
 
-type DeciderSpecResult<'State, 'Command, 'Event, 'Error>
+type DeciderSpecResult<'State, 'Command, 'Event, 'Error
+        when 'Event: equality and 'Error: equality>
     (initialState: 'State
     , evolve: 'State -> 'Event -> 'State
     , decide: 'Command -> 'State -> Result<'Event list, 'Error>)
@@ -58,13 +59,13 @@ type DeciderSpecResult<'State, 'Command, 'Event, 'Error>
             Outcome = result }
 
     [<CustomOperation "Then">]
-    member _.ThenOk (spec, expected) =
-        let result = spec.Outcome
-        test <@ result = Ok expected @>
+    member _.ThenOk (spec, expected: 'Event list) =
+        if not (Ok expected = spec.Outcome) then
+            Diffract.Assert (Ok expected, spec.Outcome)
         spec
 
     [<CustomOperation "ThenError">]
-    member _.ThenError (spec, expected) =
-        let result = spec.Outcome
-        test <@ result = Error expected @>
+    member _.ThenError (spec, expected: 'Error) =
+        if not (Error expected = spec.Outcome) then
+            Diffract.Assert (Error expected, spec.Outcome)
         spec

EsBankAccount.Tests/Dsl/DeciderStateSpecs.fs

@@ -1,8 +1,8 @@
 namespace EsBankAccount.Tests.Domain
 
-open Swensen.Unquote
+open Diffract
 
-type DeciderStateSpecList<'State, 'Command, 'Event>
+type DeciderStateSpecList<'State, 'Command, 'Event when 'State: equality>
     (initialState: 'State
     , evolve: 'State -> 'Event -> 'State
     , decide: 'Command -> 'State -> 'Event list)
@@ -21,11 +21,12 @@ type DeciderStateSpecList<'State, 'Command, 'Event>
         |> List.fold evolve state
 
     [<CustomOperation "Then">]
-    member _.Then (state, expected) =
-        test <@ state = expected @>
+    member _.Then (state, expected: 'State) =
+        if not (expected = state) then
+            Diffract.Assert (expected, state)
         state
 
-type DeciderStateSpecResult<'State, 'Command, 'Event, 'Error>
+type DeciderStateSpecResult<'State, 'Command, 'Event, 'Error when 'State: equality>
     (initialState: 'State
     , evolve: 'State -> 'Event -> 'State
     , decide: 'Command -> 'State -> Result<'Event list, 'Error>)
@@ -35,7 +36,7 @@ type DeciderStateSpecResult<'State, 'Command, 'Event, 'Error>
         initialState
 
     [<CustomOperation "Given">]
-    member _.Given (_, newState) =
+    member _.Given (_, newState: 'State) =
         newState
 
     [<CustomOperation "GivenEvents">]
@@ -49,6 +50,7 @@ type DeciderStateSpecResult<'State, 'Command, 'Event, 'Error>
         | Error _   -> state
 
     [<CustomOperation "Then">]
-    member _.Then (state, expected) =
-        test <@ state = expected @>
+    member _.Then (state, expected: 'State) =
+        if not (expected = state) then
+            Diffract.Assert (expected, state)
         state

EsBankAccount.Tests/EsBankAccount.Tests.fsproj

@@ -13,13 +13,13 @@
 
     <Compile Include="Startup\BankAccountClientTests.fs" />
 
-  <Compile Include="Program.fs" />
+    <Compile Include="Program.fs" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="FsCheck.Xunit" Version="2.16.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Unquote" Version="6.1.0" />
+	<PackageReference Include="Diffract" Version="0.1.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>

EsBankAccount.Tests/Startup/BankAccountClientTests.fs

@@ -1,7 +1,6 @@
 module EsBankAccount.Tests.Startup.BankAccountClientTests
 
 open System
-open Swensen.Unquote
 open Xunit
 
 open EsBankAccount.Startup
@@ -18,5 +17,5 @@ let ``Should deposit and then withdraw`` () =
         let! _depositResult = deposit accountId 10m
         let! _withdrawalResult = withdraw accountId 5m
         let! account = ReadModelClient.readAccount accountId
-        account.Transactions.Length =! 2
+        Assert.Equal (2, account.Transactions.Length)
     }

EsBankAccount/Domain/BankAccount.fs

@@ -60,8 +60,8 @@ let private close date state =
 
 type Error =
     | AlreadyClosed
-    | WithdrawingError  of WithdrawingError
-    | ClosingError      of ClosingError
+    | WithdrawalError  of WithdrawingError
+    | ClosingError     of ClosingError
 and WithdrawingError =
     | ThresholdExceeded of upcomingBalance: Amount * thresholdLimit: Amount
 and ClosingError =
@@ -78,7 +78,7 @@ module private Check =
         let thresholdLimit thresholdLimit amount state =
             match thresholdLimit with
             | Some thresholdLimit when state.Balance - amount < thresholdLimit ->
-                ThresholdExceeded (state.Balance - amount, thresholdLimit) |> WithdrawingError |> Error
+                ThresholdExceeded (state.Balance - amount, thresholdLimit) |> WithdrawalError |> Error
             | _ ->
                 Ok ()
 

EsBankAccount/Startup/BankAccountClient.fs

@@ -35,7 +35,7 @@ module private Client =
     let errorMessage = function
         | BankAccount.AlreadyClosed ->
             "Account already closed"
-        | BankAccount.WithdrawingError (BankAccount.ThresholdExceeded _) ->
+        | BankAccount.WithdrawalError (BankAccount.ThresholdExceeded _) ->
             "Threshold exceeded, withdrawal denied"
         | BankAccount.ClosingError (BankAccount.BalanceIsNegative _) ->
             "Balance is negative, closing denied"

README.md

@@ -79,6 +79,9 @@ There are two kinds of them:
    - We aren't too concerned about the outcome.
    - But, we need to build the state in a particular way.
 
+It should be noted that the BDD DSL style brings more readability and neat helpers but it isn't mandatory.\
+In your test files you can have different kind of unit tests. For instance a test could be as simple as [this](https://github.com/thinkbeforecoding/UnoCore/blob/solution/Uno.Tests/Tests.fs).
+
 ### Decider Structure
 
 It's possible to organize the Decider into five sections: