[coreclr] run Mono.Android-Tests (#9916)

jonathanpeppers · web-flow · commit c096099eeeca · 2025-04-25T08:25:52.000-05:00
Context: #10069 This runs Mono.Android-Tests with `-p:UseMonoRuntime=false`. I temporarily disabled: * The `Java.Interop-Tests.dll` test assembly * `GCBridge` category, related to a missing "GC Bridge" * `SSL` and `NTLM` categories related to some http tests * `RuntimeConfig` category related to `runtimeconfig.json` * Some individual tests I left a `TODO` comment for each ignored test, to investigate in the future.
diff --git a/build-tools/automation/yaml-templates/stage-package-tests.yaml b/build-tools/automation/yaml-templates/stage-package-tests.yaml
@@ -198,6 +198,16 @@ stages:
         artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
         artifactFolder: $(DotNetTargetFramework)-AotLlvm
 
+    - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
+      parameters:
+        configuration: $(XA.Build.Configuration)
+        testName: Mono.Android.NET_Tests-CoreCLR
+        project: tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
+        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)CoreCLR.xml
+        extraBuildArgs: -p:TestsFlavor=CoreCLR -p:UseMonoRuntime=false -p:AndroidEnableMarshalMethods=false
+        artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
+        artifactFolder: $(DotNetTargetFramework)-CoreCLR
+
     - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml
       parameters:
         configuration: $(XA.Build.Configuration)
diff --git a/build-tools/scripts/TestApks.targets b/build-tools/scripts/TestApks.targets
@@ -18,7 +18,7 @@
 
   <PropertyGroup>
     <!-- APK tests might run on 32-bit emulators -->
-    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' ">android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition=" '$(RuntimeIdentifier)' == '' and '$(PublishAot)' != 'true' and '$(UseMonoRuntime)' != 'false' ">android-arm64;android-x86;android-x64;</RuntimeIdentifiers>
     <TestAvdApiLevel Condition=" '$(TestAvdApiLevel)' == '' ">29</TestAvdApiLevel>
     <TestAvdAbi Condition=" '$(TestAvdAbi)' == '' and '$(HostOS)' == 'Darwin' and  '$(HostOSArchitecture)' == 'Arm64' ">arm64-v8a</TestAvdAbi>
     <TestAvdAbi Condition=" '$(TestAvdAbi)' == '' ">x86_64</TestAvdAbi>
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Interop/JnienvTest.cs
@@ -239,6 +239,7 @@ public void SetField_PermitNullValues ()
 		}
 
 		[Test]
