Skip to content

[Java.Interop.Tools.TypeNameMappings] fix ToJniName() #1198

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
merged 1 commit into from
Feb 24, 2024
Merged

[Java.Interop.Tools.TypeNameMappings] fix ToJniName() #1198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions ...terop.Tools.TypeNameMappings/Java.Interop.Tools.TypeNameMappings/JavaNativeTypeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ public static string ToJniName (Type type)
// Trimming warnings are not enabled for netstandard2.0 in this project.
static bool ShouldCheckSpecialExportJniType (Type type) =>
#if NETSTANDARD2_0
type.GetInterfaces ().Any (t => t.FullName == "Java.Interop.IJavaPeerable");
!type.GetInterfaces ().Any (t => t.FullName == "Java.Interop.IJavaPeerable");
#else
IJavaPeerableType.Value.IsAssignableFrom (type);
!IJavaPeerableType.Value.IsAssignableFrom (type);
#endif

public static string ToJniName (string jniType, int rank)
Expand Down
9 changes: 9 additions & 0 deletions ...lableWrappers-Tests/Java.Interop.Tools.JavaCallableWrappers/JavaNativeTypeManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,14 @@ public void LowercaseWithAssemblyName ()
Assert.AreEqual ("assembly_mscorlib.system", JavaNativeTypeManager.GetPackageName (typeof (string)));
#endif // !NET
}

[Test]
[TestCase (typeof (string), "java/lang/String")]
[TestCase (typeof (Type), "java/lang/Object")]
public void ToJniName (Type type, string expected)
{
string actual = JavaNativeTypeManager.ToJniName (type);
Assert.AreEqual (expected, actual);
}
}
}