Move existing host command tests to HostCommands class

elinor-fung · elinor-fung · commit bdcc21a05f19 · 2025-05-27T12:00:28.000-07:00
diff --git a/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs b/src/installer/tests/HostActivation.Tests/DotnetArgValidation.cs
@@ -3,8 +3,6 @@
 
 using System;
 using System.IO;
-using System.Text;
-using Microsoft.DotNet.Cli.Build;
 using Microsoft.DotNet.TestUtils;
 using Xunit;
 
@@ -83,52 +81,6 @@ public void InvalidFileOrCommand_NoSDK_ListsPossibleIssues()
                 .And.FindAnySdk(false);
         }
 
-        [Fact]
-        public void DotNetInfo_NoSDK()
-        {
-            TestContext.BuiltDotNet.Exec("--info")
-                .CaptureStdOut()
-                .CaptureStdErr()
-                .Execute()
-                .Should().Pass()
-                .And.HaveStdOutMatching($@"Architecture:\s*{TestContext.BuildArchitecture}")
-                .And.HaveStdOutMatching($@"RID:\s*{TestContext.BuildRID}");
-        }
-
-        [Fact]
-        public void DotNetInfo_Utf8Path()
-        {
-            string installLocation = Encoding.UTF8.GetString("utf8-龯蝌灋齅ㄥ䶱"u8);
-            DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, TestContext.BuiltDotNet.BinPath, installLocation)
-                .Build();
-
-            var result = dotnet.Exec("--info")
-                .DotNetRoot(Path.Combine(sharedTestState.BaseDirectory.Location, installLocation))
-                .CaptureStdErr()
-                .CaptureStdOut(Encoding.UTF8)
-                .Execute();
-
-            result.Should().Pass()
-                .And.HaveStdOutMatching($@"DOTNET_ROOT.*{installLocation}");
-        }
-
-        [Fact]
-        public void DotNetInfo_WithSDK()
-        {
-            DotNetCli dotnet = new DotNetBuilder(sharedTestState.BaseDirectory.Location, TestContext.BuiltDotNet.BinPath, "withSdk")
-                .AddMicrosoftNETCoreAppFrameworkMockHostPolicy("1.0.0")
-                .AddMockSDK("1.0.0", "1.0.0")
-                .Build();
-
-            dotnet.Exec("--info")
-                .WorkingDirectory(sharedTestState.BaseDirectory.Location)
-                .CaptureStdOut()
-                .CaptureStdErr()
-                .Execute()
-                .Should().Pass()
-                .And.NotHaveStdOutMatching($@"RID:\s*{TestContext.BuildRID}");
-        }
-
         // Return a non-existent path that contains a mix of / and \
         private string GetNonexistentAndUnnormalizedPath()
         {
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
@@ -138,55 +138,6 @@ private List<FrameworkInfo> GetExpectedFrameworks(bool? multiLevelLookup)
             return expectedList;
         }
 
-        [Theory]
-        [InlineData(true)]
-        [InlineData(null)]
-        [InlineData(false)]
-        public void ListRuntimes(bool? multiLevelLookup)
-        {
-            // Multi-level lookup is only supported on Windows.
-            if (!OperatingSystem.IsWindows() && multiLevelLookup != false)
-                return;
-
-            string expectedOutput = string.Join(
-                string.Empty,
-                GetExpectedFrameworks(false) // MLL Is always disabled for dotnet --list-runtimes
-                    .Select(t => $"{MicrosoftNETCoreApp} {t.Version} [{Path.Combine(t.Path, "shared", MicrosoftNETCoreApp)}]{Environment.NewLine}"));
-
-            // !!IMPORTANT!!: This test verifies the exact match of the entire output of the command (not a substring!)
-            // This is important as the output of --list-runtimes is considered machine readable and thus must not change even in a minor way (unintentionally)
-            RunTest(
-                new TestSettings().WithCommandLine("--list-runtimes"),
-                multiLevelLookup,
-                testApp: null)
-                .Should().HaveStdOut(expectedOutput)
-                .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json");
-        }
-
-        [Theory]
-        [InlineData(true)]
-        [InlineData(null)]
-        [InlineData(false)]
-        public void DotnetInfo(bool? multiLevelLookup)
-        {
-            // Multi-level lookup is only supported on Windows.
-            if (!OperatingSystem.IsWindows() && multiLevelLookup != false)
-                return;
-
-            string expectedOutput =
-                $".NET runtimes installed:{Environment.NewLine}" +
-                string.Join(string.Empty,
-                    GetExpectedFrameworks(false) // MLL is always disabled for dotnet --info
-                        .Select(t => $"  {MicrosoftNETCoreApp} {t.Version} [{Path.Combine(t.Path, "shared", MicrosoftNETCoreApp)}]{Environment.NewLine}"));
-
-            RunTest(
-                new TestSettings().WithCommandLine("--info"),
-                multiLevelLookup,
-                testApp: null)
-                .Should().HaveStdOutContaining(expectedOutput)
-                .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json");
-        }
-
         [Theory]
         [InlineData("net6.0", true, true)]
         [InlineData("net6.0", null, true)]
