-
Notifications
You must be signed in to change notification settings - Fork 556
[tests] enable Java.Interop-Tests for CoreCLR #10095
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.
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
Merged
Conversation
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
4da4e84
to
ed267ff
Compare
jonathanpeppers
added a commit
that referenced
this pull request
May 2, 2025
Context: #10095 After enabling `Java.Interop-Tests.dll` for CoreCLR/NativeAOT, we started seeing `Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy()` fail with: Expected: same as <System.InvalidOperationException: Managed Exception!> But was: <Java.Interop.JavaProxyThrowable: System.InvalidOperationException: Managed Exception! This is because `AndroidRuntime.cs` was doing: if (JNIEnvInit.ValueManager is AndroidValueManager vm) { return vm.UnboxException (value); } And in this case `ManagedValueManager` was being used, and so the exception would not be "unboxed". We can fix this by using `JNIEnvInit.ValueManager?.PeekValue()` instead and the test now passes. I also noticed that `AndroidValueManager` had code in `TryUnboxPeerObject()` for: var proxy = value as Android.Runtime.JavaProxyThrowable; if (proxy != null) { result = proxy.InnerException; return true; } return base.TryUnboxPeerObject (value, out result); While the base class handled `Java.Interop.JavaProxyThrowable`. This was missing for `ManagedValueManager`, so I added it.
jonpryor
pushed a commit
that referenced
this pull request
May 2, 2025
…0100) Context: #10095 After enabling `Java.Interop-Tests.dll` for CoreCLR/NativeAOT, `Java.InteropTests.JavaExceptionTests.InnerExceptionIsNotAProxy()` was failing with: Expected: same as <System.InvalidOperationException: Managed Exception!> But was: <Java.Interop.JavaProxyThrowable: System.InvalidOperationException: Managed Exception! This is because `AndroidRuntime.cs` was doing: if (JNIEnvInit.ValueManager is AndroidValueManager vm) { return vm.UnboxException (value); } And in this case `ManagedValueManager` was being used, and so the exception would not be "unboxed". We can fix this by using `JNIEnvInit.ValueManager?.PeekValue()` instead and the test now passes. I also noticed that `AndroidValueManager` had code in `TryUnboxPeerObject()` for: var proxy = value as Android.Runtime.JavaProxyThrowable; if (proxy != null) { result = proxy.InnerException; return true; } return base.TryUnboxPeerObject (value, out result); While the base class handled `Java.Interop.JavaProxyThrowable`. This was missing for `ManagedValueManager`, so I added it.
0edcba4
to
bd46275
Compare
da1f05b
to
975ad6a
Compare
975ad6a
to
b3d6865
Compare
jpobst
approved these changes
May 6, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like this #define
is used for some tests from the Java.Interop
submodule:
pjcollins
approved these changes
May 6, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Until a "GC Bridge" exists, for
Java.Interop-Tests
to work on the new runtimes, we need to set: