Skip to content

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

Merged
eiriktsarpalis merged 3 commits into
dotnet:mainfrom
eiriktsarpalis:fix/stj-aot-testing
Jun 2, 2023
Merged

Enable Native AOT testing in System.Text.Json.#86975
eiriktsarpalis merged 3 commits into
dotnet:mainfrom
eiriktsarpalis:fix/stj-aot-testing

Conversation

@eiriktsarpalis

@eiriktsarpaliseiriktsarpalis commented May 31, 2023•
edited
Loading

Copy link
Copy Markdown
Member

Fixes#73431. Fixes#86973.

@ghost

ghost commented May 31, 2023

Copy link
Copy Markdown

Tagging subscribers to this area: @dotnet/area-system-text-json, @gregsdennis
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #73431.

Author:eiriktsarpalis
Assignees:-
Labels:

area-System.Text.Json

Milestone:-

@eiriktsarpaliseiriktsarpalis added this to the 8.0.0 milestone May 31, 2023
MichalStrehovsky
MichalStrehovsky reviewed May 31, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.AsyncEnumerable.cs Outdated
Comment threadsrc/libraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.Generic.Read.cs Outdated
Comment threadsrc/libraries/System.Text.Json/tests/Common/ExtensionDataTests.cs Outdated
Comment threadsrc/libraries/System.Text.Json/tests/Common/ExtensionDataTests.cs Outdated
Comment threadsrc/libraries/System.Text.Json/tests/Common/TestClasses/TestClasses.cs Outdated
eerhardt
eerhardt reviewed May 31, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/JsonCreationHandlingTests.Generic.cs
Comment thread...aries/System.Text.Json/tests/Common/ReferenceHandlerTests/ReferenceHandlerTests.Serialize.cs Outdated
This was referenced Jun 1, 2023
Closed
Closed
@eiriktsarpalis

eiriktsarpalis commented Jun 1, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Jun 1, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

@eiriktsarpaliseiriktsarpalis mentioned this pull request Jun 1, 2023
Open
@eiriktsarpalis

eiriktsarpalis commented Jun 1, 2023

Copy link
Copy Markdown
MemberAuthor

/azp run runtime-extra-platforms

@azure-pipelines

azure-pipelinesBot commented Jun 1, 2023

Copy link
Copy Markdown
Azure Pipelines successfully started running 1 pipeline(s).

eiriktsarpalis
eiriktsarpalis commented Jun 1, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/CollectionTests/CollectionTests.AsyncEnumerable.cs

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

@eiriktsarpaliseiriktsarpalisJun 1, 2023

Copy link
Copy Markdown
MemberAuthor

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.

eiriktsarpalis
eiriktsarpalis commented Jun 1, 2023
View reviewed changes
Comment thread...braries/System.Text.Json/tests/Common/ConstructorTests/ConstructorTests.ParameterMatching.cs
await Assert.ThrowsAsync<JsonException>(() => Serializer.DeserializeWrapper<Point_2D_Struct>("{true"));
}

#if !BUILDING_SOURCE_GENERATOR_TESTS // Anonymous types not supported in source gen

@eiriktsarpaliseiriktsarpalisJun 1, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

The test is hardcoding reflection, so I'm just disabling it for source gen.

eiriktsarpalis
eiriktsarpalis commented Jun 1, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/ExtensionDataTests.cs
private static void ExtensionProperty_SupportsWritingToCustomSerializerWithOptionsInternal<TDictionary, TConverter>()
where TDictionary : new()
where TConverter : JsonConverter, new()
[MemberData(nameof(GetCustomOverflowConverters))]

@eiriktsarpaliseiriktsarpalisJun 1, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Refactored the tests somewhat to reduce the number of generic parameters needed to drive the tests.

@build-analysisbuild-analysisBot mentioned this pull request Jun 1, 2023
Closed
MichalStrehovsky
MichalStrehovsky reviewed Jun 2, 2023
View reviewed changes

@MichalStrehovskyMichalStrehovsky left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me from NativeAOT perspective, but can't speak about the test changes in general. Thank you!

Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/roslyn3.11.rd.xml
@build-analysisbuild-analysisBot mentioned this pull request Jun 2, 2023
Closed
krwq
krwq reviewed Jun 2, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/roslyn4.4.rd.xml
<Directives>
<Application>
<!-- NB Shared specializations must also be replicated in the roslyn3.11.rd.xml file -->
<Assembly Name="System.Text.Json.SourceGeneration.Roslyn4.4.Tests">

@krwqkrwqJun 2, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

why are those needed? Do we know the reason they're trimmed out?

@eiriktsarpaliseiriktsarpalisJun 2, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

They are helping the AOT compiler generate generic method specializations we know will be needed at runtime (but can't be inferred at compile time).

@krwqkrwqJun 2, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

do we know why they can't be inferred?

@eiriktsarpaliseiriktsarpalisJun 2, 2023

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

It's the usual issue of trying to do Type.MakeGenericType/Method.MakeGenericMethod in AOT. We're working on a fix specifically for theories though: #86975 (comment)

krwq
krwq reviewed Jun 2, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/ExtensionDataTests.cs
krwq
krwq reviewed Jun 2, 2023
View reviewed changes
Comment threadsrc/libraries/System.Text.Json/tests/Common/ExtensionDataTests.cs
krwq
krwq approved these changes Jun 2, 2023
View reviewed changes

@krwqkrwq left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, thanks!

@eiriktsarpalis
eiriktsarpalis merged commit 1558346 into dotnet:mainJun 2, 2023
@eiriktsarpalis
eiriktsarpalis deleted the fix/stj-aot-testing branch June 2, 2023 09:59
@ghostghost locked as resolved and limited conversation to collaborators Jul 2, 2023
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@krwqkrwqkrwq approved these changes
@jkotasjkotasjkotas left review comments
@MichalStrehovskyMichalStrehovskyMichalStrehovsky left review comments
@layomialayomiaAwaiting requested review from layomia
@eerhardteerhardtAwaiting requested review from eerhardt

Assignees

@eiriktsarpaliseiriktsarpalis

Labels

area-System.Text.Json

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

System.Text.Json xunit generic theories not working in Native AOT. Get System.Text.Json.SourceGeneration tests running with NativeAot

5 participants

@eiriktsarpalis@krwq@jkotas@eerhardt@MichalStrehovsky