@@ -38,21 +38,21 @@ let single (xs : 'a seq) =
3838 then fail <| sprintf " Expected single item in sequence, but found %i items.\n %A " length xs
3939 Seq.head xs
4040let throws < 'e when 'e :> exn > ( action : unit -> unit ) = Assert.Throws< 'e>( action)
41- let throwsAsync < 'e when 'e :> exn > ( action : unit Async ) = Assert.ThrowsAsync< 'e>( fun () -> Async.StartAsTask ( action) )
42- let throwsAsyncVal < 'e when 'e :> exn > ( action : unit AsyncVal ) = Assert.ThrowsAsync< 'e>( fun () -> Async.StartAsTask ( action |> AsyncVal.toAsync))
41+ let throwsAsync < 'e when 'e :> exn > ( action : unit Async ) = Assert.ThrowsAsync< 'e>( fun () -> Async.StartImmediateAsTask action)
42+ let throwsAsyncVal < 'e when 'e :> exn > ( action : unit AsyncVal ) = Assert.ThrowsAsync< 'e>( fun () -> Async.StartImmediateAsTask ( action |> AsyncVal.toAsync))
4343let sync = Async.RunSynchronously
4444let is < 't > ( o : obj ) = o :? 't
4545
46- let hasError ( errMsg : string ) ( errors : GQLProblemDetails seq ) =
46+ let hasError ( errMsg : string ) ( errors : GQLProblemDetails seq ) =
4747 let containsMessage = errors |> Seq.exists ( fun pd -> pd.Message.Contains( errMsg))
4848 Assert.True ( containsMessage, sprintf " Expected to contain message '%s ', but no such message was found. Messages found: %A " errMsg errors)
4949
5050let hasErrorAtPath path ( errMsg : string ) ( errors : GQLProblemDetails seq ) =
51- match errors |> Seq.where ( fun pd -> pd.Message.Contains( errMsg) ) |> Seq.tryHead with
51+ match errors |> Seq.where ( fun pd -> pd.Message.Contains errMsg) |> Seq.tryHead with
5252 | Some error ->
5353 error.Path
54- |> Skippable.filter ( fun pathValue -> Assert.True(( pathValue = path), $" Expected that message '%s {errMsg}' has path {path}, but path {pathValue} found." ); true )
55- |> Skippable.defaultWith ( fun () -> Assert.Fail( $" Expected that message '%s {errMsg}' has path {path}, but no path found." ); []) |> ignore
54+ |> Skippable.filter ( fun pathValue -> Assert.True (( pathValue = path), $" Expected that message '%s {errMsg}' has path {path}, but path {pathValue} found." ); true )
55+ |> Skippable.defaultWith ( fun () -> Assert.Fail ( $" Expected that message '%s {errMsg}' has path {path}, but no path found." ); []) |> ignore
5656 | None ->
5757 Assert.Fail ( $" Expected to contain message '%s {errMsg}', but no such message was found. Messages found: %A {errors}" )
5858
@@ -73,7 +73,7 @@ let seqEquals (expected : 'a seq) (actual : 'a seq) =
7373 Assert.Equal < 'a >( expected , actual )
7474
7575let greaterThanOrEqual expected actual =
76- Assert.True ( actual >= expected , sprintf "Expected value to be greather than or equal to % A , but was : % A " expected actual )
76+ Assert.True ( actual >= expected , sprintf "Expected value to be greather than or equal to % A , but was : % A " expected actual )
7777
7878open System.Text.Json
7979open FSharp.Data.GraphQL.Types
@@ -102,15 +102,15 @@ let waitEvent (mre : ManualResetEvent) errorMsg =
102102 then fail errorMsg
103103
104104let rec waitFor ( condition : unit -> bool ) ( times : int ) errorMsg =
105- Thread.Sleep( 100 ) // Wait a bit before checking condition
105+ Thread.Sleep 100 // Wait a bit before checking condition
106106 if not ( condition ())
107107 then
108108 if times = 0
109109 then fail errorMsg
110110 else waitFor condition ( times - 1 ) errorMsg
111111
112112let rec ensureThat ( condition : unit -> bool ) ( times : int ) errorMsg =
113- Thread.Sleep( 100 ) // Wait a bit before checking condition
113+ Thread.Sleep 100 // Wait a bit before checking condition
114114 if not ( condition ())
115115 then fail errorMsg
116116 elif times > 0
@@ -130,35 +130,34 @@ type TestObserver<'T>(obs : IObservable<'T>, ?onReceived : TestObserver<'T> -> '
130130 let mre = new ManualResetEvent( false )
131131 let mutable subscription = Unchecked.defaultof< IDisposable>
132132 do subscription <- obs.Subscribe( this)
133- member _.Received
134- with get() = received.AsEnumerable()
135- member _.WaitCompleted (? expectedItemCount , ? timeout ) =
133+ member _.Received = received.AsEnumerable()
134+ member _.WaitCompleted (? expectedItemCount , ? timeout ) =
136135 let ms = defaultArg timeout 30
137- if TimeSpan.FromSeconds( float ms) |> mre.WaitOne |> not
136+ if TimeSpan.FromSeconds ( float ms) |> mre.WaitOne |> not
138137 then fail " Timeout waiting for OnCompleted"
139138 match expectedItemCount with
140139 | Some x ->
141140 if received.Count < x
142141 then failwithf " Expected to receive %i items, but received %i \n Items: %A " x received.Count received
143142 | None -> ()
144- member _.WaitForItems ( expectedItemCount ) =
143+ member _.WaitForItems ( expectedItemCount ) =
145144 let errorMsg = sprintf " Expected to receive least %i items, but received %i \n Items: %A " expectedItemCount received.Count received
146145 waitFor ( fun () -> received.Count = expectedItemCount) ( expectedItemCount * 100 ) errorMsg
147- member x.WaitForItem () = x.WaitForItems( 1 )
146+ member x.WaitForItem () = x.WaitForItems( 1 )
148147 member _.IsCompleted
149148 with get() = isCompleted
150149 interface IObserver< 'T> with
151- member _.OnCompleted () =
150+ member _.OnCompleted () =
152151 isCompleted <- true
153152 mre.Set() |> ignore
154- member _.OnError ( error ) = error.Reraise()
155- member _.OnNext ( value ) =
156- received.Add( value)
153+ member _.OnError ( error ) = error.Reraise()
154+ member _.OnNext ( value ) =
155+ received.Add ( value)
157156 onReceived |> Option.iter ( fun evt -> evt this value)
158157 interface IDisposable with
159- member _.Dispose () =
160- subscription.Dispose()
161- mre.Dispose()
158+ member _.Dispose () =
159+ subscription.Dispose ()
160+ mre.Dispose ()
162161
163162[<RequireQualifiedAccess>]
164163module Observer =
0 commit comments