PR fixes

Author: Viktor Tochonov

tests/FSharp.Data.GraphQL.Tests/MiddlewareTests.fs

@@ -702,10 +702,10 @@ let ``Object list filter: Must parse all filter operators`` () =
         ]
     do
         let notStartsFilter = """{ "not": { "value_starts_with": "3" } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notStartsFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notStartsFilter)
         let filter = Not (StartsWith { FieldName = "value"; Value = "3" })
         let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -715,10 +715,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notEndsFilter = """{ "not": { "value_ends_with": "2" } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notEndsFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notEndsFilter)
         let filter = Not (EndsWith { FieldName = "value"; Value = "2" })
         let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -728,10 +728,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notGreaterThanOrEqualFilter = """{ "not": { "id_gte": 2 } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notGreaterThanOrEqualFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notGreaterThanOrEqualFilter)
         let filter = Not (GreaterThanOrEqual { FieldName = "id"; Value = 2.0 })
         let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict,filter)
+        let result = executeWithCustomFilter (query, variables,filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -741,10 +741,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notLessThanOrEqualFilter = """{ "not": { "id_lte": 4 } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notLessThanOrEqualFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notLessThanOrEqualFilter)
         let filter = Not (LessThanOrEqual { FieldName = "id"; Value = 4.0 })
         let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -754,10 +754,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notGreaterThanFilter = """{ "not": { "id_gt": 2 } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notGreaterThanFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notGreaterThanFilter)
         let filter = Not (GreaterThan { FieldName = "id"; Value = 2.0 })
         let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -767,10 +767,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notLessThanFilter = """{ "not": { "id_lt": 4 } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notLessThanFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notLessThanFilter)
         let filter = Not (LessThan { FieldName = "id"; Value = 4.0 })
-        let expectedFilter : KeyValuePair<obj list, ObjectListFilter> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result
         <| fun data errors ->
             empty errors
