fix bufferByTime test

Author: eulerfx

src/FSharp.Control.AsyncSeq.Profile7/AssemblyInfo.fs

@@ -4,10 +4,10 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Control.AsyncSeq.Profile7")>]
 [<assembly: AssemblyProductAttribute("FSharp.Control.AsyncSeq")>]
 [<assembly: AssemblyDescriptionAttribute("Asynchronous sequences for F#")>]
-[<assembly: AssemblyVersionAttribute("2.0.15")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.15")>]
+[<assembly: AssemblyVersionAttribute("2.0.16")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.16")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.0.15"
-    let [<Literal>] InformationalVersion = "2.0.15"
+    let [<Literal>] Version = "2.0.16"
+    let [<Literal>] InformationalVersion = "2.0.16"

src/FSharp.Control.AsyncSeq/AssemblyInfo.fs

@@ -4,10 +4,10 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Control.AsyncSeq")>]
 [<assembly: AssemblyProductAttribute("FSharp.Control.AsyncSeq")>]
 [<assembly: AssemblyDescriptionAttribute("Asynchronous sequences for F#")>]
-[<assembly: AssemblyVersionAttribute("2.0.15")>]
-[<assembly: AssemblyFileVersionAttribute("2.0.15")>]
+[<assembly: AssemblyVersionAttribute("2.0.16")>]
+[<assembly: AssemblyFileVersionAttribute("2.0.16")>]
 do ()
 
 module internal AssemblyVersionInformation =
-    let [<Literal>] Version = "2.0.15"
-    let [<Literal>] InformationalVersion = "2.0.15"
+    let [<Literal>] Version = "2.0.16"
+    let [<Literal>] InformationalVersion = "2.0.16"

tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqPerf.fsx

@@ -120,52 +120,37 @@ let collect n =
 //run bindUnfold
 //run collect
 
-let rec prependToAll (a:'a) (ls:'a list) : 'a list =
-  match ls with
-  | [] -> []
-  | hd::tl -> a::hd::prependToAll a tl
-
-let rec intersperse (a:'a) (ls:'a list) : 'a list =
-  match ls with
-  | [] -> []
-  | hd::tl -> hd::prependToAll a tl
+let Y = Choice1Of2
+let S = Choice2Of2
+  
+let timeMs = 500
 
-let intercalate (l:'a list) (xs:'a list list) : 'a list =
-  intersperse l xs |> List.concat
+let inp0 = [ ]
+let exp0 = [ ]
 
-let batch (size:int) (ls:'a list) : 'a list list =
-  let rec go batch ls =
-    match ls with
-    | [] -> [List.rev batch]
-    | _ when List.length batch = size -> (List.rev batch)::go [] ls
-    | hd::tl -> go (hd::batch) tl
-  go [] ls 
+let inp1 = [ Y 1 ; Y 2 ; S timeMs ; Y 3 ; Y 4 ; S timeMs ; Y 5 ; Y 6 ]
+let exp1 = [ [1;2] ; [3;4] ; [5;6] ]
 
-
-let Y = Choice1Of2
-let S = Choice2Of2  
-let sleepMs = 100
+//  let inp2 : Choice<int, int> list = [ S 500 ]
+//  let exp2 : int list list = [ [] ; [] ; [] ; []  ]
 
 let toSeq (xs:Choice<int, int> list) = asyncSeq {
   for x in xs do
     match x with
     | Choice1Of2 v -> yield v
-    | Choice2Of2 s -> do! Async.Sleep s }
+    | Choice2Of2 s -> do! Async.Sleep s }    
 
-for (size,batchSize) in [ (0,0) ; (10,2) ; (30,2) ] do
+for (inp,exp) in [ (inp0,exp0) ; (inp1,exp1) ] do
 
-  let expected = 
-    List.init size id
-    |> batch batchSize
-   
   let actual = 
-    expected
-    |> List.map (List.map Y)
-    |> intercalate [S sleepMs] 
-    |> toSeq
-    |> AsyncSeq.bufferByTime sleepMs
+    toSeq inp
+    |> AsyncSeq.bufferByTime (timeMs - 5)
     |> AsyncSeq.map List.ofArray
     |> AsyncSeq.toList
+  
+  printfn "actual=%A expected=%A" actual exp
+
+  //let ls = toSeq inp |> AsyncSeq.toList
+  //let actualLs = actual |> List.concat
 
-  //Assert.True ((actual = expected))
-  printfn "actual=%A expected=%A" actual expected
+  

tests/FSharp.Control.AsyncSeq.Tests/AsyncSeqTests.fs

@@ -452,12 +452,12 @@ let ``AsyncSeq.bufferByTime`` () =
   let Y = Choice1Of2
   let S = Choice2Of2
 
-  let timeMs = 100
+  let timeMs = 500
 
   let inp0 = [ ]
   let exp0 = [ ]
 
-  let inp1 = [ Y 1 ; Y 2 ; S 100 ; Y 3 ; Y 4 ; S 100 ; Y 5 ; Y 6 ]
+  let inp1 = [ Y 1 ; Y 2 ; S timeMs ; Y 3 ; Y 4 ; S timeMs ; Y 5 ; Y 6 ]
   let exp1 = [ [1;2] ; [3;4] ; [5;6] ]
 
 //  let inp2 : Choice<int, int> list = [ S 500 ]
@@ -473,12 +473,12 @@ let ``AsyncSeq.bufferByTime`` () =
 
     let actual = 
       toSeq inp
-      |> AsyncSeq.bufferByTime 100
+      |> AsyncSeq.bufferByTime (timeMs - 5)
       |> AsyncSeq.map List.ofArray
       |> AsyncSeq.toList
 
-    let ls = toSeq inp |> AsyncSeq.toList
-    let actualLs = actual |> List.concat
+    //let ls = toSeq inp |> AsyncSeq.toList
+    //let actualLs = actual |> List.concat
 
     Assert.True ((actual = exp))