[TrimmableTypeMap] Refactor NativeTypeMap tests for trimmable typemap#11484
Merged
Conversation
Use the runtime-registered JniRuntime type manager from NativeTypeMap-tagged tests so they work with either LLVM-IR or trimmable typemap implementations. Remove stale NativeTypeMap category exclusions after the affected tests no longer require the native typemap path. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
simonrozsival
added
copilot
simonrozsival
changed the title
simonrozsival
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors the NativeTypeMap-related test coverage so typemap lookups go through the runtime-agnostic JniRuntime.CurrentRuntime.TypeManager, allowing the same tests to run under the trimmable typemap path. This also removes now-stale NativeTypeMap category usage and related category exclusions.
Changes:
- Update typemap lookup tests in
JnienvTestto useJniRuntime.CurrentRuntime.TypeManagerAPIs instead of native-typemap-specific APIs. - Remove
[Category ("NativeTypeMap")]from the affected tests/fixtures since they no longer depend on the native typemap implementation. - Drop
NativeTypeMapfromExcludeCategoriesin the .NET test runner project since no tests are categorized that way anymore.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj | Removes NativeTypeMap from excluded categories for trimmable and NativeAOT configurations. |
| tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs | Routes typemap mapping assertions through JniRuntime.CurrentRuntime.TypeManager and removes the NativeTypeMap category from those tests. |
| tests/Mono.Android-Tests/Java.Interop-Tests/Java.InteropTests/AndroidValueManagerContractTests.cs | Removes the NativeTypeMap category from the value manager contract test fixture. |
Member
Author
|
/review |
simonrozsival
added
the
ready-to-review
jonathanpeppers
approved these changes
May 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
JniRuntime.CurrentRuntime.TypeManagerNativeTypeMapcategories from refactored tests and AndroidValueManager contract testsNativeTypeMaptest exclusions now that no tests use the categoryTesting
Fixes #11018