Skip to content

[tests] Move typemap rewrite coverage to net11 #12732

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

Closed
simonrozsival wants to merge 1 commit into from
Closed

[tests] Move typemap rewrite coverage to net11 #12732

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
80 changes: 0 additions & 80 deletions ...asks/Tests/Xamarin.Android.Build.Tests/Utilities/JniRemapping/JniAssemblyRewriterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Reflection.Metadata;
using System.Reflection.Metadata.Ecma335;
using System.Reflection.PortableExecutable;
using Microsoft.Android.Sdk.TrimmableTypeMap;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
using NUnit.Framework;
Expand Down Expand Up @@ -891,85 +890,6 @@ public void FailsWhenASharedUtf8DatumNeedsTwoDifferentNames ()
StringAssert.Contains ("shared", exception.Message.ToLowerInvariant ());
}

[Test]
public void RewritesGeneratedTypeMapWithOwnerSpecificMethodNames ()
{
byte [] source = GenerateTypeMapWithSharedMethodName ();
var warnings = new List<BuildWarningEventArgs> ();

JniRewriteResult result = Rewrite (source, Mapping (
"test.First -> a.b.First:\n" +
" void n_Run() -> a\n" +
"test.Second -> a.b.Second:\n" +
" void n_Run() -> b\n"), warnings);

CollectionAssert.AreEquivalent (new [] { "a", "b", "()V" }, ReadUtf8Values (result.Image));
CollectionAssert.DoesNotContain (warnings.Select (warning => warning.Code).ToArray (), "XA4326");
}

[Test]
public void RewritesGeneratedTypeMapWithMappedAndUnmappedMethodNames ()
{
byte [] source = GenerateTypeMapWithSharedMethodName ();
var warnings = new List<BuildWarningEventArgs> ();

JniRewriteResult result = Rewrite (source, Mapping (
"test.First -> a.b.First:\n" +
" void n_Run() -> a\n" +
"test.Second -> test.Second:\n"), warnings);

CollectionAssert.AreEquivalent (new [] { "a", "n_Run", "()V" }, ReadUtf8Values (result.Image));
CollectionAssert.DoesNotContain (warnings.Select (warning => warning.Code).ToArray (), "XA4326");
}

static byte [] GenerateTypeMapWithSharedMethodName ()
{
var peers = new [] {
CreatePeer ("test/First", "Test.First"),
CreatePeer ("test/Second", "Test.Second"),
};
using var stream = new MemoryStream ();
new TypeMapAssemblyGenerator (new Version (11, 0, 0, 0)).Generate (peers, stream, "OwnerSpecificNames");
return stream.ToArray ();

static JavaPeerInfo CreatePeer (string javaName, string managedName)
{
int separator = managedName.LastIndexOf ('.');
return new JavaPeerInfo {
JavaName = javaName,
CompatJniName = javaName,
ManagedTypeName = managedName,
ManagedTypeNamespace = managedName.Substring (0, separator),
ManagedTypeShortName = managedName.Substring (separator + 1),
AssemblyName = "TestAsm",
DoNotGenerateAcw = false,
ActivationCtor = new ActivationCtorInfo {
DeclaringTypeName = managedName,
DeclaringAssemblyName = "TestAsm",
Style = ActivationCtorStyle.XamarinAndroid,
},
MarshalMethods = [
new MarshalMethodInfo {
JniName = "run",
NativeCallbackName = "n_Run",
JniSignature = "()V",
ManagedMethodName = "Run",
},
],
};
}
}

static string [] ReadUtf8Values (byte [] image)
{
using var peReader = new PEReader (ImmutableArray.Create (image));
MetadataReader reader = peReader.GetMetadataReader ();
return FieldRvaTable.Read (peReader, reader).Entries
.Select (entry => entry.Utf8Value)
.OfType<string> ()
.ToArray ();
}

