From 142c80604e54f50324415706306f86a603581767 Mon Sep 17 00:00:00 2001 From: gusty <1261319+gusty@users.noreply.github.com> Date: Mon, 18 Dec 2023 07:49:37 +0100 Subject: [PATCH] Move Collection tests to own file --- tests/FSharpPlus.Tests/Collections.fs | 217 +++++++++++++++++++++++++- tests/FSharpPlus.Tests/General.fs | 211 ------------------------- 2 files changed, 215 insertions(+), 213 deletions(-) diff --git a/tests/FSharpPlus.Tests/Collections.fs b/tests/FSharpPlus.Tests/Collections.fs index 1e5b3abcb..67150b96e 100644 --- a/tests/FSharpPlus.Tests/Collections.fs +++ b/tests/FSharpPlus.Tests/Collections.fs @@ -9,16 +9,229 @@ open FSharpPlus.Internals #endif module Collections = - + open System + open System.Collections + open System.Collections.Generic + open System.Collections.Concurrent + open System.Collections.ObjectModel + [] let chunkBy () = #if TEST_TRACE Traces.reset() #endif + let source = [1; 2; 3; 5; 7; 9] let expected = [(1, [1]); (0, [2]); (1, [3; 5; 7; 9])] let actual = chunkBy (flip (%) 2) source CollectionAssert.AreEqual(expected, actual) + #if TEST_TRACE CollectionAssert.AreEqual (["ChunkBy, list<'T>"], Traces.get()) - #endif + #endif + + + let testCollections = + let bigSeq = seq {1..10000000} + let bigLst = [ 1..10000000 ] + let bigArr = [|1..10000000|] + let bigMut = ResizeArray(seq {1..10000000}) + + let _ = head bigSeq + let _ = head bigLst + let _ = head bigArr + + let _ = skip 1000 bigSeq + let _ = skip 1000 bigLst + let _ = skip 1000 bigArr + let _ = skip 1000 bigMut + let _ = "hello world" |> skip 6 |> toList + let _ = ofList ['h';'e';'l';'l';'o';' '] + "world" + let _ = item 2 "hello" + + () + + + let testSeqConversions = + let sk: Generic.Stack<_> = ofSeq { 1 .. 3 } + let sg: string = ofSeq {'1'..'3'} // but it will come back as seq + let sb: Text.StringBuilder = ofSeq {'1'..'3'} // but it will come back as seq + let sq1:_ seq = ofSeq { 1 .. 3 } + let sq2:_ seq = ofSeq (seq [(1, "One"); (2, "Two")]) + let sq3:_ seq = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) + let sq4:_ seq = ofSeq (seq [(1, "One", '1', 1M); (2, "Two", '2', 2M)]) + let ls1:_ list = ofSeq {'1'..'3'} + let ls2:_ list = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) + let st1:_ Set = ofSeq {'1'..'3'} + let st2:_ Set = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) + let ss: Generic.SortedSet<_> = ofSeq (seq [3..6]) + let ra: Generic.List<_> = ofSeq (seq [1..3]) + let sl: Generic.SortedList<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... + let _sl:Generic.SortedList<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let dc :Generic.Dictionary<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as KeyValuePair + let mp :Map<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... + let _mp:Map<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let d : Generic.IDictionary<_,_> = ofSeq (seq [("One", 1)]) // but it will come back as ... + let _d: Generic.IDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let r : IReadOnlyDictionary<_,_> = ofSeq (seq [("One", 1)]) // but it will come back as ... + let _r: IReadOnlyDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let rc: IReadOnlyCollection<_> = ofSeq (seq [2..7]) + let ut: Hashtable = ofSeq (seq [1,'1';2, '2';3,'3']) // but it will come back as seq + let al: ArrayList = ofSeq (seq ["1";"2";"3"]) // but it will come back as seq + let us: SortedList = ofSeq (seq [4,'2';3,'4']) // but it will come back as seq + let cc: BlockingCollection<_> = ofSeq {'1'..'3'} // but it will come back as seq + let cd: ConcurrentDictionary<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... + let _cd:ConcurrentDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let cb: ConcurrentBag<_> = ofSeq {'1'..'3'} + + // now go back + let _sk' = toSeq sk + let _sg' = toSeq sg + let _sb' = toSeq sb + let _sq1' = toSeq sq1 + let _sq2' = toSeq sq2 + let _sq3' = toSeq sq3 + let _sq4' = toSeq sq4 + let _ls1' = toSeq ls1 + let _ls2' = toSeq ls2 + let _st1' = toSeq st1 + let _st2' = toSeq st2 + let _ss' = toSeq ss + let _ra' = toSeq ra + let _sl' = toSeq sl + let _dc' = toSeq dc + let _mp' = toSeq mp + let _d' = toSeq d + let _r' = toSeq r + let _rc' = toSeq rc + let _ut' = toSeq ut + let _al' = toSeq al + let _us' = toSeq us + let _cc' = toSeq cc + let _cd' = toSeq cd + let _cb' = toSeq cb + + // there are some 'one-way' collections that can only be converted toSeq + let columns = + let d = new Data.DataTable () + [|new Data.DataColumn "id";new Data.DataColumn "column1";new Data.DataColumn "column2"|] |> d.Columns.AddRange + d.Columns + let _col1 = columns |> find (fun x -> x.ColumnName = "column1") + let _cols = columns |> toList |> map (fun x -> x.ColumnName) + + // Defaults + let _12: WrappedListI<_> = seq [1;2] |> ofSeq + + () + + let testListConversions = + + // From sequence + let sk: Generic.Stack<_> = ofList [ 1 .. 3 ] + let sg: string = ofList ['1'..'3'] // but it will come back as seq + let sb: Text.StringBuilder = ofList ['1'..'3'] // but it will come back as seq + let sq1:_ seq = ofList [ 1 .. 3 ] + let sq2:_ seq = ofList ([(1, "One"); (2, "Two")]) + let sq3:_ seq = ofList ([(1, "One", '1'); (2, "Two", '2')]) + let sq4:_ seq = ofList ([(1, "One", '1', 1M); (2, "Two", '2', 2M)]) + let ls1:_ list = ofList ['1'..'3'] + let ls2:_ list = ofList ([(1, "One", '1'); (2, "Two", '2')]) + let st1:_ Set = ofList ['1'..'3'] + let st2:_ Set = ofList ([(1, "One", '1'); (2, "Two", '2')]) + let ss: Generic.SortedSet<_> = ofList ([3..6]) + let ra: Generic.List<_> = ofList ([1..3]) + let sl: Generic.SortedList<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... + let _sl:Generic.SortedList<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let dc :Generic.Dictionary<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as KeyValuePair + let mp :Map<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... + let _mp:Map<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let d : Generic.IDictionary<_,_> = ofList ([("One", 1)]) // but it will come back as ... + let _d: Generic.IDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let r : IReadOnlyDictionary<_,_> = ofList ([("One", 1)]) // but it will come back as ... + let _r: IReadOnlyDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let rc: IReadOnlyCollection<_> = ofList ([2..5]) + let ut: Hashtable = ofList ([1,'1';2, '2';3,'3']) // but it will come back as seq + let al: ArrayList = ofList (["1";"2";"3"]) // but it will come back as seq + let us: SortedList = ofList ([4,'2';3,'4']) // but it will come back as seq + let cc: BlockingCollection<_> = ofList ['1'..'3'] // but it will come back as seq + let cd: ConcurrentDictionary<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... + let _cd:ConcurrentDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) + let cb: ConcurrentBag<_> = ofList ['1'..'3'] + + // now go back + let _sk' = toList sk + let _sg' = toList sg + let _sb' = toList sb + let _sq1' = toList sq1 + let _sq2' = toList sq2 + let _sq3' = toList sq3 + let _sq4' = toList sq4 + let _ls1' = toList ls1 + let _ls2' = toList ls2 + let _st1' = toList st1 + let _st2' = toList st2 + let _ss' = toList ss + let _ra' = toList ra + let _sl' = toList sl + let _dc' = toList dc + let _mp' = toList mp + let _d' = toList d + let _r' = toList r + let _rc' = toList rc + let _ut' = toList ut + let _al' = toList al + let _us' = toList us + let _cc' = toList cc + let _cd' = toList cd + let _cb' = toList cb + + () + + let testSorts = + let _r1 = [4..1] |> sort + let _r2 = [4..1] |> sortBy string + let _r3 = seq [4..1] |> sort + let _r4 = seq [4..1] |> sortBy string + let _r5 = ResizeArray [4..1] |> sort + let _r6 = ResizeArray [4..1] |> sortBy string + () + + let testGeneralizableValues () = + let a: list<_> = empty + let _ = 0 ::a + let _ = '0'::a + + let b: WrappedSeqA<_> = empty + let _ = WrappedSeqA [ 0 ] <|> b + let _ = WrappedSeqA ['0'] <|> b + + () + + [] + let readOnlyNth () = + let readOnlyCollection = ReadOnlyCollection [|1..10|] + let iReadOnlyList = readOnlyCollection :> IReadOnlyList<_> + Assert.AreEqual (2, nth 1 [1..10]) + Assert.AreEqual (2, nth 1 readOnlyCollection) + Assert.AreEqual (2, nth 1 iReadOnlyList) + + [] + let readOnlyNthIndex () = + let l = ListOnlyIndex [1..10] + Assert.AreEqual (2, nth 1 l) + let rl = ReadOnlyListOnlyIndex [1..10] + Assert.AreEqual (2, nth 1 rl) + + [] + let choose () = + let d = choose Some ((ofSeq :seq<_*_> -> Dictionary<_,_>) (seq ["a", 1; "b", 2])) + Assert.IsInstanceOf>> (Some d) + + let d' = choose Some ((ofSeq :seq<_*_> -> IDictionary<_,_>) (seq ["a", 1; "b", 2])) + Assert.IsInstanceOf>> (Some d') + + let rd = choose Some ((ofSeq :seq<_*_> -> IReadOnlyDictionary<_,_>) (seq ["a", 1; "b", 2])) + Assert.IsInstanceOf>> (Some rd) + + let m = choose Some ((ofSeq :seq<_*_> -> Map<_,_>) (seq ["a", 1; "b", 2])) + Assert.IsInstanceOf>> (Some m) diff --git a/tests/FSharpPlus.Tests/General.fs b/tests/FSharpPlus.Tests/General.fs index d10bc2609..61217b02e 100644 --- a/tests/FSharpPlus.Tests/General.fs +++ b/tests/FSharpPlus.Tests/General.fs @@ -479,218 +479,7 @@ module Functor = let nel = zip (NonEmptyList.ofList [1; 2]) (NonEmptyList.ofList ["a"; "b"; "c"]) CollectionAssert.AreEqual (NonEmptyList.ofList [1,"a"; 2,"b"], nel) -module Collections2 = - - open System.Collections.Concurrent - - let testCollections = - let bigSeq = seq {1..10000000} - let bigLst = [ 1..10000000 ] - let bigArr = [|1..10000000|] - let bigMut = ResizeArray(seq {1..10000000}) - - let _ = head bigSeq - let _ = head bigLst - let _ = head bigArr - - let _ = skip 1000 bigSeq - let _ = skip 1000 bigLst - let _ = skip 1000 bigArr - let _ = skip 1000 bigMut - let _ = "hello world" |> skip 6 |> toList - let _ = ofList ['h';'e';'l';'l';'o';' '] + "world" - let _ = item 2 "hello" - () - - let testSeqConversions = - - let sk: Generic.Stack<_> = ofSeq { 1 .. 3 } - let sg: string = ofSeq {'1'..'3'} // but it will come back as seq - let sb: Text.StringBuilder = ofSeq {'1'..'3'} // but it will come back as seq - let sq1:_ seq = ofSeq { 1 .. 3 } - let sq2:_ seq = ofSeq (seq [(1, "One"); (2, "Two")]) - let sq3:_ seq = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) - let sq4:_ seq = ofSeq (seq [(1, "One", '1', 1M); (2, "Two", '2', 2M)]) - let ls1:_ list = ofSeq {'1'..'3'} - let ls2:_ list = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) - let st1:_ Set = ofSeq {'1'..'3'} - let st2:_ Set = ofSeq (seq [(1, "One", '1'); (2, "Two", '2')]) - let ss: Generic.SortedSet<_> = ofSeq (seq [3..6]) - let ra: Generic.List<_> = ofSeq (seq [1..3]) - let sl: Generic.SortedList<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... - let _sl:Generic.SortedList<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let dc :Generic.Dictionary<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as KeyValuePair - let mp :Map<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... - let _mp:Map<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let d : Generic.IDictionary<_,_> = ofSeq (seq [("One", 1)]) // but it will come back as ... - let _d: Generic.IDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let r : IReadOnlyDictionary<_,_> = ofSeq (seq [("One", 1)]) // but it will come back as ... - let _r: IReadOnlyDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let rc: IReadOnlyCollection<_> = ofSeq (seq [2..7]) - let ut: Hashtable = ofSeq (seq [1,'1';2, '2';3,'3']) // but it will come back as seq - let al: ArrayList = ofSeq (seq ["1";"2";"3"]) // but it will come back as seq - let us: SortedList = ofSeq (seq [4,'2';3,'4']) // but it will come back as seq - let cc: BlockingCollection<_> = ofSeq {'1'..'3'} // but it will come back as seq - let cd: ConcurrentDictionary<_,_> = ofSeq (seq [(1, "One"); (2, "Two")]) // but it will come back as ... - let _cd:ConcurrentDictionary<_,_> = ofSeq (seq [KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let cb: ConcurrentBag<_> = ofSeq {'1'..'3'} - - // now go back - let _sk' = toSeq sk - let _sg' = toSeq sg - let _sb' = toSeq sb - let _sq1' = toSeq sq1 - let _sq2' = toSeq sq2 - let _sq3' = toSeq sq3 - let _sq4' = toSeq sq4 - let _ls1' = toSeq ls1 - let _ls2' = toSeq ls2 - let _st1' = toSeq st1 - let _st2' = toSeq st2 - let _ss' = toSeq ss - let _ra' = toSeq ra - let _sl' = toSeq sl - let _dc' = toSeq dc - let _mp' = toSeq mp - let _d' = toSeq d - let _r' = toSeq r - let _rc' = toSeq rc - let _ut' = toSeq ut - let _al' = toSeq al - let _us' = toSeq us - let _cc' = toSeq cc - let _cd' = toSeq cd - let _cb' = toSeq cb - - // there are some 'one-way' collections that can only be converted toSeq - - let columns = - let d = new Data.DataTable () - [|new Data.DataColumn "id";new Data.DataColumn "column1";new Data.DataColumn "column2"|] |> d.Columns.AddRange - d.Columns - let _col1 = columns |> find (fun x -> x.ColumnName = "column1") - let _cols = columns |> toList |> map (fun x -> x.ColumnName) - - // Defaults - - let _12: WrappedListI<_> = seq [1;2] |> ofSeq - - - () - - let testListConversions = - - // From sequence - - let sk: Generic.Stack<_> = ofList [ 1 .. 3 ] - let sg: string = ofList ['1'..'3'] // but it will come back as seq - let sb: Text.StringBuilder = ofList ['1'..'3'] // but it will come back as seq - let sq1:_ seq = ofList [ 1 .. 3 ] - let sq2:_ seq = ofList ([(1, "One"); (2, "Two")]) - let sq3:_ seq = ofList ([(1, "One", '1'); (2, "Two", '2')]) - let sq4:_ seq = ofList ([(1, "One", '1', 1M); (2, "Two", '2', 2M)]) - let ls1:_ list = ofList ['1'..'3'] - let ls2:_ list = ofList ([(1, "One", '1'); (2, "Two", '2')]) - let st1:_ Set = ofList ['1'..'3'] - let st2:_ Set = ofList ([(1, "One", '1'); (2, "Two", '2')]) - let ss: Generic.SortedSet<_> = ofList ([3..6]) - let ra: Generic.List<_> = ofList ([1..3]) - let sl: Generic.SortedList<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... - let _sl:Generic.SortedList<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let dc :Generic.Dictionary<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as KeyValuePair - let mp :Map<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... - let _mp:Map<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let d : Generic.IDictionary<_,_> = ofList ([("One", 1)]) // but it will come back as ... - let _d: Generic.IDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let r : IReadOnlyDictionary<_,_> = ofList ([("One", 1)]) // but it will come back as ... - let _r: IReadOnlyDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let rc: IReadOnlyCollection<_> = ofList ([2..5]) - let ut: Hashtable = ofList ([1,'1';2, '2';3,'3']) // but it will come back as seq - let al: ArrayList = ofList (["1";"2";"3"]) // but it will come back as seq - let us: SortedList = ofList ([4,'2';3,'4']) // but it will come back as seq - let cc: BlockingCollection<_> = ofList ['1'..'3'] // but it will come back as seq - let cd: ConcurrentDictionary<_,_> = ofList ([(1, "One"); (2, "Two")]) // but it will come back as ... - let _cd:ConcurrentDictionary<_,_> = ofList ([KeyValuePair(1, "One"); KeyValuePair(2, "Two")]) - let cb: ConcurrentBag<_> = ofList ['1'..'3'] - - // now go back - let _sk' = toList sk - let _sg' = toList sg - let _sb' = toList sb - let _sq1' = toList sq1 - let _sq2' = toList sq2 - let _sq3' = toList sq3 - let _sq4' = toList sq4 - let _ls1' = toList ls1 - let _ls2' = toList ls2 - let _st1' = toList st1 - let _st2' = toList st2 - let _ss' = toList ss - let _ra' = toList ra - let _sl' = toList sl - let _dc' = toList dc - let _mp' = toList mp - let _d' = toList d - let _r' = toList r - let _rc' = toList rc - let _ut' = toList ut - let _al' = toList al - let _us' = toList us - let _cc' = toList cc - let _cd' = toList cd - let _cb' = toList cb - - () - - let testSorts = - let _r1 = [4..1] |> sort - let _r2 = [4..1] |> sortBy string - let _r3 = seq [4..1] |> sort - let _r4 = seq [4..1] |> sortBy string - let _r5 = ResizeArray [4..1] |> sort - let _r6 = ResizeArray [4..1] |> sortBy string - - () - - let testGeneralizableValues () = - let a: list<_> = empty - let _ = 0 ::a - let _ = '0'::a - let b: WrappedSeqA<_> = empty - let _ = WrappedSeqA [ 0 ] <|> b - let _ = WrappedSeqA ['0'] <|> b - - () - - [] - let readOnlyNth () = - let readOnlyCollection = ReadOnlyCollection [|1..10|] - let iReadOnlyList = readOnlyCollection :> IReadOnlyList<_> - Assert.AreEqual (2, nth 1 [1..10]) - Assert.AreEqual (2, nth 1 readOnlyCollection) - Assert.AreEqual (2, nth 1 iReadOnlyList) - - [] - let readOnlyNthIndex () = - let l = ListOnlyIndex [1..10] - Assert.AreEqual (2, nth 1 l) - let rl = ReadOnlyListOnlyIndex [1..10] - Assert.AreEqual (2, nth 1 rl) - - [] - let choose () = - let d = choose Some ((ofSeq :seq<_*_> -> Dictionary<_,_>) (seq ["a", 1; "b", 2])) - Assert.IsInstanceOf>> (Some d) - - let d' = choose Some ((ofSeq :seq<_*_> -> IDictionary<_,_>) (seq ["a", 1; "b", 2])) - Assert.IsInstanceOf>> (Some d') - - let rd = choose Some ((ofSeq :seq<_*_> -> IReadOnlyDictionary<_,_>) (seq ["a", 1; "b", 2])) - Assert.IsInstanceOf>> (Some rd) - - let m = choose Some ((ofSeq :seq<_*_> -> Map<_,_>) (seq ["a", 1; "b", 2])) - Assert.IsInstanceOf>> (Some m) module Foldable =