Skip to content
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

Jump to bottom

Enable Native AOT testing in System.Text.Json. #86975

Merged
merged 3 commits into from
Jun 2, 2023
Merged

Enable Native AOT testing in System.Text.Json. #86975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1786935
Enable Native AOT testing in System.Text.Json. Fix #73431.
eiriktsarpalis May 31, 2023
a1c5f04
Enabled AOT testing for generic theories/MakeGenericMethod tests. Add…
eiriktsarpalis Jun 1, 2023
359ee23
Remove hardcoded JsonSerializer calls from test suite.
eiriktsarpalis Jun 1, 2023
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
9 changes: 9 additions & 0 deletions src/libraries/Common/tests/TestUtilities/System/AssertExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,15 @@ public static void Equal<T>(HashSet<T> expected, HashSet<T> actual)
}
}

/// <summary>Validates that the two sets contains the same elements. XUnit doesn't display the full collections.</summary>
public static void Equal<T>(ISet<T> expected, ISet<T> actual)
{
if (!actual.SetEquals(expected))
{
throw new XunitException($"Expected: {string.Join(", ", expected)}{Environment.NewLine}Actual: {string.Join(", ", actual)}");
}
}

/// <summary>
/// Validates that the actual collection contains same items as expected collection. If the test fails, this will display:
/// 1. Count if two collection count are different;
Expand Down
76 changes: 26 additions & 50 deletions ...ibraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.AsyncEnumerable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ public async Task WriteRootLevelAsyncEnumerable<TElement>(IEnumerable<TElement>
return;
}

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize
};
JsonSerializerOptions options = Serializer.CreateOptions(makeReadOnly: false);
options.DefaultBufferSize = bufferSize;

string expectedJson = JsonSerializer.Serialize(source);
string expectedJson = JsonSerializer.Serialize(source, options);

using var stream = new Utf8MemoryStream();
var asyncEnumerable = new MockedAsyncEnumerable<TElement>(source, delayInterval);
Expand All @@ -48,37 +46,10 @@ public async Task WriteNestedAsyncEnumerable<TElement>(IEnumerable<TElement> sou
return;
}

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize
};
JsonSerializerOptions options = Serializer.CreateOptions(makeReadOnly: false);
options.DefaultBufferSize = bufferSize;

string expectedJson = JsonSerializer.Serialize(new { Data = source });

using var stream = new Utf8MemoryStream();
var asyncEnumerable = new MockedAsyncEnumerable<TElement>(source, delayInterval);
await StreamingSerializer.SerializeWrapper(stream, new AsyncEnumerableDto<TElement> { Data = asyncEnumerable }, options);

JsonTestHelper.AssertJsonEqual(expectedJson, stream.AsString());
Assert.Equal(1, asyncEnumerable.TotalCreatedEnumerators);
Assert.Equal(1, asyncEnumerable.TotalDisposedEnumerators);
}

[Theory]
[MemberData(nameof(GetAsyncEnumerableSources))]
public async Task WriteNestedAsyncEnumerable_DTO<TElement>(IEnumerable<TElement> source, int delayInterval, int bufferSize)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was identical to the one above, so I deleted it.

{
if (StreamingSerializer?.IsAsyncSerializer != true)
{
return;
}

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize
};

string expectedJson = JsonSerializer.Serialize(new { Data = source });
string expectedJson = JsonSerializer.Serialize(new EnumerableDto<TElement> { Data = source }, options);

using var stream = new Utf8MemoryStream();
var asyncEnumerable = new MockedAsyncEnumerable<TElement>(source, delayInterval);
Expand All @@ -100,11 +71,9 @@ public async Task WriteNestedAsyncEnumerable_Nullable<TElement>(IEnumerable<TEle

// Primarily tests the ability of NullableConverter to flow async serialization state

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize,
IncludeFields = true,
};
JsonSerializerOptions options = Serializer.CreateOptions(makeReadOnly: false);
options.DefaultBufferSize = bufferSize;
options.IncludeFields = true;

string expectedJson = JsonSerializer.Serialize<(IEnumerable<TElement>, bool)?>((source, false), options);

Expand Down Expand Up @@ -164,11 +133,22 @@ await Assert.ThrowsAsync<TaskCanceledException>(async () =>
Assert.Equal(1, longRunningEnumerable.TotalDisposedEnumerators);
}

public class EnumerableDto<TElement>
{
public IEnumerable<TElement> Data { get; set; }
}

public class AsyncEnumerableDto<TElement>
{
public IAsyncEnumerable<TElement> Data { get; set; }
}

public class EnumerableDtoWithTwoProperties<TElement>
{
public IEnumerable<TElement> Data1 { get; set; }
public IEnumerable<TElement> Data2 { get; set; }
}

public class AsyncEnumerableDtoWithTwoProperties<TElement>
{
public IAsyncEnumerable<TElement> Data1 { get; set; }
Expand All @@ -184,12 +164,10 @@ public async Task WriteSequentialNestedAsyncEnumerables<TElement>(IEnumerable<TE
return;
}

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize
};
JsonSerializerOptions options = Serializer.CreateOptions(makeReadOnly: false);
options.DefaultBufferSize = bufferSize;

string expectedJson = JsonSerializer.Serialize(new { Data1 = source, Data2 = source });
string expectedJson = JsonSerializer.Serialize(new EnumerableDtoWithTwoProperties<TElement> { Data1 = source, Data2 = source }, options);

using var stream = new Utf8MemoryStream();
var asyncEnumerable = new MockedAsyncEnumerable<TElement>(source, delayInterval);
Expand All @@ -209,13 +187,11 @@ public async Task WriteAsyncEnumerableOfAsyncEnumerables<TElement>(IEnumerable<T
return;
}