[Test]
public void FailsWhenASharedUtf8DatumMustRemainUnmappedForOneProxy ()
{
Expand Down
98 changes: 98 additions & 0 deletions ...soft.Android.Sdk.TrimmableTypeMap.IntegrationTests/JniAssemblyRewriterIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
using System;
using System.Collections.Immutable;
using System.IO;
using System.Linq;
using System.Reflection.Metadata;
using System.Reflection.PortableExecutable;
using Microsoft.Build.Utilities;
using Xunit;
using Xamarin.Android.Tasks.JniRemapping;

Comment on lines +1 to +10
namespace Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests;

public class JniAssemblyRewriterIntegrationTests
{
[Fact]
public void RewritesGeneratedTypeMapWithOwnerSpecificMethodNames ()
{
var engine = new MockBuildEngine ();
JniRewriteResult result = Rewrite (GenerateTypeMapWithSharedMethodName (), """
test.First -> a.b.First:
void n_Run() -> a
test.Second -> a.b.Second:
void n_Run() -> b
""", engine);

Assert.Equal (new [] { "()V", "a", "b" }, ReadUtf8Values (result.Image).OrderBy (value => value));
Assert.DoesNotContain (engine.Warnings, warning => warning.Code == "XA4326");
}

[Fact]
public void RewritesGeneratedTypeMapWithMappedAndUnmappedMethodNames ()
{
var engine = new MockBuildEngine ();
JniRewriteResult result = Rewrite (GenerateTypeMapWithSharedMethodName (), """
test.First -> a.b.First:
void n_Run() -> a
test.Second -> test.Second:
""", engine);

Assert.Equal (new [] { "()V", "a", "n_Run" }, ReadUtf8Values (result.Image).OrderBy (value => value));
Assert.DoesNotContain (engine.Warnings, warning => warning.Code == "XA4326");
}

static JniRewriteResult Rewrite (byte [] sourceImage, string mappingText, MockBuildEngine engine)
{
R8Mapping mapping = R8Mapping.Parse (new StringReader (mappingText));
var log = new TaskLoggingHelper (engine, nameof (JniAssemblyRewriterIntegrationTests));
return JniAssemblyRewriter.Rewrite (sourceImage, mapping, log);
}

static byte [] GenerateTypeMapWithSharedMethodName ()
{
var peers = new [] {
CreatePeer ("test/First", "Test.First"),
CreatePeer ("test/Second", "Test.Second"),
};
using var stream = new MemoryStream ();
new TypeMapAssemblyGenerator (new Version (11, 0, 0, 0)).Generate (peers, stream, "OwnerSpecificNames");
return stream.ToArray ();
}

static JavaPeerInfo CreatePeer (string javaName, string managedName)
{
int separator = managedName.LastIndexOf ('.');
return new JavaPeerInfo {
JavaName = javaName,
CompatJniName = javaName,
ManagedTypeName = managedName,
ManagedTypeNamespace = managedName.Substring (0, separator),
ManagedTypeShortName = managedName.Substring (separator + 1),
AssemblyName = "TestAsm",
DoNotGenerateAcw = false,
ActivationCtor = new ActivationCtorInfo {
DeclaringTypeName = managedName,
DeclaringAssemblyName = "TestAsm",
Style = ActivationCtorStyle.XamarinAndroid,
},
MarshalMethods = [
new MarshalMethodInfo {
JniName = "run",
NativeCallbackName = "n_Run",
JniSignature = "()V",
ManagedMethodName = "Run",
},
],
};
}

static string [] ReadUtf8Values (byte [] image)
{
using var peReader = new PEReader (ImmutableArray.Create (image));
MetadataReader reader = peReader.GetMetadataReader ();
return FieldRvaTable.Read (peReader, reader).Entries
.Select (entry => entry.Utf8Value)
.OfType<string> ()
.ToArray ();
}
}
5 changes: 4 additions & 1 deletion tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/MockBuildEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Microsoft.Build.Framework;

namespace Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests;
Expand All @@ -9,6 +10,8 @@ namespace Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests;
/// </summary>
sealed class MockBuildEngine : IBuildEngine
{
public List<BuildWarningEventArgs> Warnings { get; } = [];

public bool ContinueOnError => false;
public int LineNumberOfTaskNode => 0;
public int ColumnNumberOfTaskNode => 0;
Expand All @@ -18,5 +21,5 @@ sealed class MockBuildEngine : IBuildEngine
public void LogCustomEvent (CustomBuildEventArgs e) { }
public void LogErrorEvent (BuildErrorEventArgs e) { }
public void LogMessageEvent (BuildMessageEventArgs e) { }
public void LogWarningEvent (BuildWarningEventArgs e) { }
public void LogWarningEvent (BuildWarningEventArgs e) => Warnings.Add (e);
}