diff --git a/tests/Elasticsearch.FSharp.Tests/Elasticsearch.FSharp.Tests.fsproj b/tests/Elasticsearch.FSharp.Tests/Elasticsearch.FSharp.Tests.fsproj index 55d2821..28d082c 100644 --- a/tests/Elasticsearch.FSharp.Tests/Elasticsearch.FSharp.Tests.fsproj +++ b/tests/Elasticsearch.FSharp.Tests/Elasticsearch.FSharp.Tests.fsproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/tests/Elasticsearch.FSharp.Tests/Mapping.fs b/tests/Elasticsearch.FSharp.Tests/Mapping.fs index 5f39b51..ca435b3 100644 --- a/tests/Elasticsearch.FSharp.Tests/Mapping.fs +++ b/tests/Elasticsearch.FSharp.Tests/Mapping.fs @@ -6,6 +6,7 @@ open NUnit.Framework open Elasticsearch.FSharp.Mapping.Attributes open Elasticsearch.FSharp.Mapping.Json +open NUnit.Framework.Legacy [] type TestEntity = { @@ -63,7 +64,7 @@ let ``Type serializes correctly``() = } }""" let actual = mappingJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Type serializes correctly with excluded type name``() = @@ -90,7 +91,7 @@ let ``Type serializes correctly with excluded type name``() = } }""" let actual = mappingJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Type serializes correctly with settings``() = @@ -132,7 +133,7 @@ let ``Type serializes correctly with settings``() = } }""" let actual = mappingJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Type serializes correctly to put mappings json``() = @@ -221,8 +222,7 @@ let ``Recursive type serializes correctly``() = } }""" let actual = mappingJson - printf "%s" mappingJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Custom field name serializes correctly``() = @@ -254,4 +254,4 @@ let ``Custom field name serializes correctly``() = } }""" let actual = mappingJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/BoolQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/BoolQueryTests.fs index 2d67024..72f7956 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/BoolQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/BoolQueryTests.fs @@ -20,7 +20,7 @@ let ``"bool" with "must" serializes correctly``() = ] let expected = """{"query":{"bool":{"must":[{"match_all":{}}]}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"bool" with "filter" serializes correctly``() = @@ -36,7 +36,7 @@ let ``"bool" with "filter" serializes correctly``() = ] let expected = """{"query":{"bool":{"filter":[{"term":{"field":{"value":"value"}}}]}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"bool" with "should" serializes correctly``() = @@ -52,7 +52,7 @@ let ``"bool" with "should" serializes correctly``() = ] let expected = """{"query":{"bool":{"should":[{"match":{"field":{"query":"value"}}}]}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"bool" with "must_not" serializes correctly``() = @@ -68,10 +68,10 @@ let ``"bool" with "must_not" serializes correctly``() = ] let expected = """{"query":{"bool":{"must_not":[{"range":{"field":{"gte":"10"}}}]}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] -let ``"bool" with "minimum_should_match" serializes correctly`` = +let ``"bool" with "minimum_should_match" serializes correctly``() = let msm = "1.0" let query = @@ -85,7 +85,7 @@ let ``"bool" with "minimum_should_match" serializes correctly`` = ] let expected = sprintf """{"query":{"bool":{"should":[{"match_all":{}}],"minimum_should_match":"%s"}}}""" (Json.escapeString msm) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"bool" with multiple clauses serializes correctly``() = @@ -103,4 +103,4 @@ let ``"bool" with multiple clauses serializes correctly``() = ] let expected = """{"query":{"bool":{"must":[{"match":{"title":{"query":"elasticsearch"}}}],"filter":[{"term":{"status":{"value":"published"}}}],"must_not":[{"term":{"tags":{"value":"archived"}}}],"should":[{"match":{"content":{"query":"relevant"}}}],"minimum_should_match":"1"}}}""" let actual = toJson query - Assert.AreEqual(removeWhitespace expected, removeWhitespace actual) + Assert.That(removeWhitespace actual, Is.EqualTo(removeWhitespace expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/ExistsQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/ExistsQueryTests.fs index f2a8ecf..b0e2468 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/ExistsQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/ExistsQueryTests.fs @@ -16,4 +16,4 @@ let ``"exists" serialization works correctly``(fieldName) = ] let expected = sprintf """{"query":{"exists":{"field":"%s"}}}""" (Json.escapeString fieldName) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/IdsQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/IdsQueryTests.fs index 58a80c6..af78619 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/IdsQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/IdsQueryTests.fs @@ -3,7 +3,6 @@ module Elasticsearch.FSharp.Tests.Queries.IdsQueryTests open NUnit.Framework open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization -open Elasticsearch.FSharp.Utility [] let ``"ids" serializes correctly``() = @@ -13,4 +12,4 @@ let ``"ids" serializes correctly``() = ] let expected = """{"query":{"ids":{"values":["foo","bar"]}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/MatchAllQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/MatchAllQueryTests.fs index dd54a87..670884a 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/MatchAllQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/MatchAllQueryTests.fs @@ -13,4 +13,4 @@ let ``"match_all" serializes correctly``() = ] let expected = """{"query":{"match_all":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/MatchNoneQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/MatchNoneQueryTests.fs index c8e3aee..cfb8c41 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/MatchNoneQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/MatchNoneQueryTests.fs @@ -13,4 +13,4 @@ let ``"match_none" serializes correctly``() = ] let expected = """{"query":{"match_none":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/MatchPhrasePrefixQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/MatchPhrasePrefixQueryTests.fs index 9e2dc02..594232b 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/MatchPhrasePrefixQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/MatchPhrasePrefixQueryTests.fs @@ -23,7 +23,7 @@ let ``"match_phrase_prefix" base serializes correctly`` (fieldName, fieldValue, let expected = sprintf """{"query":{"match_phrase_prefix":{"%s":{"query":"%s","max_expansions":%d}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) expansions let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match_phrase_prefix" with boost serializes correctly`` (fieldName, fieldValue, expansions : int, boostValue: float) = @@ -44,7 +44,7 @@ let ``"match_phrase_prefix" with boost serializes correctly`` (fieldName, fieldV let expected = sprintf """{"query":{"match_phrase_prefix":{"%s":{"query":"%s","max_expansions":%d,"boost":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) expansions (boost.ToString()) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match_phrase_prefix" with slop serializes correctly`` (fieldName, fieldValue, slopVal: int) = @@ -62,7 +62,7 @@ let ``"match_phrase_prefix" with slop serializes correctly`` (fieldName, fieldVa ] let expected = sprintf """{"query":{"match_phrase_prefix":{"%s":{"query":"%s","slop":%d}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) slopVal - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"match_phrase_prefix" with analyzer serializes correctly`` (fieldName, fieldValue, analyzerName) = @@ -80,7 +80,7 @@ let ``"match_phrase_prefix" with analyzer serializes correctly`` (fieldName, fie ] let expected = sprintf """{"query":{"match_phrase_prefix":{"%s":{"query":"%s","analyzer":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) (Json.escapeString analyzerName) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"match_phrase_prefix" with all fields serializes correctly`` () = @@ -107,4 +107,4 @@ let ``"match_phrase_prefix" with all fields serializes correctly`` () = ] let expected = sprintf """{"query":{"match_phrase_prefix":{"%s":{"query":"%s","max_expansions":%d,"slop":%d,"analyzer":"%s","boost":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) maxExp slopVal (Json.escapeString analyzerName) (boostVal.ToString()) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/MatchQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/MatchQueryTests.fs index 93fc86f..e6f1886 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/MatchQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/MatchQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"match" base serializes correctly``(fieldName, fieldValue) = @@ -18,7 +17,7 @@ let ``"match" base serializes correctly``(fieldName, fieldValue) = let expected = sprintf """{"query":{"match":{"%s":{"query":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match" with operator serializes correctly``(fieldName, fieldValue, op) = @@ -31,7 +30,7 @@ let ``"match" with operator serializes correctly``(fieldName, fieldValue, op) = let expected = sprintf """{"query":{"match":{"%s":{"query":"%s","operator":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) (Json.escapeString op) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match" with zero_terms_query serializes correctly (current behavior)``(fieldName, fieldValue) = @@ -49,7 +48,7 @@ let ``"match" with zero_terms_query serializes correctly (current behavior)``(fi let expected = sprintf """{"query":{"match":{"%s":{"query":"%s","zero_terms_query":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) zeroTerms // zeroTerms is not quoted here let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match" with cutoff_frequency serializes correctly``(fieldName, fieldValue, cutoff: float) = @@ -63,7 +62,7 @@ let ``"match" with cutoff_frequency serializes correctly``(fieldName, fieldValue let expected = sprintf """{"query":{"match":{"%s":{"query":"%s","cutoff_frequency":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) cutoffStr let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"match" with all fields serializes correctly (current behavior)``() = @@ -86,4 +85,4 @@ let ``"match" with all fields serializes correctly (current behavior)``() = let expected = sprintf """{"query":{"match":{"%s":{"query":"%s","operator":"%s","zero_terms_query":%s,"cutoff_frequency":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) (Json.escapeString op) zeroTerms (cutoff.ToString()) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/MultiMatchQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/MultiMatchQueryTests.fs index 8214d9d..7c9cba1 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/MultiMatchQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/MultiMatchQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] // TODO don't know how to specify range for tie_breaker value (by default values from -Infinity to Infinity are generated) @@ -26,7 +25,7 @@ let ``"multi_match" base serializes correctly``(queryType, field, queryString, e let expected = sprintf """{"query":{"multi_match":{"type":"%s","fields":["%s"],"query":"%s","max_expansions":%d,"slop":%d,"tie_breaker":0.3}}}""" (Json.escapeString queryType) (Json.escapeString field) (Json.escapeString queryString) expansions slop let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"multi_match" with raw string param serializes correctly``() = @@ -40,7 +39,7 @@ let ``"multi_match" with raw string param serializes correctly``() = ) ] let expected = """{"query":{"multi_match":{"query":"search text","custom_param":"custom_value"}}}""" - Assert.AreEqual(expected, (toJson query)) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"multi_match" with raw numeric param serializes correctly``() = @@ -54,4 +53,4 @@ let ``"multi_match" with raw numeric param serializes correctly``() = ) ] let expected = """{"query":{"multi_match":{"query":"search text","custom_param":123.45}}}""" - Assert.AreEqual(expected, (toJson query)) + Assert.That(toJson query, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/NestedQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/NestedQueryTests.fs index ad78ad9..881e356 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/NestedQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/NestedQueryTests.fs @@ -3,8 +3,6 @@ module Elasticsearch.FSharp.Tests.Queries.NestedQueryTests open NUnit.Framework open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization -open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"nested" query basic serializes correctly``() = @@ -21,7 +19,7 @@ let ``"nested" query basic serializes correctly``() = ] let expected = """{"query":{"nested":{"path":"obj1","query":{"match":{"obj1.name":{"query":"blue"}}}}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"nested" query with score_mode serializes correctly``() = @@ -37,7 +35,7 @@ let ``"nested" query with score_mode serializes correctly``() = ] let expected = """{"query":{"nested":{"path":"obj1","query":{"match_all":{}},"score_mode":"max"}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"nested" query with ignore_unmapped serializes correctly``() = @@ -53,7 +51,7 @@ let ``"nested" query with ignore_unmapped serializes correctly``() = ] let expected = """{"query":{"nested":{"path":"obj1","query":{"match_all":{}},"ignore_unmapped":true}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"nested" query with all options serializes correctly``() = @@ -74,7 +72,7 @@ let ``"nested" query with all options serializes correctly``() = ] let expected = """{"query":{"nested":{"path":"obj1.child","query":{"bool":{"must":[{"term":{"obj1.child.field":{"value":"value"}}}]}},"score_mode":"sum","ignore_unmapped":false}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"nested" query multi-level serializes correctly``() = @@ -101,4 +99,4 @@ let ``"nested" query multi-level serializes correctly``() = ] let expected = """{"query":{"nested":{"path":"driver","query":{"nested":{"path":"driver.vehicle","query":{"bool":{"must":[{"match":{"driver.vehicle.make":{"query":"Powell Motors"}}},{"match":{"driver.vehicle.model":{"query":"Canyonero"}}}]}}}}}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/QueryBodyScriptTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/QueryBodyScriptTests.fs index 01916e1..215e4be 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/QueryBodyScriptTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/QueryBodyScriptTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"script" query serializes correctly``(scriptSource, lang) = @@ -21,7 +20,7 @@ let ``"script" query serializes correctly``(scriptSource, lang) = let expected = sprintf """{"query":{"script":{"script":{"source":"%s","lang":"%s"}}}}""" (Json.escapeString scriptSource) (Json.escapeString lang) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"script" query with params serializes correctly``(scriptSource, lang, pName, pValue) = @@ -38,4 +37,4 @@ let ``"script" query with params serializes correctly``(scriptSource, lang, pNam let expected = sprintf """{"query":{"script":{"script":{"source":"%s","lang":"%s","params":{"%s":"%s"}}}}}""" (Json.escapeString scriptSource) (Json.escapeString lang) (Json.escapeString pName) (Json.escapeString pValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/RangeQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/RangeQueryTests.fs index 6292c81..50a6c4e 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/RangeQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/RangeQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"range" with gte serializes correctly``(fieldName, fieldValue) = @@ -18,31 +17,31 @@ let ``"range" with gte serializes correctly``(fieldName, fieldValue) = let expected = sprintf """{"query":{"range":{"%s":{"gte":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"range" with gt serializes correctly``(fieldName, fieldValue) = let query = Search [ Query (Range (fieldName, [Gt fieldValue])) ] let expected = sprintf """{"query":{"range":{"%s":{"gt":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"range" with lte serializes correctly``(fieldName, fieldValue) = let query = Search [ Query (Range (fieldName, [Lte fieldValue])) ] let expected = sprintf """{"query":{"range":{"%s":{"lte":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"range" with lt serializes correctly``(fieldName, fieldValue) = let query = Search [ Query (Range (fieldName, [Lt fieldValue])) ] let expected = sprintf """{"query":{"range":{"%s":{"lt":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"range" with time_zone serializes correctly``(fieldName, timeZone) = let query = Search [ Query (Range (fieldName, [Gte "now-1h"; RangeTimeZone timeZone])) ] let expected = sprintf """{"query":{"range":{"%s":{"gte":"now-1h","time_zone":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString timeZone) - Assert.AreEqual(expected, toJson query) + Assert.That(toJson query, Is.EqualTo(expected)) [] let ``"range" with multiple conditions serializes correctly``() = @@ -58,4 +57,4 @@ let ``"range" with multiple conditions serializes correctly``() = ) ] let expected = """{"query":{"range":{"date":{"gte":"2020-01-01","lte":"2020-12-31","time_zone":"+01:00"}}}}""" - Assert.AreEqual(expected, (toJson query)) + Assert.That(toJson query, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/RawQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/RawQueryTests.fs index c5e3743..fc94383 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/RawQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/RawQueryTests.fs @@ -4,8 +4,6 @@ open NUnit.Framework open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization -open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"raw" serialization works correctly``(rawQuery) = @@ -17,4 +15,4 @@ let ``"raw" serialization works correctly``(rawQuery) = ] let expected = sprintf """{"query":{%s}}""" rawQuery let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/TermQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/TermQueryTests.fs index ffa0840..3f9af3b 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/TermQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/TermQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"term" serializes correctly``(fieldName, fieldValue) = @@ -18,4 +17,4 @@ let ``"term" serializes correctly``(fieldName, fieldValue) = let expected = sprintf """{"query":{"term":{"%s":{"value":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/TermsQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/TermsQueryTests.fs index da05ffa..6396b43 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/TermsQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/TermsQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"terms" with value list serializes correctly``(fieldName, fieldValue) = @@ -18,7 +17,7 @@ let ``"terms" with value list serializes correctly``(fieldName, fieldValue) = let expected = sprintf """{"query":{"terms":{"%s":["%s"]}}}""" (Json.escapeString fieldName) (Json.escapeString fieldValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"terms" with lookup serializes correctly``(fieldName, index, esType, id, path) = @@ -31,4 +30,4 @@ let ``"terms" with lookup serializes correctly``(fieldName, index, esType, id, p let expected = sprintf """{"query":{"terms":{"%s":{"index":"%s","type":"%s","id":"%s","path":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString index) (Json.escapeString esType) (Json.escapeString id) (Json.escapeString path) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/TypeQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/TypeQueryTests.fs index 7739b94..b0eb1ad 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/TypeQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/TypeQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"type" serializes correctly``(``type``) = @@ -17,4 +16,4 @@ let ``"type" serializes correctly``(``type``) = ] let expected = sprintf """{"query":{"type":{"value":"%s"}}}""" (Json.escapeString ``type``) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Queries/WildcardQueryTests.fs b/tests/Elasticsearch.FSharp.Tests/Queries/WildcardQueryTests.fs index 4c3bc6f..ac82ca7 100644 --- a/tests/Elasticsearch.FSharp.Tests/Queries/WildcardQueryTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/Queries/WildcardQueryTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"wildcard" base serializes correctly``(fieldName, patternValue) = @@ -18,7 +17,7 @@ let ``"wildcard" base serializes correctly``(fieldName, patternValue) = let expected = sprintf """{"query":{"wildcard":{"%s":{"value":"%s"}}}}""" (Json.escapeString fieldName) (Json.escapeString patternValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"wildcard" with rewrite and boost serializes correctly``(fieldName, patternValue, boostValue: float) = @@ -36,7 +35,7 @@ let ``"wildcard" with rewrite and boost serializes correctly``(fieldName, patter let expected = sprintf """{"query":{"wildcard":{"%s":{"value":"%s","rewrite":"constant_score","boost":%s}}}}""" (Json.escapeString fieldName) (Json.escapeString patternValue) (boost.ToString()) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"wildcard" with rewrite top_terms_N serializes correctly``(fieldName, patternValue, n:int) = @@ -53,4 +52,4 @@ let ``"wildcard" with rewrite top_terms_N serializes correctly``(fieldName, patt let expected = sprintf """{"query":{"wildcard":{"%s":{"value":"%s","rewrite":"top_terms_%d"}}}}""" (Json.escapeString fieldName) (Json.escapeString patternValue) nVal let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Search.fs b/tests/Elasticsearch.FSharp.Tests/Search.fs index 4643b25..9e8bc5a 100644 --- a/tests/Elasticsearch.FSharp.Tests/Search.fs +++ b/tests/Elasticsearch.FSharp.Tests/Search.fs @@ -15,7 +15,7 @@ let ``Query serializes correctly``() = ] let expected = """{"query":{"match_all":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Sort serializes correctly``() = @@ -27,7 +27,7 @@ let ``Sort serializes correctly``() = ] let expected = """{"sort":[{"myField":{"order":"asc","mode":"avg"}}]}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``ScriptFields serializes correctly``(script1, script2, fieldName1, fieldName2, paramName, paramValue) = @@ -58,7 +58,7 @@ let ``ScriptFields serializes correctly``(script1, script2, fieldName1, fieldNam (Json.escapeString paramValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Script serializes correctly``(script1, paramName, paramValue) = @@ -87,7 +87,7 @@ let ``Script serializes correctly``(script1, paramName, paramValue) = (Json.escapeString paramValue) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Aggs serializes correctly``(aggName, aggFieldName) = @@ -104,7 +104,7 @@ let ``Aggs serializes correctly``(aggName, aggFieldName) = let expected = sprintf """{"aggs":{"%s":{"avg":{"field":"%s"}}}}""" (Json.escapeString aggName) (Json.escapeString aggFieldName) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Weighted agg serializes correctly``(aggName, aggFieldName, aggValueField) = @@ -122,7 +122,7 @@ let ``Weighted agg serializes correctly``(aggName, aggFieldName, aggValueField) let expected = sprintf """{"aggs":{"%s":{"weighted_avg":{"value":{"field":"%s"},"weight":{"field":"%s"}}}}}""" (Json.escapeString aggName) (Json.escapeString aggValueField) (Json.escapeString aggFieldName) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Value count aggregation serializes correctly``(aggName, aggFieldName) = @@ -139,7 +139,7 @@ let ``Value count aggregation serializes correctly``(aggName, aggFieldName) = ] ] |> toJson - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Complex aggs serializes correctly``(complexAggName, complexAggFieldName, @@ -172,7 +172,7 @@ let ``Complex aggs serializes correctly``(complexAggName, complexAggFieldName, (Json.escapeString complexFilterAggField) (Json.escapeString simpleAggName) (Json.escapeString simpleAggField) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``From serializes correctly``(from) = @@ -182,7 +182,7 @@ let ``From serializes correctly``(from) = ] let expected = sprintf """{"from":%d}""" from let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Size serializes correctly``(size) = @@ -192,7 +192,7 @@ let ``Size serializes correctly``(size) = ] let expected = sprintf """{"size":%d}""" size let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Source serializes correctly``() = @@ -202,7 +202,7 @@ let ``Source serializes correctly``() = ] let expected = """{"_source":false}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``Raw serialized correctly``() = @@ -212,4 +212,4 @@ let ``Raw serialized correctly``() = ] let expected = """{"query":{"match_all":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) \ No newline at end of file + Assert.That(actual, Is.EqualTo(expected)) \ No newline at end of file diff --git a/tests/Elasticsearch.FSharp.Tests/SearchBody/ScriptFieldsTests.fs b/tests/Elasticsearch.FSharp.Tests/SearchBody/ScriptFieldsTests.fs index 558eb5f..51f3a5f 100644 --- a/tests/Elasticsearch.FSharp.Tests/SearchBody/ScriptFieldsTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/SearchBody/ScriptFieldsTests.fs @@ -5,7 +5,6 @@ open FsCheck.NUnit open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization open Elasticsearch.FSharp.Utility -open Elasticsearch.FSharp.Tests.Helpers [] let ``"script_fields" in search body serializes correctly`` scriptName scriptSource = @@ -19,4 +18,4 @@ let ``"script_fields" in search body serializes correctly`` scriptName scriptSou let expected = sprintf """{"query":{"match_all":{}},"script_fields":{"%s":{"script":{"lang":"painless","source":"%s"}}}}""" (Json.escapeString scriptName) (Json.escapeString scriptSource) let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/SearchBody/TrackTotalHitsTests.fs b/tests/Elasticsearch.FSharp.Tests/SearchBody/TrackTotalHitsTests.fs index c1286af..f948ca7 100644 --- a/tests/Elasticsearch.FSharp.Tests/SearchBody/TrackTotalHitsTests.fs +++ b/tests/Elasticsearch.FSharp.Tests/SearchBody/TrackTotalHitsTests.fs @@ -3,7 +3,6 @@ module Elasticsearch.FSharp.Tests.SearchBody.TrackTotalHitsTests open NUnit.Framework open Elasticsearch.FSharp.DSL open Elasticsearch.FSharp.DSL.Serialization -open Elasticsearch.FSharp.Utility [] let ``"track_total_hits" true serializes correctly``() = @@ -14,7 +13,7 @@ let ``"track_total_hits" true serializes correctly``() = ] let expected = """{"track_total_hits":true,"query":{"match_all":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"track_total_hits" false serializes correctly``() = @@ -25,7 +24,7 @@ let ``"track_total_hits" false serializes correctly``() = ] let expected = """{"track_total_hits":false,"query":{"match_all":{}}}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"track_total_hits" true as only search body element serializes correctly``() = @@ -35,7 +34,7 @@ let ``"track_total_hits" true as only search body element serializes correctly`` ] let expected = """{"track_total_hits":true}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) [] let ``"track_total_hits" false as only search body element serializes correctly``() = @@ -45,4 +44,4 @@ let ``"track_total_hits" false as only search body element serializes correctly` ] let expected = """{"track_total_hits":false}""" let actual = toJson query - Assert.AreEqual(expected, actual) + Assert.That(actual, Is.EqualTo(expected)) diff --git a/tests/Elasticsearch.FSharp.Tests/Sort.fs b/tests/Elasticsearch.FSharp.Tests/Sort.fs index 8a46345..a73bf2b 100644 --- a/tests/Elasticsearch.FSharp.Tests/Sort.fs +++ b/tests/Elasticsearch.FSharp.Tests/Sort.fs @@ -31,4 +31,4 @@ let ``Sort serializes correctly``(fieldName, sortOrder, sortMode) = sprintf """{"sort":[{"%s":{"order":"%s","mode":"%s"}}],"query":{"match_all":{}}}""" (Json.escapeString fieldName) (Json.escapeString orderStr) (Json.escapeString modeStr) let actual = toJson query - Assert.AreEqual(expected, actual) \ No newline at end of file + Assert.That(actual, Is.EqualTo(expected)) \ No newline at end of file