Fix remaining unit tests?

Move `TypeAndMemberRemapping()` *earlier* in the file.
`DotNetInstallAndRun()` appears in the **Tests** tab, but
`TypeAndMemberRemapping()` was not, which was very confusing.
On a lark, suspect that `TypeAndMemberRemapping()` isn't run
because it's after `DotNetDebug()`, which is `[Category("Debugger")]`.
Will moving the test fix things?

Fix Mono.Android.NET-Tests, via removing a debug message from
AndroidRuntime, and test fixes within external/Java.Interop.

Author: jonpryor

external/Java.Interop

@@ -310,8 +310,8 @@ protected override IEnumerable<string> GetSimpleReferences (Type type)
 			if (JNIEnv.ReplacementTypes == null) {
 				return null;
 			}
-			Logger.Log (LogLevel.Warn, "*jonp*", $"# jonp: looking for replacement type for `{jniSimpleReference}`");
-			Logger.Log (LogLevel.Warn, "*jonp*", new System.Diagnostics.StackTrace (true).ToString ());
+			Logger.Log (LogLevel.Warn, "*jonp*", $"# jonp: looking for replacement type for `{jniSimpleReference}`; ReplacementTypes? {JNIEnv.ReplacementTypes != null}");
+			// Logger.Log (LogLevel.Warn, "*jonp*", new System.Diagnostics.StackTrace (true).ToString ());
 			if (JNIEnv.ReplacementTypes.TryGetValue (jniSimpleReference, out var v)) {
 				Logger.Log (LogLevel.Warn, "*jonp*", $"# jonp: found replacement type: `{jniSimpleReference}` => `{v}`");
 				return v;

src/Mono.Android/Android.Runtime/AndroidRuntime.cs

@@ -84,6 +84,57 @@ public void DotNetInstallAndRun (bool isRelease, bool xamarinForms, bool? publis
 			Assert.IsTrue(didLaunch, "Activity should have started.");
 		}
 
+		[Test]
+		public void TypeAndMemberRemapping ([Values (false, true)] bool isRelease)
+		{
+			AssertHasDevices ();
+
+			var proj = new XASdkProject () {
+				IsRelease = isRelease,
+				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");
+			proj.SetRuntimeIdentifier (DeviceAbi);
+			var relativeProjDir = Path.Combine ("temp", TestName);
+			var fullProjDir     = Path.Combine (Root, relativeProjDir);
+			TestOutputDirectories [TestContext.CurrentContext.Test.ID] = fullProjDir;
+			var files = proj.Save ();
+			proj.Populate (relativeProjDir, files);
+			proj.CopyNuGetConfig (relativeProjDir);
+			var dotnet = new DotNetCLI (proj, Path.Combine (fullProjDir, proj.ProjectFilePath));
+
+			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
+			Assert.IsTrue (dotnet.Run (), "`dotnet run` should succeed");
+
+			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
+				Path.Combine (fullProjDir, "logcat.log"));
+			Assert.IsTrue (didLaunch, "MainActivity should have launched!");
+			var logcatOutput = File.ReadAllText (Path.Combine (fullProjDir, "logcat.log"));
+
+			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]
 		[Category ("Debugger"), Category ("Node-4")]
 		public void DotNetDebug ()
@@ -157,57 +208,6 @@ public void DotNetDebug ()
 			WaitFor (2000);
 			Assert.IsTrue (breakpointHit, "Should have a breakpoint");
 		}
-
-		[Test]
-		public void TypeAndMemberRemapping ([Values (false, true)] bool isRelease)
-		{
-			AssertHasDevices ();
-
-			var proj = new XASdkProject () {
-				IsRelease = isRelease,
-				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");
-			proj.SetRuntimeIdentifier (DeviceAbi);
-			var relativeProjDir = Path.Combine ("temp", TestName);
-			var fullProjDir     = Path.Combine (Root, relativeProjDir);
-			TestOutputDirectories [TestContext.CurrentContext.Test.ID] = fullProjDir;
-			var files = proj.Save ();
-			proj.Populate (relativeProjDir, files);
-			proj.CopyNuGetConfig (relativeProjDir);
-			var dotnet = new DotNetCLI (proj, Path.Combine (fullProjDir, proj.ProjectFilePath));
-
-			Assert.IsTrue (dotnet.Build (), "`dotnet build` should succeed");
-			Assert.IsTrue (dotnet.Run (), "`dotnet run` should succeed");
-
-			bool didLaunch = WaitForActivityToStart (proj.PackageName, "MainActivity",
-				Path.Combine (fullProjDir, "logcat.log"));
-			Assert.IsTrue (didLaunch, "MainActivity should have launched!");
-			var logcatOutput = File.ReadAllText (Path.Combine (fullProjDir, "logcat.log"));
-
-			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()!"
-			);
-		}
 	}
 }
 #endif

tests/MSBuildDeviceIntegration/Tests/XASdkDeployTests.cs

@@ -17,5 +17,11 @@
       source-type="java/lang/Runtime"
       source-method-name="remappedToGetRuntime"
       target-type="java/lang/Runtime"
-      target-method-name="getRuntime" target-method-instance-to-static="true" />
+      target-method-name="getRuntime" target-method-instance-to-static="false" />
+  <replace-method
+      source-type="com/xamarin/interop/RenameClassBase2"
+      source-method-name="hashCode"
+      source-method-signature="()"
+      target-type="com/xamarin/interop/RenameClassBase2"
+      target-method-name="myNewHashCode" target-method-instance-to-static="false" />
 </replacements>