Try to fix some tests

Author: grendello

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

@@ -84,6 +84,7 @@ public void CheckMonoDebugIsAddedToEnvironment ([Values ("", "Normal", "Offline"
 				IsRelease = true,
 			};
 			proj.SetProperty ("_AndroidSequencePointsMode", sequencePointsMode);
+			proj.SetProperty ("_AndroidEnableNativeRuntimeLinking", useNativeRuntimeLinkingMode.ToString ());
 			proj.SetAndroidSupportedAbis (supportedAbis);
 			using (var b = CreateApkBuilder ()) {
 				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

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

@@ -958,8 +958,29 @@ public void CasingOnJavaLangObject ()
 			}
 		}
 
+		static object[] GenerateJavaStubsAndAssemblyData () => new object[] {
+			new object[] {
+				true, // isRelease
+				true, // useNativeRuntimeLinkingMode
+			},
+
+			new object[] {
+				true, // isRelease
+				false, // useNativeRuntimeLinkingMode
+			},
+
+			new object[] {
+				false, // isRelease
+				false, // useNativeRuntimeLinkingMode
+			},
+
+			// Configuration for debug build and native runtime linking is not used, since
+			// runtime linking happens only in release builds
+		};
+
 		[Test]
-		public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
+		[TestCaseSource (nameof (GenerateJavaStubsAndAssemblyData))]
+		public void GenerateJavaStubsAndAssembly (bool isRelease, bool useNativeRuntimeLinkingMode)
 		{
 			var targets = new [] {
 				"_GenerateJavaStubs",
@@ -968,6 +989,7 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 			var proj = new XamarinAndroidApplicationProject {
 				IsRelease = isRelease,
 			};
+			proj.SetProperty ("_AndroidEnableNativeRuntimeLinking", useNativeRuntimeLinkingMode.ToString ());
 			proj.SetAndroidSupportedAbis ("armeabi-v7a");
 			proj.OtherBuildItems.Add (new AndroidItem.AndroidEnvironment ("Foo.txt") {
 				TextContent = () => "Foo=Bar",
@@ -978,7 +1000,7 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 				foreach (var target in targets) {
 					Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
 				}
-				AssertAssemblyFilesInFileWrites (proj, b);
+				AssertAssemblyFilesInFileWrites (proj, b, useNativeRuntimeLinkingMode);
 
 				// Change C# file and AndroidEvironment file
 				proj.MainActivity += Environment.NewLine + "// comment";
@@ -988,30 +1010,40 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
 				foreach (var target in targets) {
 					Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
 				}
-				AssertAssemblyFilesInFileWrites (proj, b);
+				AssertAssemblyFilesInFileWrites (proj, b, useNativeRuntimeLinkingMode);
 
 				// No changes
 				Assert.IsTrue (b.Build (proj), "third build should have succeeded.");
 				foreach (var target in targets) {
 					Assert.IsTrue (b.Output.IsTargetSkipped (target), $"`{target}` should be skipped!");
 				}
-				AssertAssemblyFilesInFileWrites (proj, b);
+				AssertAssemblyFilesInFileWrites (proj, b, useNativeRuntimeLinkingMode);
 			}
 		}
 
-		readonly string [] ExpectedAssemblyFiles = new [] {
-			Path.Combine ("android", "environment.armeabi-v7a.o"),
-			Path.Combine ("android", "environment.armeabi-v7a.ll"),
-			Path.Combine ("android", "typemaps.armeabi-v7a.o"),
-			Path.Combine ("android", "typemaps.armeabi-v7a.ll"),
-			Path.Combine ("app_shared_libraries", "armeabi-v7a", "libxamarin-app.so")
-		};
+		List<string> GetExpectedAssemblyFiles (bool useNativeRuntimeLinkingMode)
+		{
+			var ret = new List <string> {
+				Path.Combine ("android", "environment.armeabi-v7a.o"),
+				Path.Combine ("android", "environment.armeabi-v7a.ll"),
+				Path.Combine ("android", "typemaps.armeabi-v7a.o"),
+				Path.Combine ("android", "typemaps.armeabi-v7a.ll")
+			};
+
+			if (useNativeRuntimeLinkingMode) {
+				ret.Add (Path.Combine ("app_shared_libraries", "armeabi-v7a", "libmonodroid-unified.so"));
+			} else {
+				ret.Add (Path.Combine ("app_shared_libraries", "armeabi-v7a", "libxamarin-app.so"));
+			}
+
+			return ret;
+		}
 
-		void AssertAssemblyFilesInFileWrites (XamarinAndroidApplicationProject proj, ProjectBuilder b)
+		void AssertAssemblyFilesInFileWrites (XamarinAndroidApplicationProject proj, ProjectBuilder b, bool useNativeRuntimeLinkingMode)
 		{
 			var intermediate = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
 			var lines = File.ReadAllLines (Path.Combine (intermediate, $"{proj.ProjectName}.csproj.FileListAbsolute.txt"));
-			foreach (var file in ExpectedAssemblyFiles) {
+			foreach (var file in GetExpectedAssemblyFiles (useNativeRuntimeLinkingMode)) {
 				var path = Path.Combine (intermediate, file);
 				CollectionAssert.Contains (lines, path, $"{file} is not in FileWrites!");
 				FileAssert.Exists (path);

tests/MSBuildDeviceIntegration/Tests/BundleToolTests.cs

@@ -15,8 +15,23 @@ namespace Xamarin.Android.Build.Tests
 	public class BundleToolTests : DeviceTest
 	{
 		static readonly object[] FixtureArgs = {
-			new object[] { false },
-			new object[] { true },
+			new object[] {
+				false, // useAssemblyBlobs
+				false, // useNativeRuntimeLinkingMode
+			},
+
+			new object[] {
+				true,  // useAssemblyBlobs
+				false, // useNativeRuntimeLinkingMode
+			},
+
+			new object[] {
+				true,  // useAssemblyBlobs
+				true, // useNativeRuntimeLinkingMode
+			},
+
+			// There's no point in testing further combinations of the two parameters, the tests
+			// wouldn't actually differ.
 		};
 
 		static readonly string [] Abis = new [] { "armeabi-v7a", "arm64-v8a", "x86", "x86_64" };
@@ -26,6 +41,7 @@ public class BundleToolTests : DeviceTest
 		string intermediate;
 		string bin;
 		bool usesAssemblyBlobs;
+		bool useNativeRuntimeLinkingMode;
 
 		// Disable split by language
 		const string BuildConfig = @"{
@@ -46,9 +62,10 @@ public class BundleToolTests : DeviceTest
 	}
 }";
 
-		public BundleToolTests (bool usesAssemblyBlobs)
+		public BundleToolTests (bool usesAssemblyBlobs, bool useNativeRuntimeLinkingMode)
 		{
 			this.usesAssemblyBlobs = usesAssemblyBlobs;
+			this.useNativeRuntimeLinkingMode = useNativeRuntimeLinkingMode;
 		}
 
 		[OneTimeSetUp]
@@ -97,6 +114,7 @@ public void OneTimeSetUp ()
 			app.SetAndroidSupportedAbis (Abis);
 			app.SetProperty ("AndroidBundleConfigurationFile", "buildConfig.json");
 			app.SetProperty ("AndroidUseAssemblyStore", usesAssemblyBlobs.ToString ());
+			app.SetProperty ("_AndroidEnableNativeRuntimeLinking", useNativeRuntimeLinkingMode.ToString ());
 
 			libBuilder = CreateDllBuilder (Path.Combine (path, lib.ProjectName), cleanupOnDispose: true);
 			Assert.IsTrue (libBuilder.Build (lib), "Library build should have succeeded.");
@@ -136,7 +154,7 @@ string [] ListArchiveContents (string archive, bool usesAssembliesBlob)
 		}
 
 		[Test]
-		public void BaseZip ([Values(false, true)] bool useNativeRuntimeLinkingMode)
+		public void BaseZip ()
 		{
 			var baseZip = Path.Combine (intermediate, "android", "bin", "base.zip");
 			var contents = ListArchiveContents (baseZip, usesAssemblyBlobs);
@@ -197,7 +215,7 @@ public void BaseZip ([Values(false, true)] bool useNativeRuntimeLinkingMode)
 		}
 
 		[Test]
-		public void AppBundle ([Values(false, true)] bool useNativeRuntimeLinkingMode)
+		public void AppBundle ()
 		{
 			var aab = Path.Combine (intermediate, "android", "bin", $"{app.PackageName}.aab");
 			FileAssert.Exists (aab);