@@ -781,10 +781,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notContainsFilter = """{ "not": { "value_contains": "A" } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notContainsFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notContainsFilter)
         let filter = Not (Contains { FieldName = "value"; Value = "A" })
-        let expectedFilter : KeyValuePair<obj list, ObjectListFilter> = kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)
@@ -794,11 +794,10 @@ let ``Object list filter: Must parse all filter operators`` () =
 
     do
         let notEqualsFilter = """{ "not": { "value": "A2" } }""" |> JsonDocument.Parse |> _.RootElement
-        let dict = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notEqualsFilter)
+        let variables = ImmutableDictionary<string, JsonElement>.Empty.Add ("filter", notEqualsFilter)
         let filter = Not (Equals { FieldName = "value"; Value = "A2" })
-        let expectedFilter : KeyValuePair<obj list, ObjectListFilter> =
-            kvp ([ "A"; "subjects" ]) (filter)
-        let result = executeWithCustomFilter (query, dict, filter)
+        let expectedFilter : KeyValuePair<obj list, _> = kvp ([ "A"; "subjects" ]) (filter)
+        let result = executeWithCustomFilter (query, variables, filter)
         ensureDirect result <| fun data errors ->
             empty errors
             data |> equals (upcast expected)

tests/FSharp.Data.GraphQL.Tests/ObjectListFilterLinqTests.fs

@@ -39,18 +39,20 @@ let ``ObjectListFilter works with GreaterThanOrEqual operator``() =
     let queryable = data.AsQueryable()
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result = List.head filteredData
-    result.ID |> equals 4
-    result.FirstName |> equals "Ben"
-    result.LastName |> equals "Adams"
-    result.Contact  |> equals { Email = "[email protected]" }
-    result.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
-    let result1 = List.last filteredData
-    result1.ID |> equals 7
-    result1.FirstName |> equals "Jeneffer"
-    result1.LastName |> equals "Trif"
-    result1.Contact |> equals { Email = "[email protected]" }
-    result1.Friends |> equals [ { Email = "[email protected]" } ]
+    do 
+        let result = List.head filteredData
+        result.ID |> equals 4
+        result.FirstName |> equals "Ben"
+        result.LastName |> equals "Adams"
+        result.Contact  |> equals { Email = "[email protected]" }
+        result.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
+    do
+        let result = List.last filteredData
+        result.ID |> equals 7
+        result.FirstName |> equals "Jeneffer"
+        result.LastName |> equals "Trif"
+        result.Contact |> equals { Email = "[email protected]" }
+        result.Friends |> equals [ { Email = "[email protected]" } ]
 
 [<Fact>]
 let ``ObjectListFilter works with LessThan operator``() =
@@ -71,18 +73,20 @@ let ``ObjectListFilter works with LessThanOrEqual operator``() =
     let queryable = data.AsQueryable()
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    result1.ID |> equals 4
-    result1.FirstName |> equals "Ben"
-    result1.LastName |> equals "Adams"
-    result1.Contact  |> equals { Email = "[email protected]" }
-    result1.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
-    let result = List.last filteredData
-    result.ID |> equals 2
-    result.FirstName |> equals "Jonathan"
-    result.LastName |> equals "Abrams"
-    result.Contact |> equals { Email = "[email protected]" }
-    result.Friends |> equals []
+    do
+        let result = List.head filteredData
+        result.ID |> equals 4
+        result.FirstName |> equals "Ben"
+        result.LastName |> equals "Adams"
+        result.Contact  |> equals { Email = "[email protected]" }
+        result.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
+    do
+        let result = List.last filteredData
+        result.ID |> equals 2
+        result.FirstName |> equals "Jonathan"
+        result.LastName |> equals "Abrams"
+        result.Contact |> equals { Email = "[email protected]" }
+        result.Friends |> equals []
 
 [<Fact>]
 let ``ObjectListFilter works with StartsWith operator``() =
@@ -164,18 +168,20 @@ let ``ObjectListFilter works with IN operator for string type field``() =
     let queryable = data.AsQueryable()
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result = List.head filteredData
-    result.ID |> equals 4
-    result.FirstName |> equals "Ben"
-    result.LastName |> equals "Adams"
-    result.Contact  |> equals { Email = "[email protected]" }
-    result.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
-    let result2 = List.last filteredData
-    result2.ID |> equals 7
-    result2.FirstName |> equals "Jeneffer"
-    result2.LastName |> equals "Trif"
-    result2.Contact |> equals { Email = "[email protected]" }
-    result2.Friends |> equals [ { Email = "[email protected]" } ]
+    do
+        let result = List.head filteredData
+        result.ID |> equals 4
+        result.FirstName |> equals "Ben"
+        result.LastName |> equals "Adams"
+        result.Contact  |> equals { Email = "[email protected]" }
+        result.Friends  |> equals [ { Email = "[email protected]" }; { Email = "[email protected]" } ]
+    do
+        let result = List.last filteredData
+        result.ID |> equals 7
+        result.FirstName |> equals "Jeneffer"
+        result.LastName |> equals "Trif"
+        result.Contact |> equals { Email = "[email protected]" }
+        result.Friends |> equals [ { Email = "[email protected]" } ]
 
 [<Fact>]
 let ``ObjectListFilter works with IN operator for int type field``() =
@@ -212,12 +218,12 @@ let ``ObjectListFilter works with NOT operator``() =
     let queryable = data.AsQueryable()
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    result1.ID |> equals 2
-    result1.FirstName |> equals "Jonathan"
-    result1.LastName |> equals "Abrams"
-    result1.Contact |> equals { Email = "[email protected]" }
-    result1.Friends |> equals []
+    let result = List.head filteredData
+    result.ID |> equals 2
+    result.FirstName |> equals "Jonathan"
+    result.LastName |> equals "Abrams"
+    result.Contact |> equals { Email = "[email protected]" }
+    result.Friends |> equals []
 
 type Complex =
     { ID : int
@@ -263,18 +269,20 @@ let ``ObjectListFilter works with getDiscriminator for Complex``() =
             | Community c -> c.Discriminator))
     let filteredData = queryable.Apply(filter, options) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    match result1 with
-    | Complex c ->
-        c.ID |> equals 1
-        c.Name |> equals "Complex A"
-    | _ -> failwith "Expected Complex"
-    let result2 = List.last filteredData
-    match result2 with
-    | Complex c ->
-        c.ID |> equals 4
-        c.Name |> equals "Complex AA"
-    | _ -> failwith "Expected Complex"
+    do
+        let result = List.head filteredData
+        match result with
+        | Complex c ->
+            c.ID |> equals 1
+            c.Name |> equals "Complex A"
+        | _ -> failwith "Expected Complex"
+    do
+        let result = List.last filteredData
+        match result with
+        | Complex c ->
+            c.ID |> equals 4
+            c.Name |> equals "Complex AA"
+        | _ -> failwith "Expected Complex"
 
 
 [<Fact>]
@@ -304,18 +312,20 @@ let ``ObjectListFilter works with getDiscriminator and getDiscriminatorValue for
         )
     let filteredData = queryable.Apply(filter, options) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    match result1 with
-    | Complex c ->
-        c.ID |> equals 1
-        c.Name |> equals "Complex A"
-    | _ -> failwith "Expected Complex"
-    let result2 = List.last filteredData
-    match result2 with
-    | Complex c ->
-        c.ID |> equals 4
-        c.Name |> equals "Complex AA"
-    | _ -> failwith "Expected Complex"
+    do
+        let result = List.head filteredData
+        match result with
+        | Complex c ->
+            c.ID |> equals 1
+            c.Name |> equals "Complex A"
+        | _ -> failwith "Expected Complex"
+    do
+        let result = List.last filteredData
+        match result with
+        | Complex c ->
+            c.ID |> equals 4
+            c.Name |> equals "Complex AA"
+        | _ -> failwith "Expected Complex"
 
 type Cow =
     { ID : int
@@ -357,16 +367,18 @@ let ``ObjectListFilter works with getDiscriminatorValue for Horse``() =
     )
     let filteredData = queryable.Apply(filter, options) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    match result1 with
-    | h ->
-        h.ID |> equals 2
-        h.Name |> equals "Horse B"
-    let result2 = List.last filteredData
-    match result2 with
-    | h ->
-        h.ID |> equals 4
-        h.Name |> equals "Horse D"
+    do
+        let result = List.head filteredData
+        match result with
+        | h ->
+            h.ID |> equals 2
+            h.Name |> equals "Horse B"
+    do
+        let result = List.last filteredData
+        match result with
+        | h ->
+            h.ID |> equals 4
+            h.Name |> equals "Horse D"
 
 [<Fact>]
 let ``ObjectListFilter works with getDiscriminatorValue startsWith for Horse and Hamster``() =
@@ -385,16 +397,18 @@ let ``ObjectListFilter works with getDiscriminatorValue startsWith for Horse and
         )
     let filteredData = queryable.Apply(filter, options) |> Seq.toList
     List.length filteredData |> equals 3
-    let result1 = List.head filteredData
-    match result1 with
-    | c ->
-        c.ID |> equals 2
-        c.Name |> equals "Horse B"
-    let result2 = List.last filteredData
-    match result2 with
-    | c ->
-        c.ID |> equals 5
-        c.Name |> equals "Hamster E"
+    do
+        let result = List.head filteredData
+        match result with
+        | c ->
+            c.ID |> equals 2
+            c.Name |> equals "Horse B"
+    do
+        let result = List.last filteredData
+        match result with
+        | c ->
+            c.ID |> equals 5
+            c.Name |> equals "Hamster E"
 
 type ListTagsProduct = {
     Name : string
@@ -414,10 +428,12 @@ let ``ObjectListFilter works with Contains operator on list collection propertie
     let filter = Contains { FieldName = "Tags"; Value = "Tag3" }
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    result1.Name |> equals "Product B"
-    let result2 = List.last filteredData
-    result2.Name |> equals "Product C"
+    do
+        let result = List.head filteredData
+        result.Name |> equals "Product B"
+    do
+        let result = List.last filteredData
+        result.Name |> equals "Product C"
 
 type ArrayTagsProduct = {
         Name : string
@@ -438,10 +454,12 @@ let ``ObjectListFilter works with Contains operator on array collection properti
     let filter = Contains { FieldName = "Tags"; Value = "Tag3" }
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    result1.Name |> equals "Product B"
-    let result2 = List.last filteredData
-    result2.Name |> equals "Product C"
+    do
+        let result = List.head filteredData
+        result.Name |> equals "Product B"
+    do
+        let result = List.last filteredData
+        result.Name |> equals "Product C"
 
 type SetTagsProduct = {
     Name : string
@@ -462,7 +480,9 @@ let ``ObjectListFilter works with Contains operator on set collection properties
     let filter = Contains { FieldName = "Tags"; Value = "Tag3" }
     let filteredData = queryable.Apply(filter) |> Seq.toList
     List.length filteredData |> equals 2
-    let result1 = List.head filteredData
-    result1.Name |> equals "Product B"
-    let result2 = List.last filteredData
-    result2.Name |> equals "Product C"
+    do
+        let result = List.head filteredData
+        result.Name |> equals "Product B"
+    do
+        let result = List.last filteredData
+        result.Name |> equals "Product C"