+		[Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069
 		public void CreateTypeWithExportedMethods ()
 		{
 			using (var e = new ContainsExportedMethods ()) {
@@ -251,6 +252,7 @@ public void CreateTypeWithExportedMethods ()
 		}
 
 		[Test]
+		[Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069
 		public void ActivatedDirectObjectSubclassesShouldBeRegistered ()
 		{
 			if (Build.VERSION.SdkInt <= BuildVersionCodes.GingerbreadMr1)
@@ -426,7 +428,7 @@ public void ManagedToJavaTypeMapping ()
 			Assert.AreEqual (null, m, "`JnienvTest` does *not* subclass Java.Lang.Object, it should *not* be in the typemap!");
 		}
 
-		[Test]
+		[Test, Category ("GCBridge")]
 		public void DoNotLeakWeakReferences ()
 		{
 			GC.Collect ();
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Lang/ObjectTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Java.Lang/ObjectTest.cs
@@ -66,6 +66,7 @@ static MethodInfo MakeGenericMethod (MethodInfo method, Type type) =>
 		}
 
 		[Test]
+		[Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069
 		public void JnienvCreateInstance_RegistersMultipleInstances ()
 		{
 			using (var adapter = new CreateInstance_OverrideAbsListView_Adapter (Application.Context)) {
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Mono.Android-Tests/Mono.Android.NET-Tests.csproj
@@ -22,13 +22,17 @@
     <WarningsAsErrors>IL2037</WarningsAsErrors>
     <AndroidUseNegotiateAuthentication>true</AndroidUseNegotiateAuthentication>
     <AndroidNdkDirectory></AndroidNdkDirectory>
+    <DefineConstants Condition=" '$(UseMonoRuntime)' == 'false' ">$(DefineConstants);CORECLR</DefineConstants>
+    <DefineConstants Condition=" '$(PublishAot)' == 'true' ">$(DefineConstants);NATIVEAOT</DefineConstants>
     <!--
       TODO: Fix excluded tests
       For $(EnableLLVM)
         InetAccess excluded: https://github.com/dotnet/runtime/issues/73304
         NetworkInterfaces excluded: https://github.com/dotnet/runtime/issues/75155
     -->
     <ExcludeCategories>DotNetIgnore</ExcludeCategories>
+    <!-- TODO: https://github.com/dotnet/android/issues/10069 -->
+    <ExcludeCategories Condition=" '$(UseMonoRuntime)' == 'false' ">$(ExcludeCategories):CoreCLRIgnore:SSL:NTLM:GCBridge:RuntimeConfig</ExcludeCategories>
     <!-- FIXME: LLVMIgnore https://github.com/dotnet/runtime/issues/89190 -->
     <ExcludeCategories Condition=" '$(EnableLLVM)' == 'true' ">$(ExcludeCategories):LLVMIgnore</ExcludeCategories>
     <ExcludeCategories Condition=" '$(EnableLLVM)' == 'true' ">$(ExcludeCategories):InetAccess:NetworkInterfaces</ExcludeCategories>
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/System.Net/SslTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/System.Net/SslTest.cs
@@ -9,8 +9,8 @@
 using NUnit.Framework;
 
 namespace System.NetTests {
-
-	[TestFixture, Category ("InetAccess")]
+	// TODO: https://github.com/dotnet/android/issues/10069
+	[TestFixture, Category ("InetAccess"), Category ("SSL")]
 	public class SslTest
 	{
 		bool ShouldIgnoreException (WebException wex)
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/System/AppContextTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/System/AppContextTests.cs
@@ -6,6 +6,7 @@
 namespace SystemTests
 {
 	[TestFixture]
+	[Category ("RuntimeConfig")] //TODO: https://github.com/dotnet/android/issues/10069
 	public class AppContextTests
 	{
 		static readonly object [] GetDataSource = new object [] {
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/System/ExceptionTest.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/System/ExceptionTest.cs
@@ -29,6 +29,7 @@ static Java.Lang.Throwable CreateJavaProxyThrowable (Exception e)
 		}
 
 		[Test]
+		[Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069
 		[RequiresUnreferencedCode ("Tests trimming unsafe features")]
 		public void InnerExceptionIsSet ()
 		{
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidClientHandlerTests.cs
@@ -46,6 +46,7 @@
 
 namespace Xamarin.Android.NetTests {
 	[Category("InetAccess")]
+	[Category ("SSL")] // TODO: https://github.com/dotnet/android/issues/10069
 	public abstract class HttpClientHandlerTestBase
 	{
 		protected abstract HttpMessageHandler CreateHandler ();
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerNegotiateAuthenticationTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerNegotiateAuthenticationTests.cs
@@ -13,7 +13,7 @@ namespace Xamarin.Android.NetTests {
 	// Important: We expect the Negotiate authentication feature to be enabled in all of these tests because we set $(AndroidUseNegotiateAuthentication)=true
 	// in the Mono.Android.NET-Tests.csproj file.
 	[TestFixture]
-	[Category ("InetAccess")]
+	[Category ("InetAccess"), Category ("NTLM")] // TODO: https://github.com/dotnet/android/issues/10069
 	public sealed class AndroidMessageHandlerNegotiateAuthenticationTests
 	{
 		// Negotiate authentication is available for Android since .NET 7
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerTests.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerTests.cs
@@ -14,6 +14,7 @@
 namespace Xamarin.Android.NetTests
 {
 	[TestFixture]
+	[Category ("SSL")] // TODO: https://github.com/dotnet/android/issues/10069
 	public class AndroidMessageHandlerTests : AndroidHandlerTestBase
 	{
 		protected override HttpMessageHandler CreateHandler ()
diff --git a/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs b/tests/Mono.Android-Tests/Mono.Android-Tests/Xamarin.Android.RuntimeTests/NUnitInstrumentation.cs
@@ -30,13 +30,17 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)
         protected override IList<TestAssemblyInfo> GetTestAssemblies()
         {
             Assembly asm = Assembly.GetExecutingAssembly();
+            #if !NATIVEAOT && !CORECLR // TODO: Java.Interop-Tests not passing yet
             Assembly ji  = typeof (Java.InteropTests.JavaInterop_Tests_Reference).Assembly;
+            #endif
 
 
             return new List<TestAssemblyInfo>()
             {
                 new TestAssemblyInfo (asm, asm.Location ?? String.Empty),
+                #if !NATIVEAOT && !CORECLR
                 new TestAssemblyInfo (ji, ji.Location ?? String.Empty),
+                #endif
             };
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,7 @@ public void SetField_PermitNullValues ()`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`[Test]`
	`242`	`+ [Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069`
`242`	`243`	`public void CreateTypeWithExportedMethods ()`
`243`	`244`	`{`
`244`	`245`	`using (var e = new ContainsExportedMethods ()) {`
`@@ -251,6 +252,7 @@ public void CreateTypeWithExportedMethods ()`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`[Test]`
	`255`	`+ [Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069`
`254`	`256`	`public void ActivatedDirectObjectSubclassesShouldBeRegistered ()`
`255`	`257`	`{`
`256`	`258`	`if (Build.VERSION.SdkInt <= BuildVersionCodes.GingerbreadMr1)`
`@@ -426,7 +428,7 @@ public void ManagedToJavaTypeMapping ()`
`426`	`428`	Assert.AreEqual (null, m, "`JnienvTest` does not subclass Java.Lang.Object, it should not be in the typemap!");
`427`	`429`	`}`
`428`	`430`
`429`		`- [Test]`
	`431`	`+ [Test, Category ("GCBridge")]`
`430`	`432`	`public void DoNotLeakWeakReferences ()`
`431`	`433`	`{`
`432`	`434`	`GC.Collect ();`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ static MethodInfo MakeGenericMethod (MethodInfo method, Type type) =>`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Test]`
	`69`	`+ [Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069`
`69`	`70`	`public void JnienvCreateInstance_RegistersMultipleInstances ()`
`70`	`71`	`{`
`71`	`72`	`using (var adapter = new CreateInstance_OverrideAbsListView_Adapter (Application.Context)) {`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`namespace SystemTests`
`7`	`7`	`{`
`8`	`8`	`[TestFixture]`
	`9`	`+ [Category ("RuntimeConfig")] //TODO: https://github.com/dotnet/android/issues/10069`
`9`	`10`	`public class AppContextTests`
`10`	`11`	`{`
`11`	`12`	`static readonly object [] GetDataSource = new object [] {`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ static Java.Lang.Throwable CreateJavaProxyThrowable (Exception e)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`[Test]`
	`32`	`+ [Category ("CoreCLRIgnore")] //TODO: https://github.com/dotnet/android/issues/10069`
`32`	`33`	`[RequiresUnreferencedCode ("Tests trimming unsafe features")]`
`33`	`34`	`public void InnerExceptionIsSet ()`
`34`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`
`47`	`47`	`namespace Xamarin.Android.NetTests {`
`48`	`48`	`[Category("InetAccess")]`
	`49`	`+ [Category ("SSL")] // TODO: https://github.com/dotnet/android/issues/10069`
`49`	`50`	`public abstract class HttpClientHandlerTestBase`
`50`	`51`	`{`
`51`	`52`	`protected abstract HttpMessageHandler CreateHandler ();`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace Xamarin.Android.NetTests {`
`13`	`13`	`// Important: We expect the Negotiate authentication feature to be enabled in all of these tests because we set $(AndroidUseNegotiateAuthentication)=true`
`14`	`14`	`// in the Mono.Android.NET-Tests.csproj file.`
`15`	`15`	`[TestFixture]`
`16`		`- [Category ("InetAccess")]`
	`16`	`+ [Category ("InetAccess"), Category ("NTLM")] // TODO: https://github.com/dotnet/android/issues/10069`
`17`	`17`	`public sealed class AndroidMessageHandlerNegotiateAuthenticationTests`
`18`	`18`	`{`
`19`	`19`	`// Negotiate authentication is available for Android since .NET 7`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`namespace Xamarin.Android.NetTests`
`15`	`15`	`{`
`16`	`16`	`[TestFixture]`
	`17`	`+ [Category ("SSL")] // TODO: https://github.com/dotnet/android/issues/10069`
`17`	`18`	`public class AndroidMessageHandlerTests : AndroidHandlerTestBase`
`18`	`19`	`{`
`19`	`20`	`protected override HttpMessageHandler CreateHandler ()`
Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,17 @@ protected NUnitInstrumentation(IntPtr handle, JniHandleOwnership transfer)`
`30`	`30`	`protected override IList<TestAssemblyInfo> GetTestAssemblies()`
`31`	`31`	`{`
`32`	`32`	`Assembly asm = Assembly.GetExecutingAssembly();`
	`33`	`+ #if !NATIVEAOT && !CORECLR // TODO: Java.Interop-Tests not passing yet`
`33`	`34`	`Assembly ji = typeof (Java.InteropTests.JavaInterop_Tests_Reference).Assembly;`
	`35`	`+ #endif`
`34`	`36`
`35`	`37`
`36`	`38`	`return new List<TestAssemblyInfo>()`
`37`	`39`	`{`
`38`	`40`	`new TestAssemblyInfo (asm, asm.Location ?? String.Empty),`
	`41`	`+ #if !NATIVEAOT && !CORECLR`
`39`	`42`	`new TestAssemblyInfo (ji, ji.Location ?? String.Empty),`
	`43`	`+ #endif`
`40`	`44`	`};`
`41`	`45`	`}`
`42`	`46`	`}`