Enable more tests to run on all 3 runtimes, part 5

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AidlTest.cs

@@ -5,27 +5,33 @@
 using System.Linq;
 using Microsoft.Build.Framework;
 using System.Text;
+using Xamarin.Android.Tasks;
 
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
 	[Parallelizable (ParallelScope.Children)]
 	public class AidlTest : BaseTest
 	{
-		void TestAidl (string testName, string aidl)
+		void TestAidl (string testName, string aidl, AndroidRuntime runtime)
 		{
 			var proj = new XamarinAndroidApplicationProject () {
 				IsRelease = true,
 			};
+			proj.SetRuntime (runtime);
 			proj.OtherBuildItems.Add (new BuildItem (AndroidBuildActions.AndroidInterfaceDescription, "Test.aidl") { TextContent = () => aidl });
-			using (var p = CreateApkBuilder (testName)) {
+			using (var p = CreateApkBuilder (Path.Combine ("temp", testName))) {
 				Assert.IsTrue (p.Build (proj), "Build should have succeeded.");
 			}
 		}
 
 		[Test]
-		public void ListAndMap ()
+		public void ListAndMap ([Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
+				return;
+			}
+
 			string aidl = @"
 import android.os;
 import android.view;
@@ -36,12 +42,16 @@ interface Test {
 	void map(inout Map m);
 }
 ";
-			TestAidl ($"temp/AidlTest.{nameof (ListAndMap)}", aidl);
+			TestAidl (TestName, aidl, runtime);
 		}
 
 		[Test]
-		public void NamespaceResolution ()
+		public void NamespaceResolution ([Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
+				return;
+			}
+
 			string aidl = @"
 import android.os;
 import android.view;
@@ -50,12 +60,16 @@ public void NamespaceResolution ()
 interface Test {
 }
 ";
-			TestAidl ("temp/AidlTest.NamespaceResolution", aidl);
+			TestAidl (TestName, aidl, runtime);
 		}
 
 		[Test]
-		public void PrimitiveTypes ()
+		public void PrimitiveTypes ([Values] AndroidRuntime runtime)
 		{
+			if (IgnoreUnsupportedConfiguration (runtime, release: true)) {
+				return;
+			}
+
 			string aidl = @"
 package com.xamarin.test;
 interface Test {
@@ -71,18 +85,18 @@ interface Test {
 	double test8 (inout double [] args);
 	String test9 (inout String [] args);
 	// thought that it's missing 'short' ? It's not supported - http://stackoverflow.com/questions/6742167/android-aidl-support-short-type
-	
+
 	void test10 (in byte [] args);
 	void test11 (out byte [] args);
 	void test12 (inout byte [] args);
-	
+
 	int [] test20 ();
 	boolean [] test21 ();
 	byte [] test22 ();
 	String [] test23 ();
 }
 ";
-			TestAidl ("temp/AidlTest.PrimitiveTypes", aidl);
+			TestAidl (TestName, aidl, runtime);
 		}
 	}
 }

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs

@@ -19,8 +19,13 @@ public class AndroidDependenciesTests : BaseTest
 	{
 		[Test]
 		[NonParallelizable] // Do not run environment modifying tests in parallel.
-		public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] string manifestType)
+		public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] string manifestType, [Values] AndroidRuntime runtime)
 		{
+			bool isRelease = runtime == AndroidRuntime.NativeAOT;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			// Set to true when we are marking a new Android API level as stable, but it has not
 			// been added to the Xamarin manifest yet.
 			var xamarin_manifest_needs_updating = false;
@@ -39,7 +44,10 @@ public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] str
 					Directory.CreateDirectory (path);
 				}
 
-				var proj = new XamarinAndroidApplicationProject ();
+				var proj = new XamarinAndroidApplicationProject {
+					IsRelease = isRelease,
+				};
+				proj.SetRuntime (runtime);
 				var buildArgs = new List<string> {
 					"AcceptAndroidSDKLicenses=true",
 					$"AndroidManifestType={manifestType}",
@@ -117,14 +125,52 @@ static string GetCurrentPlatformToolsVersion ()
 			return $"{revision.Element ("major")?.Value}.{revision.Element ("minor")?.Value}.{revision.Element ("micro")?.Value}";
 		}
 
