Add a couple of tests

Author: grendello

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

@@ -796,5 +796,46 @@ void CreateEmptyFile (string path)
 			}
 		}
 
+		[Test]
+		[TestCase (false)]
+		[TestCase (true)]
+		public void CheckEmbeddedAssemblyStorePackaging (bool useCLR)
+		{
+			var proj = new XamarinAndroidApplicationProject {
+				IsRelease = true
+			};
+
+			AndroidTargetArch[] supportedArches = new[] {
+				AndroidTargetArch.Arm64,
+				AndroidTargetArch.X86_64,
+			};
+
+			proj.SetRuntimeIdentifiers (supportedArches);
+			proj.SetProperty ("AndroidUseAssemblyStore", "true");
+			proj.SetProperty ("_AndroidEmbedAssemblyStoreInRuntime", "true");
+			proj.SetProperty ("UseMonoRuntime", useCLR ? "false" : "true");
+
+			using var b = CreateApkBuilder ();
+			Assert.IsTrue (b.Build (proj), "build should have succeeded.");
+			string apk = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.PackageName}-Signed.apk");
+
+			var knownAssemblyStoreFiles = new HashSet<string> (StringComparer.Ordinal);
+			foreach (AndroidTargetArch arch in supportedArches) {
+				string archName = MonoAndroidHelper.ArchToAbi (arch);
+				knownAssemblyStoreFiles.Add ($"lib/{archName}/libassemblies.{archName}.blob.so");
+			}
+
+			var foundAssemblyStoreFiles = new HashSet<string> (StringComparer.Ordinal);
+			using var zip = ZipHelper.OpenZip (apk);
+
+			foreach (var entry in zip) {
+				if (knownAssemblyStoreFiles.Contains (entry.FullName)) {
+					foundAssemblyStoreFiles.Add (entry.FullName);
+				}
+			}
+
+			Assert.IsFalse (foundAssemblyStoreFiles.Count != 0, $"APK should not contain any of the files: {FoundFiles ()}");
+			string FoundFiles () => String.Join (", ", foundAssemblyStoreFiles);
+		}
 	}
 }

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

@@ -1380,5 +1380,26 @@ public void AppStartsWithManagedMarshalMethodsLookupEnabled ()
 				Path.Combine (Root, builder.ProjectDirectory, "logcat.log"), 30);
 			Assert.IsTrue (didLaunch, "Activity should have started.");
 		}
+
+		[Test]
+		[TestCase (false)]
+		[TestCase (true)]
+		public void AppStartsWithEmbeddedAssemblyStore (bool useCLR)
+		{
+			var proj = new XamarinAndroidApplicationProject { IsRelease = true };
+			proj.SetProperty ("_AndroidEmbedAssemblyStoreInRuntime", "true");
+			proj.SetProperty ("UseMonoRuntime", useCLR ? "false" : "true");
+
+			using var builder = CreateApkBuilder ();
+			builder.Save (proj);
+
+			var dotnet = new DotNetCLI (Path.Combine (Root, builder.ProjectDirectory, proj.ProjectFilePath));
+			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
+			Assert.IsTrue (dotnet.Run (), "`dotnet run --no-build` should succeed");
+
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
+				Path.Combine (Root, builder.ProjectDirectory, "logcat.log"), 30);
+			Assert.IsTrue (didLaunch, "Activity should have started.");
+		}
 	}
 }