Skip to content

[tests] Use blittable RegisterNatives in JNI callback tests #12019

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

Open
simonrozsival wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −25
Open

[tests] Use blittable RegisterNatives in JNI callback tests #12019

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ea421e
[Tests] Skip JniNativeMethodRegistration tests on trimmable/NativeAOT
simonrozsival Jul 4, 2026
d0395ef
[tests] Use blittable RegisterNatives in JNI callback tests
simonrozsival Jul 8, 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
47 changes: 22 additions & 25 deletions external/Java.Interop/tests/Java.Interop-Tests/Java.Interop/JniTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,16 @@ public unsafe void RegisterNativeMethods_JniNativeMethod ()
static int NativeAdd (IntPtr jnienv, IntPtr self, int a, int b) => a + b;

[Test]
[UnconditionalSuppressMessage ("AOT", "IL3050", Justification = "Test exercises non-AOT-compatible JniNativeMethodRegistration[] registration path.")]
public unsafe void RegisterNativeMethods_JniNativeMethodRegistration ()
public unsafe void RegisterNativeMethods_JniNativeMethod_UnmanagedCallersOnly ()
{
using (var nativeClass = new JniType ("net/dot/jni/test/RegisterNativesTestType")) {
// Test the JniNativeMethodRegistration[] registration path (the one that marshals to blittable)
var methods = new JniNativeMethodRegistration [1];
methods [0] = new JniNativeMethodRegistration (
"add",
"(II)I",
new AddDelegate (ManagedAdd));

JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, methods, methods.Length);
Span<JniNativeMethod> methods = stackalloc JniNativeMethod [1];
fixed (byte* namePtr = "add"u8)
fixed (byte* sigPtr = "(II)I"u8) {
methods [0] = new JniNativeMethod (namePtr, sigPtr,
(IntPtr) (delegate* unmanaged<IntPtr, IntPtr, int, int, int>) &ManagedAdd);
JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, methods);
}

// Call the native method from Java to verify registration worked
var ctor = JniEnvironment.InstanceMethods.GetMethodID (nativeClass.PeerReference, "<init>", "()V");
Expand All @@ -248,26 +246,26 @@ public unsafe void RegisterNativeMethods_JniNativeMethodRegistration ()
}
}

delegate int AddDelegate (IntPtr jnienv, IntPtr self, int a, int b);

[UnmanagedCallersOnly]
static int ManagedAdd (IntPtr jnienv, IntPtr self, int a, int b) => a + b;

[Test]
[UnconditionalSuppressMessage ("AOT", "IL3050", Justification = "Test exercises non-AOT-compatible JniNativeMethodRegistration[] registration path with many methods.")]
public unsafe void RegisterNativeMethods_JniNativeMethodRegistration_ManyMethods ()
public unsafe void RegisterNativeMethods_JniNativeMethod_UnmanagedCallersOnly_ManyMethods ()
{
using (var nativeClass = new JniType ("net/dot/jni/test/RegisterNativesTestType")) {
// Test the heap allocation path (> 32 methods) to ensure the marshalling loop handles it
var methods = new JniNativeMethodRegistration [40];
for (int i = 0; i < methods.Length; ++i) {
methods [i] = new JniNativeMethodRegistration (
"add",
"(II)I",
new AddDelegate (ManagedAdd));
}
// Keep coverage for a large registration set while using the NativeAOT-compatible
// blittable overload instead of the delegate-marshaling overload.
var methods = new JniNativeMethod [40];
fixed (byte* namePtr = "add"u8)
fixed (byte* sigPtr = "(II)I"u8) {
for (int i = 0; i < methods.Length; ++i) {
methods [i] = new JniNativeMethod (namePtr, sigPtr,
(IntPtr) (delegate* unmanaged<IntPtr, IntPtr, int, int, int>) &ManagedAdd);
}

// This should not crash even with > 32 methods
JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, methods, methods.Length);
// This should not crash even with > 32 methods.
JniEnvironment.Types.RegisterNatives (nativeClass.PeerReference, methods);
}

// Verify the registration worked by calling the method
var ctor = JniEnvironment.InstanceMethods.GetMethodID (nativeClass.PeerReference, "<init>", "()V");
Expand All @@ -286,4 +284,3 @@ public unsafe void RegisterNativeMethods_JniNativeMethodRegistration_ManyMethods
}
}
}

Loading