Move test to MSBuildDeviceIntegration

Author: dellis1972

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

@@ -643,48 +643,6 @@ public void NothingToBind (string classParser)
 			}
 		}
 
-		[Test]
-		public void AppWithAndroidJavaSource ()
-		{
-			var path = Path.Combine ("temp", TestName);
-			var proj = new XamarinAndroidApplicationProject {
-				OtherBuildItems = {
-					new AndroidItem.AndroidJavaSource ("TestJavaClass.java") {
-						Encoding = Encoding.ASCII,
-						TextContent = () => @"package com.test.java;
-
-public class TestJavaClass {
-
-	public String test(){
-		
-		return ""Java is called"";
-	}
-}",
-						Metadata = {
-							{ "Bind", "True" },
-						},
-					},
-				}
-			};
-			using (var b = CreateApkBuilder ()) {
-				b.ThrowOnBuildFailure = false;
-				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
-				b.AssertHasNoWarnings ();
-				var generatedCode = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath,
-					"generated", "src", "Com.Test.Java.TestJavaClass.cs");
-				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have been generated.");
-				Assert.IsTrue (b.DesignTimeBuild (proj, target: "UpdateGeneratedFiles"), "DTB should have succeeded.");
-				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings", defaultIfNotUsed: true), $"`_ClearGeneratedManagedBindings` should be skipped on DTB build!");
-				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on DTB build.");
-				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "Second build should have succeeded.");
-				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on second build.");
-				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings"), $"`_ClearGeneratedManagedBindings` should be skipped on second build!");
-				Assert.IsTrue (b.Install (proj, doNotCleanupOnUpdate: true, saveProject: false), "Install build should have succeeded.");
-				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on Install build.");
-				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings"), $"`_ClearGeneratedManagedBindings` should be skipped on Install build!");
-			}
-		}
-
 		[Test]
 		public void BindingWithAndroidJavaSource ()
 		{

tests/MSBuildDeviceIntegration/Tests/InstallTests.cs

@@ -610,5 +610,48 @@ public void AdbTargetChangesAppBundle ()
 			var after = File.GetLastWriteTimeUtc (apkset);
 			Assert.AreNotEqual (before, after, $"{apkset} should change!");
 		}
+
+		[Test]
+		public void AppWithAndroidJavaSource ()
+		{
+			var path = Path.Combine ("temp", TestName);
+			var proj = new XamarinAndroidApplicationProject {
+				OtherBuildItems = {
+					new AndroidItem.AndroidJavaSource ("TestJavaClass.java") {
+						Encoding = Encoding.ASCII,
+						TextContent = () => @"package com.test.java;
+
+public class TestJavaClass {
+
+	public String test(){
+		
+		return ""Java is called"";
+	}
+}",
+						Metadata = {
+							{ "Bind", "True" },
+						},
+					},
+				}
+			};
+			using (var b = CreateApkBuilder ()) {
+				b.ThrowOnBuildFailure = false;
+				Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
+				b.AssertHasNoWarnings ();
+				var generatedCode = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath,
+					"generated", "src", "Com.Test.Java.TestJavaClass.cs");
+				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have been generated.");
+				Assert.IsTrue (b.DesignTimeBuild (proj, target: "UpdateGeneratedFiles"), "DTB should have succeeded.");
+				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings", defaultIfNotUsed: true), $"`_ClearGeneratedManagedBindings` should be skipped on DTB build!");
+				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on DTB build.");
+				Assert.IsTrue (b.Build (proj, doNotCleanupOnUpdate: true, saveProject: false), "Second build should have succeeded.");
+				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on second build.");
+				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings"), $"`_ClearGeneratedManagedBindings` should be skipped on second build!");
+				// Call Install directly so Build does not get called automatically
+				Assert.IsTrue (b.RunTarget (proj, "Install", doNotCleanupOnUpdate: true, saveProject: false), "Install build should have succeeded.");
+				FileAssert.Exists (generatedCode, $"'{generatedCode}' should have not be deleted on Install build.");
+				Assert.IsTrue (b.Output.IsTargetSkipped ("_ClearGeneratedManagedBindings", defaultIfNotUsed: true), $"`_ClearGeneratedManagedBindings` should be skipped on Install build!");
+			}
+		}
 	}
 }