Skip to content

[tests] run Java.Interop-Tests on NativeAOT #10496

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
jonathanpeppers merged 10 commits into from
Mar 16, 2026
Merged

[tests] run Java.Interop-Tests on NativeAOT #10496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
75dcfcc
[tests] run `Java.Interop-Tests` on NativeAOT
jonathanpeppers Sep 17, 2025
1d6c463
[nativeaot] Log location of the actual p/invoke stub called
grendello Sep 19, 2025
24a6e4f
[nativeaot] Implement _monodroid_weak_gref_delete
grendello Sep 19, 2025
6c349a2
Merge main into dev/peppers/java-interop-tests-nativeaot
jonathanpeppers Mar 12, 2026
c59bad8
Remove duplicate _monodroid_weak_gref_delete definition
jonathanpeppers Mar 13, 2026
eb2d29d
Fix ManagedTypeManager for NativeAOT Java.Interop-Tests
jonathanpeppers Mar 13, 2026
71860e3
Merge branch 'main' into dev/peppers/java-interop-tests-nativeaot
jonathanpeppers Mar 16, 2026
edc3452
Fix GetStaticMethodFallbackTypesCore to use Desugar{name}\ pattern
jonathanpeppers Mar 16, 2026
e15598b
Bump to dotnet/java-interop/main@fb0952fa
jonathanpeppers Mar 16, 2026
b8f3905
Simplify GetStaticMethodFallbackTypesCore to use string interpolation
jonathanpeppers Mar 16, 2026
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
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated 1 files
+3 −0 tests/Java.Interop-Tests/Java.Interop/InvokeVirtualFromConstructorTests.cs
23 changes: 20 additions & 3 deletions src/Mono.Android/Microsoft.Android.Runtime/ManagedTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,13 @@ public override void RegisterNativeMembers (
ReadOnlySpan<char> methods)
{
if (methods.IsEmpty) {
base.RegisterNativeMembers (nativeClass, type, methods);
return;
}

int methodCount = CountMethods (methods);
if (methodCount < 1) {
base.RegisterNativeMembers (nativeClass, type, methods);
return;
}

Expand Down Expand Up @@ -129,12 +131,14 @@ public override void RegisterNativeMembers (

protected override IEnumerable<Type> GetTypesForSimpleReference (string jniSimpleReference)
{
if (ManagedTypeMapping.TryGetType (jniSimpleReference, out var target)) {
yield return target;
}
// Base class contains built-in mappings (e.g. java/lang/String → System.String)
// which must take priority over ManagedTypeMapping (which would return Java.Lang.String).
foreach (var t in base.GetTypesForSimpleReference (jniSimpleReference)) {
yield return t;
}
if (ManagedTypeMapping.TryGetType (jniSimpleReference, out var target)) {
yield return target;
}
Comment thread
jonathanpeppers marked this conversation as resolved.
}

protected override IEnumerable<string> GetSimpleReferences (Type type)
Expand All @@ -148,6 +152,19 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
}
}

protected override IReadOnlyList<string>? GetStaticMethodFallbackTypesCore (string jniSimpleReference)
{
int slash = jniSimpleReference.LastIndexOf ('/');
var desugarType = slash > 0
? $"{jniSimpleReference.Substring (0, slash + 1)}Desugar{jniSimpleReference.Substring (slash + 1)}"
: $"Desugar{jniSimpleReference}";

return new[] {
$"{desugarType}$_CC",
$"{jniSimpleReference}$-CC",
};
Comment thread
jonathanpeppers marked this conversation as resolved.
}
Comment thread
jonathanpeppers marked this conversation as resolved.

static int CountMethods (ReadOnlySpan<char> methodsSpan)
{
int count = 0;
Expand Down
2 changes: 0 additions & 2 deletions tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
<WarningsAsErrors>IL2037</WarningsAsErrors>
<AndroidUseNegotiateAuthentication>true</AndroidUseNegotiateAuthentication>
<AndroidNdkDirectory></AndroidNdkDirectory>
<DefineConstants Condition=" '$(UseMonoRuntime)' != 'true' and '$(PublishAot)' != 'true' ">$(DefineConstants);CORECLR</DefineConstants>
<DefineConstants Condition=" '$(UseMonoRuntime)' != 'true' and '$(PublishAot)' == 'true' ">$(DefineConstants);NATIVEAOT</DefineConstants>
<!--
TODO: Fix excluded tests
For $(EnableLLVM)
Expand Down
5 changes: 0 additions & 5 deletions ...ono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,12 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
protected override IList<TestAssemblyInfo> GetTestAssemblies()
{
Assembly asm = Assembly.GetExecutingAssembly();
#if !NATIVEAOT // TODO: Java.Interop-Tests not passing yet
Assembly ji = typeof (Java.InteropTests.JavaInterop_Tests_Reference).Assembly;
#endif


return new List<TestAssemblyInfo>()
{
new TestAssemblyInfo (asm, asm.Location ?? String.Empty),
#if !NATIVEAOT
new TestAssemblyInfo (ji, ji.Location ?? String.Empty),
#endif
};
}
}
Expand Down