Skip to content

Test trimmable typemap behavior at runtime #12512

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
simonrozsival merged 7 commits into from
Aug 26, 2026
+171 −986
Merged

Test trimmable typemap behavior at runtime #12512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8881462
Remove redundant trimmable typemap generator tests
simonrozsival Aug 25, 2026
76f2c52
Rely on runtime tests for typemap constructors
simonrozsival Aug 25, 2026
cc13e14
Test trimmable typemap callbacks at runtime
simonrozsival Aug 25, 2026
259e11a
Test trimmable exports through JNI
simonrozsival Aug 25, 2026
daaa380
Test typemap proxy resolution at runtime
simonrozsival Aug 25, 2026
7be5748
Retain typemap build-time contracts
simonrozsival Aug 25, 2026
e5cce1b
Apply batched suggestions from code review
simonrozsival Aug 25, 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
8 changes: 2 additions & 6 deletions tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/ExportFieldTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
namespace Microsoft.Android.Sdk.TrimmableTypeMap.Tests;

/// <summary>
/// Tests for [ExportField] support: the scanner must detect [ExportField] attributes
/// and the JCW generator must emit Java field declarations initialized by calling
/// the annotated method.
/// Tests for the [ExportField] scanner and model contracts.
/// </summary>
public class ExportFieldTests : FixtureTestBase
{
Expand Down Expand Up @@ -41,16 +39,14 @@ public void Scanner_ExportFieldMethod_HasExportConnectorAndFlag ()
}

[Fact]
public void JcwGenerator_EmitsFieldDeclarationsAndMethodWrappers ()
public void JcwGenerator_EmitsInstanceFieldDeclarationAndMethodWrapper ()
{
var peer = FindFixtureByJavaName ("my/app/ExportFieldExample");
var generator = new JcwJavaSourceGenerator ();
using var writer = new StringWriter ();
generator.Generate (peer, writer);
var java = writer.ToString ();

Assert.Contains ("public static", java);
Assert.Contains ("STATIC_INSTANCE = GetInstance ();", java);
Assert.Contains ("VALUE = GetValue ();", java);
Assert.Contains ("GetValue ()", java);
Assert.Contains ("n_GetValue", java);
Expand Down
8 changes: 0 additions & 8 deletions ...crosoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/RootTypeMapAssemblyGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ static MemoryStream GenerateRootAssembly (IReadOnlyList<string> perAssemblyNames
static MethodDefinitionHandle FindMethodDefinition (MetadataReader reader, string methodName) =>
reader.MethodDefinitions.First (h => reader.GetString (reader.GetMethodDefinition (h).Name) == methodName);

[Fact]
public void Generate_ProducesValidPEAssembly ()
{
using var stream = GenerateRootAssembly (new [] { "_App.TypeMap", "_Mono.Android.TypeMap" });
using var pe = new PEReader (stream);
Assert.True (pe.HasMetadata);
}

[Theory]
[InlineData (false)]
[InlineData (true)]
Expand Down
Loading