From 12a233798dc3e764ddf93dda8fab7fb9d51c4441 Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:22:17 +0300 Subject: [PATCH] get rid of TESTS_DEFAULT_SERIALIZER_OPTIONS --- .../CustomFilterCompilersTests.cs | 5 +---- .../FilterExpressionCompilerTests.cs | 11 +++++------ net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs | 1 - 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs b/net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs index 4f05e5e9..41bbb465 100644 --- a/net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs @@ -11,9 +11,6 @@ namespace DevExtreme.AspNet.Data.Tests { public class CustomFilterCompilersTests { - static readonly JsonSerializerOptions TESTS_DEFAULT_SERIALIZER_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web) { - Converters = { new ListConverter() } - }; [Fact] public void OneToManyContains() { @@ -38,7 +35,7 @@ public void OneToManyContains() { var source = new[] { new Category(), new Category() }; source[0].Products.Add(new Product { Name = "Chai" }); - var filter = JsonSerializer.Deserialize(@"[ ""Products"", ""Contains"", ""ch"" ]", TESTS_DEFAULT_SERIALIZER_OPTIONS); + var filter = JsonSerializer.Deserialize(@"[ ""Products"", ""Contains"", ""ch"" ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS); var loadOptions = new SampleLoadOptions { Filter = filter, diff --git a/net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs b/net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs index 9924bafb..4447e2a5 100644 --- a/net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs @@ -1,4 +1,6 @@ -using System; +using DevExtreme.AspNet.Data.Helpers; + +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -9,9 +11,6 @@ namespace DevExtreme.AspNet.Data.Tests { public class FilterExpressionCompilerTests { - static readonly JsonSerializerOptions TESTS_DEFAULT_SERIALIZER_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web) { - Converters = { new ListConverter() } - }; class DataItem1 { public int IntProp { get; set; } @@ -146,7 +145,7 @@ public void Not() { [Fact] public void IsUnaryWithJsonCriteria() { - var crit = JsonSerializer.Deserialize("[\"!\", []]", TESTS_DEFAULT_SERIALIZER_OPTIONS); + var crit = JsonSerializer.Deserialize("[\"!\", []]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS); var compiler = new FilterExpressionCompiler(typeof(object), false); Assert.True(compiler.IsUnary(crit)); } @@ -243,7 +242,7 @@ public void T105740() { [Fact] public void JsonObjects() { - var crit = JsonSerializer.Deserialize(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", TESTS_DEFAULT_SERIALIZER_OPTIONS); + var crit = JsonSerializer.Deserialize(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS); var expr = Compile(crit); Assert.Equal(@"((obj.StringProp == ""abc"") AndAlso (obj.NullableProp == null))", expr.Body.ToString()); } diff --git a/net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs b/net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs index 32dee49e..34700007 100644 --- a/net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs +++ b/net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs @@ -54,7 +54,6 @@ public void SerializeDeserializeConvertersAffectedOptions() { //https://github.com/DevExpress/DevExtreme.AspNet.Data/blob/master/js/dx.aspnet.data.js -> serializeDate //Assert.Equal(filter0Orig[2], filter0STJ[2]); Assert.Equal("2011-12-13T14:15:16", filter0STJ[2]); - } }