Skip to content

Commit d20adc2

Browse files
Refactor tests with JsonSerializerOptions (#664)
1 parent 3ab3932 commit d20adc2

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
namespace DevExtreme.AspNet.Data.Tests {
1212

1313
public class CustomFilterCompilersTests {
14-
static readonly JsonSerializerOptions TESTS_DEFAULT_SERIALIZER_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web) {
15-
Converters = { new ListConverter() }
16-
};
1714

1815
[Fact]
1916
public void OneToManyContains() {
@@ -38,7 +35,7 @@ public void OneToManyContains() {
3835
var source = new[] { new Category(), new Category() };
3936
source[0].Products.Add(new Product { Name = "Chai" });
4037

41-
var filter = JsonSerializer.Deserialize<IList>(@"[ ""Products"", ""Contains"", ""ch"" ]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
38+
var filter = JsonSerializer.Deserialize<IList>(@"[ ""Products"", ""Contains"", ""ch"" ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);
4239

4340
var loadOptions = new SampleLoadOptions {
4441
Filter = filter,

net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
using System;
1+
using DevExtreme.AspNet.Data.Helpers;
2+
3+
using System;
24
using System.Collections;
35
using System.Collections.Generic;
46
using System.Linq;
@@ -9,9 +11,6 @@
911
namespace DevExtreme.AspNet.Data.Tests {
1012

1113
public class FilterExpressionCompilerTests {
12-
static readonly JsonSerializerOptions TESTS_DEFAULT_SERIALIZER_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web) {
13-
Converters = { new ListConverter() }
14-
};
1514

1615
class DataItem1 {
1716
public int IntProp { get; set; }
@@ -146,7 +145,7 @@ public void Not() {
146145

147146
[Fact]
148147
public void IsUnaryWithJsonCriteria() {
149-
var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
148+
var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);
150149
var compiler = new FilterExpressionCompiler(typeof(object), false);
151150
Assert.True(compiler.IsUnary(crit));
152151
}
@@ -243,7 +242,7 @@ public void T105740() {
243242

244243
[Fact]
245244
public void JsonObjects() {
246-
var crit = JsonSerializer.Deserialize<IList>(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
245+
var crit = JsonSerializer.Deserialize<IList>(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);
247246
var expr = Compile<DataItem1>(crit);
248247
Assert.Equal(@"((obj.StringProp == ""abc"") AndAlso (obj.NullableProp == null))", expr.Body.ToString());
249248
}

net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public void SerializeDeserializeConvertersAffectedOptions() {
5454
//https://github.com/DevExpress/DevExtreme.AspNet.Data/blob/master/js/dx.aspnet.data.js -> serializeDate
5555
//Assert.Equal(filter0Orig[2], filter0STJ[2]);
5656
Assert.Equal("2011-12-13T14:15:16", filter0STJ[2]);
57-
5857
}
5958
}
6059

0 commit comments

Comments
 (0)