diff --git a/src/installer/tests/HostActivation.Tests/HostCommands.cs b/src/installer/tests/HostActivation.Tests/HostCommands.cs
@@ -2,14 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using Microsoft.DotNet.Cli.Build;
-using Microsoft.DotNet.Cli.Build.Framework;
 using Microsoft.DotNet.CoreSetup.Test;
 using Microsoft.DotNet.CoreSetup.Test.HostActivation;
-using Microsoft.DotNet.TestUtils;
 using Xunit;
 
 namespace HostActivation.Tests
@@ -24,14 +22,79 @@ public HostCommands(SharedTestState sharedState)
         }
 
         [Fact]
-        public void ListRuntimes_OtherArchitectures()
+        public void Info()
+        {
+            string expectedSdksOutput =
+                $"""
+                .NET SDKs installed:
+                {GetListSdksOutput(SharedState.DotNet.BinPath, SharedState.InstalledVersions, "  ")}
+                """;
+            string expectedRuntimesOutput =
+                $"""
+                .NET runtimes installed:
+                {GetListRuntimesOutput(SharedState.DotNet.BinPath, SharedState.InstalledVersions, "  ")}
+                """;
+            SharedState.DotNet.Exec("--info")
+                .CaptureStdOut()
+                .Execute()
+                .Should().Pass()
+                .And.HaveStdOutContaining(expectedSdksOutput)
+                .And.HaveStdOutContaining(expectedRuntimesOutput)
+                .And.HaveStdOutMatching($@"Architecture:\s*{TestContext.BuildArchitecture}")
+                // If an SDK exists, we rely on it to print the RID. The host should not print it again.
+                .And.NotHaveStdOutMatching($@"RID:\s*{TestContext.BuildRID}");
+        }
+
+        [Fact]
+        public void Info_NoSDK()
+        {
+            TestContext.BuiltDotNet.Exec("--info")
+                .CaptureStdOut()
+                .Execute()
+                .Should().Pass()
+                .And.HaveStdOutMatching($@"Architecture:\s*{TestContext.BuildArchitecture}")
+                .And.HaveStdOutMatching($@"RID:\s*{TestContext.BuildRID}")
+                .And.HaveStdOutContaining("No SDKs were found");
+        }
+
+
+        [Fact]
+        public void Info_Utf8Path()
+        {
+            string installLocation = Encoding.UTF8.GetString("utf8-龯蝌灋齅ㄥ䶱"u8);
+            DotNetCli dotnet = new DotNetBuilder(SharedState.Artifact.Location, TestContext.BuiltDotNet.BinPath, installLocation)
+                .Build();
+
+            dotnet.Exec("--info")
+                .DotNetRoot(Path.Combine(SharedState.Artifact.Location, installLocation))
+                .CaptureStdOut(Encoding.UTF8)
+                .Execute()
+                .Should().Pass()
+                .And.HaveStdOutMatching($@"DOTNET_ROOT.*{installLocation}");
+        }
+
+        [Fact]
+        public void ListRuntimes()
+        {
+            // Verify exact match of command output. The output of --list-runtimes is intended to be machine-readable
+            // and must not change in a way that breaks existing parsing.
+            string expectedOutput = GetListRuntimesOutput(SharedState.DotNet.BinPath, SharedState.InstalledVersions);
+            SharedState.DotNet.Exec("--list-runtimes")
+                .CaptureStdOut()
+                .Execute()
+                .Should().Pass()
+                .And.HaveStdOut(expectedOutput);
+        }
+
+        [Fact]
+        public void ListRuntimes_OtherArchitecture()
         {
             using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(SharedState.DotNet.GreatestVersionHostFxrFilePath))
             {
                 registeredInstallLocationOverride.SetInstallLocation(SharedState.OtherArchInstallLocations);
                 foreach ((string arch, string installLocation) in SharedState.OtherArchInstallLocations)
                 {
-                    // Verifiy exact match of command output. The output of --list-runtimes is intended to be machine-readable
+                    // Verify exact match of command output. The output of --list-runtimes is intended to be machine-readable
                     // and must not change in a way that breaks existing parsing.
                     string expectedOutput = GetListRuntimesOutput(installLocation, SharedState.InstalledVersions);
                     SharedState.DotNet.Exec("--list-runtimes", "--arch", arch)
@@ -45,14 +108,45 @@ public void ListRuntimes_OtherArchitectures()
         }
 
         [Fact]
-        public void ListSdks_OtherArchitectures()
+        public void ListRuntimes_OtherArchitecture_NoInstalls()
+        {
+            // Non-host architecture - arm64 if current architecture is x64, otherwise x64
+            string arch = TestContext.BuildArchitecture == "x64" ? "arm64" : "x64";
+            using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(SharedState.DotNet.GreatestVersionHostFxrFilePath))
+            {
+                // Register a location that should have no runtimes installed
+                registeredInstallLocationOverride.SetInstallLocation((arch, SharedState.Artifact.Location));
+                SharedState.DotNet.Exec("--list-runtimes", "--arch", arch)
+                    .ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
+                    .CaptureStdOut()
+                    .Execute()
+                    .Should().Pass()
+                    .And.HaveStdOut(string.Empty);
+            }
+        }
+
+        [Fact]
+        public void ListSdks()
+        {
+            // Verify exact match of command output. The output of --list-sdks is intended to be machine-readable
+            // and must not change in a way that breaks existing parsing.
+            string expectedOutput = GetListSdksOutput(SharedState.DotNet.BinPath, SharedState.InstalledVersions);
+            SharedState.DotNet.Exec("--list-sdks")
+                .CaptureStdOut()
+                .Execute()
+                .Should().Pass()
+                .And.HaveStdOut(expectedOutput);
+        }
+
+        [Fact]
+        public void ListSdks_OtherArchitecture()
         {
             using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(SharedState.DotNet.GreatestVersionHostFxrFilePath))
             {
                 registeredInstallLocationOverride.SetInstallLocation(SharedState.OtherArchInstallLocations);
                 foreach ((string arch, string installLocation) in SharedState.OtherArchInstallLocations)
                 {
-                    // Verifiy exact match of command output. The output of --list-sdks is intended to be machine-readable
+                    // Verify exact match of command output. The output of --list-sdks is intended to be machine-readable
                     // and must not change in a way that breaks existing parsing.
                     string expectedOutput = GetListSdksOutput(installLocation, SharedState.InstalledVersions);
                     SharedState.DotNet.Exec("--list-sdks", "--arch", arch)
@@ -65,20 +159,39 @@ public void ListSdks_OtherArchitectures()
             }
         }
 
