[tests] Remove XASdkDeployTests

Most of our time intensive tests are in deploy and debug scenarios, and
we have some duplication there that can be cleaned up.

The `XASdkDeployTests` class has been removed, and non duplicated tests
from this class have been moved into `InstallAndRunTests`.

The `DotNetInstallAndRun` tests have been paired down to two tests for
`net7.0-android` Debug and Release.  The other permutations should be
covered by existing install and run tests.

The `DotNetDebug` tests have been removed, as they were effectively
duplicates of `ApplicationRunsWithDebuggerAndBreaks`.

The `Debugger` tests have had their connection settings adjusted to try
fewer times to connect but wait longer in between attempts.  We will now
only wait for up to 7 minutes to connect rather than ~17 minutes.

Author: pjcollins

tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs

@@ -242,7 +242,8 @@ public override void OnCreate ()
 					int port = rnd.Next (10000, 20000);
 					TestContext.Out.WriteLine ($"{port}");
 					var args = new SoftDebuggerConnectArgs ("", IPAddress.Loopback, port) {
-						MaxConnectionAttempts = 2000, // we need a long delay here to get a reliable connection
+						MaxConnectionAttempts = 210, // we need a long delay here to get a reliable connection
+						TimeBetweenConnectionAttempts = 2000,
 					};
 					var startInfo = new SoftDebuggerStartInfo (args) {
 						WorkingDirectory = Path.Combine (b.ProjectDirectory, proj.IntermediateOutputPath, "android", "assets"),
@@ -359,7 +360,7 @@ public override void OnCreate ()
 		};
 #pragma warning restore 414
 
-		[Test, Category ("Debugger")]
+		[Test, Category ("Debugger"), Category ("WearOS")]
 		[TestCaseSource (nameof(DebuggerTestCases))]
 		[Retry (5)]
 		public void ApplicationRunsWithDebuggerAndBreaks (bool embedAssemblies, string fastDevType, bool allowDeltaInstall, string username, string packageFormat)
@@ -465,7 +466,8 @@ public Foo ()
 					int port = rnd.Next (10000, 20000);
 					TestContext.Out.WriteLine ($"{port}");
 					var args = new SoftDebuggerConnectArgs ("", IPAddress.Loopback, port) {
-						MaxConnectionAttempts = 2000,
+						MaxConnectionAttempts = 210,
+						TimeBetweenConnectionAttempts = 2000,
 					};
 					var startInfo = new SoftDebuggerStartInfo (args) {
 						WorkingDirectory = Path.Combine (appBuilder.ProjectDirectory, app.IntermediateOutputPath, "android", "assets"),

tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using System.Xml.XPath;
@@ -11,7 +12,7 @@
 namespace Xamarin.Android.Build.Tests
 {
 	[TestFixture]
-	[Category ("UsesDevice")]
+	[Category ("UsesDevice"), Category ("WearOS")]
 	public class InstallAndRunTests : DeviceTest
 	{
 		static ProjectBuilder builder;
@@ -1137,5 +1138,105 @@ public void CheckResouceIsOverridden ([Values (true, false)] bool useAapt2)
 			}
 		}
 
+		public void DotNetInstallAndRunPreviousSdk ([Values (false, true)] bool isRelease)
+		{
+			XamarinAndroidApplicationProject proj;
+				proj = new XamarinFormsAndroidApplicationProject {
+					TargetFramework = "net7.0-android",
+					IsRelease = isRelease,
+					EnableDefaultItems = true,
+				};
+
+			var builder = CreateApkBuilder ();
+			Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
+			RunProjectAndAssert (proj, builder);
+
+			WaitForPermissionActivity (Path.Combine (Root, builder.ProjectDirectory, "permission-logcat.log"));
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
+				Path.Combine (Root, builder.ProjectDirectory, "logcat.log"), 30);
+			Assert.IsTrue(didLaunch, "Activity should have started.");
+		}
+
+		[Test]
+		public void TypeAndMemberRemapping ([Values (false, true)] bool isRelease)
+		{
+			var proj = new XamarinAndroidApplicationProject () {
+				IsRelease = isRelease,
+				EnableDefaultItems = true,
+				OtherBuildItems = {
+					new AndroidItem._AndroidRemapMembers ("RemapActivity.xml") {
+						Encoding = Encoding.UTF8,
+						TextContent = () => ResourceData.RemapActivityXml,
+					},
+					new AndroidItem.AndroidJavaSource ("RemapActivity.java") {
+						Encoding = new UTF8Encoding (encoderShouldEmitUTF8Identifier: false),
+						TextContent = () => ResourceData.RemapActivityJava,
+						Metadata = {
+							{ "Bind", "True" },
+						},
+					},
+				},
+			};
+			proj.MainActivity = proj.DefaultMainActivity.Replace (": Activity", ": global::Example.RemapActivity");
+			var builder = CreateApkBuilder ();
+			Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
+			RunProjectAndAssert (proj, builder);
+			var appStartupLogcatFile = Path.Combine (Root, builder.ProjectDirectory, "logcat.log");
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity", appStartupLogcatFile);
+			Assert.IsTrue (didLaunch, "MainActivity should have launched!");
+			var logcatOutput = File.ReadAllText (appStartupLogcatFile);
+
+			StringAssert.Contains (
+					"RemapActivity.onMyCreate() invoked!",
+					logcatOutput,
+					"Activity.onCreate() wasn't remapped to RemapActivity.onMyCreate()!"
+			);
+			StringAssert.Contains (
+					"ViewHelper.mySetOnClickListener() invoked!",
+					logcatOutput,
+					"View.setOnClickListener() wasn't remapped to ViewHelper.mySetOnClickListener()!"
+			);
+		}
+
+		[Test]
+		public void SupportDesugaringStaticInterfaceMethods ()
+		{
+			var proj = new XamarinAndroidApplicationProject () {
+				IsRelease = true,
+				EnableDefaultItems = true,
+				OtherBuildItems = {
+					new AndroidItem.AndroidJavaSource ("StaticMethodsInterface.java") {
+						Encoding = new UTF8Encoding (encoderShouldEmitUTF8Identifier: false),
+						TextContent = () => ResourceData.IdmStaticMethodsInterface,
+						Metadata = {
+							{ "Bind", "True" },
+						},
+					},
+				},
+			};
+
+			// Note: To properly test, Desugaring must be *enabled*, which requires that
+			// `$(SupportedOSPlatformVersion)` be *less than* 23.  21 is currently the default,
+			// but set this explicitly anyway just so that this implicit requirement is explicit.
+			proj.SupportedOSPlatformVersion = "21";
+
+			proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", @"
+		Console.WriteLine ($""# jonp static interface default method invocation; IStaticMethodsInterface.Value={Example.IStaticMethodsInterface.Value}"");
+");
+			var builder = CreateApkBuilder ();
+			Assert.IsTrue (builder.Build (proj), "`dotnet build` should succeed");
+			RunProjectAndAssert (proj, builder);
+			var appStartupLogcatFile = Path.Combine (Root, builder.ProjectDirectory, "logcat.log");
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity", appStartupLogcatFile);
+			Assert.IsTrue (didLaunch, "MainActivity should have launched!");
+			var logcatOutput = File.ReadAllText (appStartupLogcatFile);
+
+			StringAssert.Contains (
+					"IStaticMethodsInterface.Value=3",
+					logcatOutput,
+					"Was IStaticMethodsInterface.Value executed?"
+			);
+		}
+
 	}
 }