JsonSerializerOptions options = new JsonSerializerOptions
{
DefaultBufferSize = bufferSize
};
JsonSerializerOptions options = Serializer.CreateOptions(makeReadOnly: false);
options.DefaultBufferSize = bufferSize;

const int OuterEnumerableCount = 5;
string expectedJson = JsonSerializer.Serialize(Enumerable.Repeat(source, OuterEnumerableCount));
string expectedJson = JsonSerializer.Serialize(Enumerable.Repeat(source, OuterEnumerableCount), options);

var innerAsyncEnumerable = new MockedAsyncEnumerable<TElement>(source, delayInterval);
var outerAsyncEnumerable =
Expand Down
9 changes: 4 additions & 5 deletions src/libraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.Generic.Read.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,20 +617,19 @@ public async Task ReadNullableGenericStructISetWithNullJson()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50721", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public async Task ReadISetTOfHashSetT()
{
ISet<HashSet<int>> result = await Serializer.DeserializeWrapper<ISet<HashSet<int>>>(@"[[1,2],[3,4]]");

if (result.First().Contains(1))
{
Assert.Equal(new HashSet<int> { 1, 2 }, result.First());
eiriktsarpalis marked this conversation as resolved.
Show resolved Hide resolved
Assert.Equal(new HashSet<int> { 3, 4 }, result.Last());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, result.First());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, result.Last());
}
else
{
Assert.Equal(new HashSet<int> { 3, 4 }, result.First());
Assert.Equal(new HashSet<int> { 1, 2 }, result.Last());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, result.First());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, result.Last());
}
}

Expand Down
23 changes: 10 additions & 13 deletions src/libraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.Generic.Write.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ public async Task GenericStructISetWrapperT()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50721", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public async Task WriteISetTOfISetT()
{
ISet<ISet<int>> input = new HashSet<ISet<int>>
Expand Down Expand Up @@ -433,7 +432,6 @@ public async Task WriteISetTOfISetT()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50721", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public async Task WriteISetTOfHashSetT()
{
ISet<HashSet<int>> input = new HashSet<HashSet<int>>
Expand All @@ -449,13 +447,13 @@ public async Task WriteISetTOfHashSetT()

if (input.First().Contains(1))
{
Assert.Equal(new HashSet<int> { 1, 2 }, input.First());
Assert.Equal(new HashSet<int> { 3, 4 }, input.Last());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, input.First());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, input.Last());
}
else
{
Assert.Equal(new HashSet<int> { 3, 4 }, input.First());
Assert.Equal(new HashSet<int> { 1, 2 }, input.Last());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, input.First());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, input.Last());
}
}

Expand Down Expand Up @@ -649,13 +647,13 @@ public async Task WriteHashSetTOfHashSetT()

if (input.First().Contains(1))
{
Assert.Equal(new HashSet<int> { 1, 2 }, input.First());
Assert.Equal(new HashSet<int> { 3, 4 }, input.Last());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, input.First());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, input.Last());
}
else
{
Assert.Equal(new HashSet<int> { 3, 4 }, input.First());
Assert.Equal(new HashSet<int> { 1, 2 }, input.Last());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, input.First());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, input.Last());
}

GenericHashSetWrapper<StringHashSetWrapper> input2 = new GenericHashSetWrapper<StringHashSetWrapper>(new List<StringHashSetWrapper>
Expand Down Expand Up @@ -696,7 +694,6 @@ public async Task WriteHashSetTOfArray()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/50721", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public async Task WriteArrayOfHashSetT()
{
HashSet<int>[] input = new HashSet<int>[2];
Expand All @@ -707,8 +704,8 @@ public async Task WriteArrayOfHashSetT()

// Because order isn't guaranteed, roundtrip data to ensure write was accurate.
input = await Serializer.DeserializeWrapper<HashSet<int>[]>(json);
Assert.Equal(new HashSet<int> { 1, 2 }, input.First());
Assert.Equal(new HashSet<int> { 3, 4 }, input.Last());
AssertExtensions.Equal(new HashSet<int> { 1, 2 }, input.First());
AssertExtensions.Equal(new HashSet<int> { 3, 4 }, input.Last());
}

[Fact]
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.Cache.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async Task SerializeObject(Type type, JsonSerializerOptions options)
async Task RunTestAsync(Type type)
{
// Use local options to avoid obtaining already cached metadata from the default options.
var options = new JsonSerializerOptions();
JsonSerializerOptions options = Serializer.CreateOptions();

const int ThreadCount = 8;
const int ConcurrentTestsCount = 4;
Expand Down Expand Up @@ -90,7 +90,7 @@ async Task RunTestAsync(Type type)
public async Task PropertyCacheWithMinInputsFirst()
{
// Use local options to avoid obtaining already cached metadata from the default options.
var options = new JsonSerializerOptions();
JsonSerializerOptions options = Serializer.CreateOptions();

string json = "{}";
await Serializer.DeserializeWrapper<ObjWCtorMixedParams>(json, options);
Expand All @@ -107,7 +107,7 @@ public async Task PropertyCacheWithMinInputsFirst()
public async Task PropertyCacheWithMinInputsLast()
{
// Use local options to avoid obtaining already cached metadata from the default options.
var options = new JsonSerializerOptions();
JsonSerializerOptions options = Serializer.CreateOptions();

ObjWCtorMixedParams testObj = ObjWCtorMixedParams.GetInstance();
testObj.Verify();
Expand Down
Loading