-        private static string GetListRuntimesOutput(string installLocation, string[] versions)
+        [Fact]
+        public void ListSdks_OtherArchitecture_NoInstalls()
+        {
+            // Non-host architecture - arm64 if current architecture is x64, otherwise x64
+            string arch = TestContext.BuildArchitecture == "x64" ? "arm64" : "x64";
+            using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(SharedState.DotNet.GreatestVersionHostFxrFilePath))
+            {
+                // Register a location that should have no SDKs installed
+                registeredInstallLocationOverride.SetInstallLocation((arch, SharedState.Artifact.Location));
+                SharedState.DotNet.Exec("--list-sdks", "--arch", arch)
+                    .ApplyRegisteredInstallLocationOverride(registeredInstallLocationOverride)
+                    .CaptureStdOut()
+                    .Execute()
+                    .Should().Pass()
+                    .And.HaveStdOut(string.Empty);
+            }
+        }
+
+        private static string GetListRuntimesOutput(string installLocation, string[] versions, string prefix = "")
         {
             string runtimePath = Path.Combine(installLocation, "shared", Constants.MicrosoftNETCoreApp);
-            return string.Join(string.Empty, versions.Select(v => $"{Constants.MicrosoftNETCoreApp} {v} [{runtimePath}]{Environment.NewLine}"));
+            return string.Join(string.Empty, versions.Select(v => $"{prefix}{Constants.MicrosoftNETCoreApp} {v} [{runtimePath}]{Environment.NewLine}"));
         }
 
