|
1 |
| -using System; |
| 1 | +using DevExtreme.AspNet.Data.Helpers; |
| 2 | + |
| 3 | +using System; |
2 | 4 | using System.Collections;
|
3 | 5 | using System.Collections.Generic;
|
4 | 6 | using System.Linq;
|
|
9 | 11 | namespace DevExtreme.AspNet.Data.Tests {
|
10 | 12 |
|
11 | 13 | public class FilterExpressionCompilerTests {
|
12 |
| - static readonly JsonSerializerOptions TESTS_DEFAULT_SERIALIZER_OPTIONS = new JsonSerializerOptions(JsonSerializerDefaults.Web) { |
13 |
| - Converters = { new ListConverter() } |
14 |
| - }; |
15 | 14 |
|
16 | 15 | class DataItem1 {
|
17 | 16 | public int IntProp { get; set; }
|
@@ -146,7 +145,7 @@ public void Not() {
|
146 | 145 |
|
147 | 146 | [Fact]
|
148 | 147 | public void IsUnaryWithJsonCriteria() {
|
149 |
| - var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", TESTS_DEFAULT_SERIALIZER_OPTIONS); |
| 148 | + var crit = JsonSerializer.Deserialize<IList>("[\"!\", []]", DataSourceLoadOptionsParser.DEFAULT_SERIALIZER_OPTIONS); |
150 | 149 | var compiler = new FilterExpressionCompiler(typeof(object), false);
|
151 | 150 | Assert.True(compiler.IsUnary(crit));
|
152 | 151 | }
|
@@ -243,7 +242,7 @@ public void T105740() {
|
243 | 242 |
|
244 | 243 | [Fact]
|
245 | 244 | 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); |
247 | 246 | var expr = Compile<DataItem1>(crit);
|
248 | 247 | Assert.Equal(@"((obj.StringProp == ""abc"") AndAlso (obj.NullableProp == null))", expr.Body.ToString());
|
249 | 248 | }
|
|
0 commit comments