fix up a test

dotnet · Jul 4, 2023 · fa7ff51 · fa7ff51
1 parent d8911bf
commit fa7ff51
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
@@ -995,14 +995,14 @@ public void AndroidLibraryProjectsZipWithOddPaths ()
  /*buildToolsVersion*/ "24.0.1",
  /*JavaVersion*/ "1.7.0_101",
  /*latestSupportedJavaVersion*/ "1.8.0",
- /*expectedResult*/ false,
+ /*expectedResult*/ true,
  },
  new object [] {
  /*targetFrameworkVersion*/ "v7.1",
  /*buildToolsVersion*/ "24.0.1",
  /*JavaVersion*/ "1.6.0_101",
  /*latestSupportedJavaVersion*/ "1.8.0",
- /*expectedResult*/ false,
+ /*expectedResult*/ true,
  },
  new object [] {
  /*targetFrameworkVersion*/ "v6.0",
@@ -1023,7 +1023,7 @@ public void AndroidLibraryProjectsZipWithOddPaths ()
  /*buildToolsVersion*/ "24.0.0",
  /*JavaVersion*/ "1.6.0_101",
  /*latestSupportedJavaVersion*/ "1.8.0",
- /*expectedResult*/ false,
+ /*expectedResult*/ true,
  },
  new object [] {
  /*targetFrameworkVersion*/ "v5.0",
@@ -1051,7 +1051,7 @@ public void AndroidLibraryProjectsZipWithOddPaths ()
  /*buildToolsVersion*/ "24.0.1",
  /*JavaVersion*/ "1.6.0_101",
  /*latestSupportedJavaVersion*/ "1.8.0",
- /*expectedResult*/ false,
+ /*expectedResult*/ true,
  },
  new object [] {
  /*targetFrameworkVersion*/ "v7.1",
@@ -1065,14 +1065,13 @@ public void AndroidLibraryProjectsZipWithOddPaths ()
  /*buildToolsVersion*/ "24.0.1",
  /*JavaVersion*/ "9.0.4",
  /*latestSupportedJavaVersion*/ "1.8.0",
- /*expectedResult*/ false,
+ /*expectedResult*/ true,
  },
  };
 #pragma warning restore 414
 
  [Test]
  [TestCaseSource (nameof (validateJavaVersionTestCases))]
- [Category ("DotNetIgnore")] // n/a under .NET 5+
  public void ValidateJavaVersion (string targetFrameworkVersion, string buildToolsVersion, string javaVersion, string latestSupportedJavaVersion, bool expectedResult)
  {
  var path = Path.Combine ("temp", $"ValidateJavaVersion_{targetFrameworkVersion}_{buildToolsVersion}_{latestSupportedJavaVersion}_{javaVersion}");
@@ -1089,7 +1088,7 @@ public void ValidateJavaVersion (string targetFrameworkVersion, string buildTool
  //if (!Directory.Exists (Path.Combine (TestEnvironment.MonoAndroidFrameworkDirectory, targetFrameworkVersion)))
  // Assert.Ignore ("This is a Pull Request Build. Ignoring test.");
  builder.ThrowOnBuildFailure = false;
- builder.Target = "_SetLatestTargetFrameworkVersion";
+ builder.Target = "_ResolveSdks";
  Assert.AreEqual (expectedResult, builder.Build (proj, parameters: new string[] {
  $"JavaSdkDirectory={javaPath}",
  $"JavaToolExe={javaExe}",