-        private static string GetListSdksOutput(string installLocation, string[] versions)
+        private static string GetListSdksOutput(string installLocation, string[] versions, string prefix = "")
         {
             string sdkPath = Path.Combine(installLocation, "sdk");
-            return string.Join(string.Empty, versions.Select(v => $"{v} [{sdkPath}]{Environment.NewLine}"));
+            return string.Join(string.Empty, versions.Select(v => $"{prefix}{v} [{sdkPath}]{Environment.NewLine}"));
         }
 
         public sealed class SharedTestState : IDisposable
         {
+            public TestArtifact Artifact { get; }
             public DotNetCli DotNet { get; }
 
             // Versions are assumed to be in ascending order. We use this property to check against the
@@ -87,13 +200,11 @@ public sealed class SharedTestState : IDisposable
 
             public (string, string)[] OtherArchInstallLocations { get; }
 
-            private TestArtifact _artifact;
-
             public SharedTestState()
             {
-                _artifact = TestArtifact.Create(nameof(HostCommands));
+                Artifact = TestArtifact.Create(nameof(HostCommands));
 
-                var builder = new DotNetBuilder(_artifact.Location, TestContext.BuiltDotNet.BinPath, "exe");
+                var builder = new DotNetBuilder(Artifact.Location, TestContext.BuiltDotNet.BinPath, "exe");
                 foreach (string version in InstalledVersions)
                 {
                     builder.AddMicrosoftNETCoreAppFrameworkMockHostPolicy(version);
@@ -103,12 +214,12 @@ public SharedTestState()
                 DotNet = builder.Build();
 
                 // Add runtimes and SDKs for other architectures
-                string[] otherArchs = new[] { "arm", "arm64", "x64", "x86" }.Where(a => a != TestContext.BuildArchitecture).ToArray();
+                string[] otherArchs = new[] { "arm64", "x64", "x86" }.Where(a => a != TestContext.BuildArchitecture).ToArray();
                 OtherArchInstallLocations = new (string, string)[otherArchs.Length];
                 for (int i = 0; i < otherArchs.Length; i++)
                 {
                     string arch = otherArchs[i];
-                    string installLocation = Directory.CreateDirectory(Path.Combine(_artifact.Location, arch)).FullName;
+                    string installLocation = Directory.CreateDirectory(Path.Combine(Artifact.Location, arch)).FullName;
                     foreach (string version in InstalledVersions)
                     {
                         DotNetBuilder.AddMicrosoftNETCoreAppFrameworkMockHostPolicy(installLocation, version);
@@ -127,7 +238,7 @@ public SharedTestState()
 
             public void Dispose()
             {
-                _artifact.Dispose();
+                Artifact.Dispose();
             }
         }
     }
diff --git a/src/installer/tests/HostActivation.Tests/MultilevelSDKLookup.cs b/src/installer/tests/HostActivation.Tests/MultilevelSDKLookup.cs
