Skip to content

Fix debugging task test SDK state leak #12603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 3 commits into from
Sep 1, 2026
+20 −4
Merged

Fix debugging task test SDK state leak #12603

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f37f9e7
Isolate debugging task SDK state
jonathanpeppers Aug 31, 2026
1b060dc
Minimize debugging task state cleanup
jonathanpeppers Aug 31, 2026
ffdb038
Narrow test cleanup to task execution
jonathanpeppers Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/DebuggingTasksTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Xamarin.Android.Build;
using Xamarin.Android.Tasks;
using Xamarin.ProjectTools;
using AT = Xamarin.AndroidTools;

namespace Xamarin.Android.Build.Tests
{
Expand Down Expand Up @@ -55,16 +56,31 @@ public void TestResolveToolsExists ()
TestEnvironment.MonoAndroidFrameworkDirectory,
},
};
Assert.True (task.Execute (), "Task should have completed successfully.");
Assert.AreEqual (0, errors.Count, "No Errors should have been raised");
// ResolveXamarinAndroidTools replaces process-wide AndroidSdk state and updates JAVA_HOME/PATH on Windows.
var javaHome = Environment.GetEnvironmentVariable ("JAVA_HOME");
var environmentPath = Environment.GetEnvironmentVariable ("PATH");
var actualAndroidSdk = AndroidSdkPath;
var actualAndroidNdk = AndroidNdkPath;
var actualJavaSdk = AndroidSdkResolver.GetJavaSdkPath ();
List<string> firstTaskExecMessages;

try {
Assert.True (task.Execute (), "Task should have completed successfully.");
Assert.AreEqual (0, errors.Count, "No Errors should have been raised");
firstTaskExecMessages = messages.Select (x => x.Message)?.ToList ();
Assert.True (task.Execute (), "Task should have completed successfully.");
} finally {
AT.AndroidSdk.Refresh (actualAndroidSdk, actualAndroidNdk, actualJavaSdk);
Environment.SetEnvironmentVariable ("JAVA_HOME", javaHome);
Environment.SetEnvironmentVariable ("PATH", environmentPath);
}

var expected = $" Found FrameworkPath at {Path.GetFullPath (frameworksPath)}";
var firstTaskExecMessages = messages.Select (x => x.Message)?.ToList ();
Assert.IsNotNull (firstTaskExecMessages, "First execution did not contain any messages!");
CollectionAssert.Contains (firstTaskExecMessages, expected);
CollectionAssert.DoesNotContain (firstTaskExecMessages, " Using cached AndroidSdk values");
CollectionAssert.DoesNotContain (firstTaskExecMessages, " Using cached MonoDroidSdk values");

Assert.True (task.Execute (), "Task should have completed successfully.");
Assert.AreEqual (0, errors.Count, "No Errors should have been raised");
var secondTaskExecMessages = messages.Select (x => x.Message)?.ToList ();
Assert.IsNotNull (secondTaskExecMessages, "Second execution did not contain any messages!");
Expand Down