+		static IEnumerable<object[]> Get_GetDependencyNdkRequiredConditionsData ()
+		{
+			var ret = new List<object[]> ();
+
+			foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
+				AddTestData ("AotAssemblies", false, runtime);
+				AddTestData ("AndroidEnableProfiledAot", false, runtime);
+				AddTestData ("EnableLLVM", true, runtime);
+			}
+
+			return ret;
+
+			void AddTestData (string property, bool ndkRequired, AndroidRuntime runtime)
+			{
+				ret.Add (new object[] {
+					property,
+					ndkRequired,
+					runtime,
+				});
+			}
+		}
+
 		[Test]
-		[TestCase ("AotAssemblies", false)]
-		[TestCase ("AndroidEnableProfiledAot", false)]
-		[TestCase ("EnableLLVM", true)]
-		public void GetDependencyNdkRequiredConditions (string property, bool ndkRequired)
+		[TestCaseSource (nameof (Get_GetDependencyNdkRequiredConditionsData))]
+		public void GetDependencyNdkRequiredConditions (string property, bool ndkRequired, AndroidRuntime runtime)
 		{
-			var proj = new XamarinAndroidApplicationProject ();
-			proj.AotAssemblies = true;
+			bool isRelease = runtime == AndroidRuntime.NativeAOT;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
+			// CoreCLR doesn't support AOT so it doesn't ever need the NDK and it doesn't support profiled AOT
+			if (runtime == AndroidRuntime.CoreCLR && (ndkRequired || property == "AndroidEnableProfiledAot")) {
+				Assert.Ignore ("CoreCLR doesn't support AOT, it doesn't ever require the NDK");
+			}
+
+			// NativeAOT doesn't support profiled AOT
+			if (runtime == AndroidRuntime.NativeAOT && property == "AndroidEnableProfiledAot") {
+				Assert.Ignore ("NativeAOT doesn't support profiled AOT");
+			}
+
+			var proj = new XamarinAndroidApplicationProject {
+				IsRelease = isRelease,
+			};
+			proj.SetRuntime (runtime);
+			proj.AotAssemblies = runtime == AndroidRuntime.MonoVM;
 			proj.SetProperty (property, "true");
 			using (var builder = CreateApkBuilder ()) {
 				builder.Verbosity = LoggerVerbosity.Detailed;
@@ -143,18 +189,24 @@ public void GetDependencyNdkRequiredConditions (string property, bool ndkRequire
 		}
 
 		[Test]
-		public void GetDependencyWhenBuildToolsAreMissingTest ()
+		public void GetDependencyWhenBuildToolsAreMissingTest ([Values] AndroidRuntime runtime)
 		{
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			var apis = new ApiInfo [] {
 			};
 			var path = Path.Combine ("temp", TestName);
 			var androidSdkPath = CreateFauxAndroidSdkDirectory (Path.Combine (path, "android-sdk"),
 					null, apis);
 			var referencesPath = CreateFauxReferencesDirectory (Path.Combine (path, "xbuild-frameworks"), apis);
 			var proj = new XamarinAndroidApplicationProject () {
-				IsRelease = true,
+				IsRelease = isRelease,
 				TargetSdkVersion = "26",
 			};
+			proj.SetRuntime (runtime);
 			var parameters = new string [] {
 				$"TargetFrameworkRootPath={referencesPath}",
 				$"AndroidSdkDirectory={androidSdkPath}",
@@ -177,8 +229,13 @@ public void GetDependencyWhenBuildToolsAreMissingTest ()
 		}
 
 		[Test]
-		public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool createSdkDirectory, [Values (true, false)] bool installJavaDeps)
+		public void GetDependencyWhenSDKIsMissingTest ([Values] bool createSdkDirectory, [Values] bool installJavaDeps, [Values] AndroidRuntime runtime)
 		{
+			const bool isRelease = true;
+			if (IgnoreUnsupportedConfiguration (runtime, release: isRelease)) {
+				return;
+			}
+
 			var apis = new ApiInfo [] {
 			};
 			var path = Path.Combine ("temp", TestName);
@@ -189,7 +246,7 @@ public void GetDependencyWhenSDKIsMissingTest ([Values (true, false)] bool creat
 				Directory.Delete (androidSdkPath, recursive: true);
 			var referencesPath = CreateFauxReferencesDirectory (Path.Combine (path, "xbuild-frameworks"), apis);
 			var proj = new XamarinAndroidApplicationProject () {
-				IsRelease = true,
+				IsRelease = isRelease,
 				TargetSdkVersion = "26",
 			};
 			var requestedJdkVersion = "17.0.8.1";