Skip to content

Commit 6ba4b55

Browse files
Polish scanner field integration tests
Co-authored-by: simonrozsival <374616+simonrozsival@users.noreply.github.com>
1 parent 68724e1 commit 6ba4b55

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,6 +673,7 @@ bool ExtendsJavaPeer (TypeDefinition typeDef, AssemblyIndex index)
673673

674674
string compatName = ns.Length == 0
675675
? typeName
676+
// Compat format: UserApp.Models -> userapp.models/TypeName (preserves dots, no slash replacement)
676677
: $"{ns.ToLowerInvariant ()}/{typeName}";
677678

678679
return (jniName, compatName);

tests/Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests/ScannerFieldIntegrationTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace Microsoft.Android.Sdk.TrimmableTypeMap.IntegrationTests;
88

99
public partial class ScannerComparisonTests
1010
{
11-
static readonly Lazy<List<JavaPeerInfo>> monoAndroidPeers = new (() => ScanPeers (AllAssemblyPaths));
12-
static readonly Lazy<List<JavaPeerInfo>> userFixturePeers = new (() => {
11+
static readonly Lazy<List<JavaPeerInfo>> MonoAndroidPeers = new (() => ScanPeers (AllAssemblyPaths));
12+
static readonly Lazy<List<JavaPeerInfo>> UserFixturePeers = new (() => {
1313
var paths = AllUserTypesAssemblyPaths
1414
?? throw new InvalidOperationException ("UserTypesFixture.dll not found.");
1515
return ScanPeers (paths);
@@ -103,9 +103,9 @@ public void ManagedMethodName_MarshalMethods ()
103103
method.ManagedMethodName == "OnCreate" && method.JniName == "onCreate");
104104
}
105105

106-
static List<JavaPeerInfo> ScanMonoAndroidPeers () => monoAndroidPeers.Value;
106+
static List<JavaPeerInfo> ScanMonoAndroidPeers () => MonoAndroidPeers.Value;
107107

108-
static List<JavaPeerInfo> ScanUserFixturePeers () => userFixturePeers.Value;
108+
static List<JavaPeerInfo> ScanUserFixturePeers () => UserFixturePeers.Value;
109109

110110
static List<JavaPeerInfo> ScanPeers (string[] assemblyPaths)
111111
{

0 commit comments

Comments
 (0)