Skip to content

Refactor tests with JsonSerializerOptions #664

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpreyskurantov merged 1 commit into from
May 6, 2025
Merged

Refactor tests with JsonSerializerOptions #664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions net/DevExtreme.AspNet.Data.Tests/CustomFilterCompilersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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<IList>(@"[ ""Products"", ""Contains"", ""ch"" ]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
var filter = JsonSerializer.Deserialize<IList>(@"[ ""Products"", ""Contains"", ""ch"" ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);

var loadOptions = new SampleLoadOptions {
Filter = filter,
Expand Down
11 changes: 5 additions & 6 deletions net/DevExtreme.AspNet.Data.Tests/FilterExpressionCompilerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using System;
using DevExtreme.AspNet.Data.Helpers;

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -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; }
Expand Down Expand Up @@ -146,7 +145,7 @@ public void Not() {

[Fact]
public void IsUnaryWithJsonCriteria() {
var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);
var compiler = new FilterExpressionCompiler(typeof(object), false);
Assert.True(compiler.IsUnary(crit));
}
Expand Down Expand Up @@ -243,7 +242,7 @@ public void T105740() {

[Fact]
public void JsonObjects() {
var crit = JsonSerializer.Deserialize<IList>(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
var crit = JsonSerializer.Deserialize<IList>(@"[ [ ""StringProp"", ""abc"" ], [ ""NullableProp"", null ] ]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS);
var expr = Compile<DataItem1>(crit);
Assert.Equal(@"((obj.StringProp == ""abc"") AndAlso (obj.NullableProp == null))", expr.Body.ToString());
}
Expand Down
1 change: 0 additions & 1 deletion net/DevExtreme.AspNet.Data.Tests/SerializeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);

}
}

Expand Down
Loading