Launching browser message

Author: tmat

src/BuiltInTools/dotnet-watch/Browser/BrowserLauncher.cs

@@ -70,7 +70,7 @@ private void LaunchBrowser(string launchUrl, BrowserRefreshServer? server)
             fileName = browserPath;
         }
 
-        logger.LogDebug("Launching browser: {FileName} {Args}", fileName, args);
+        logger.Log(MessageDescriptor.LaunchingBrowser, fileName, args);
 
         if (environmentOptions.TestFlags != TestFlags.None)
         {

test/dotnet-watch.Tests/Browser/BrowserLaunchTests.cs

@@ -1,49 +1,41 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.DotNet.Watch.UnitTests
+namespace Microsoft.DotNet.Watch.UnitTests;
+
+public class BrowserLaunchTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger)
 {
-    public class BrowserLaunchTests : DotNetWatchTestBase
+    [Fact]
+    public async Task LaunchesBrowserOnStart()
     {
-        private const string AppName = "WatchBrowserLaunchApp";
-
-        public BrowserLaunchTests(ITestOutputHelper logger)
-            : base(logger)
-        {
-        }
-
-        [Fact]
-        public async Task LaunchesBrowserOnStart()
-        {
-            var testAsset = TestAssets.CopyTestAsset(AppName)
-                .WithSource();
+        var testAsset = TestAssets.CopyTestAsset("WatchBrowserLaunchApp")
+            .WithSource();
 
-            App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
+        App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
 
-            // check that all app output is printed out:
-            await App.WaitForOutputLineContaining("Content root path:");
+        // check that all app output is printed out:
+        await App.WaitForOutputLineContaining("Content root path:");
 
-            Assert.Contains(App.Process.Output, line => line.Contains("Application started. Press Ctrl+C to shut down."));
-            Assert.Contains(App.Process.Output, line => line.Contains("Hosting environment: Development"));
+        Assert.Contains(App.Process.Output, line => line.Contains("Application started. Press Ctrl+C to shut down."));
+        Assert.Contains(App.Process.Output, line => line.Contains("Hosting environment: Development"));
 
-            // Verify we launched the browser.
-            Assert.Contains(App.Process.Output, line => line.Contains("dotnet watch ⌚ Launching browser: https://localhost:5001"));
-        }
+        // Verify we launched the browser.
+        App.AssertOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage("https://localhost:5001", ""));
+    }
 
-        [Fact]
-        public async Task UsesBrowserSpecifiedInEnvironment()
-        {
-            var testAsset = TestAssets.CopyTestAsset(AppName)
-                .WithSource();
+    [Fact]
+    public async Task UsesBrowserSpecifiedInEnvironment()
+    {
+        var testAsset = TestAssets.CopyTestAsset("WatchBrowserLaunchApp")
+            .WithSource();
 
-            App.EnvironmentVariables.Add("DOTNET_WATCH_BROWSER_PATH", "mycustombrowser.bat");
+        App.EnvironmentVariables.Add("DOTNET_WATCH_BROWSER_PATH", "mycustombrowser.bat");
 
-            App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
-            await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToUseBrowserRefresh);
-            await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToLaunchBrowser);
+        App.Start(testAsset, [], testFlags: TestFlags.MockBrowser);
+        await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToUseBrowserRefresh);
+        await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToLaunchBrowser);
 
-            // Verify we launched the browser.
-            await App.AssertOutputLineStartsWith("dotnet watch ⌚ Launching browser: mycustombrowser.bat https://localhost:5001");
-        }
+        // Verify we launched the browser.
+        await App.WaitForOutputLineContaining(MessageDescriptor.LaunchingBrowser.GetMessage("mycustombrowser.bat", "https://localhost:5001"));
     }
 }

test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs

@@ -777,7 +777,7 @@ public async Task BlazorWasm(bool projectSpecifiesCapabilities)
             App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser);
 
             // Browser is launched based on blazor-devserver output "Now listening on: ...".
-            await App.WaitUntilOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}");
+            await App.WaitUntilOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", ""));
 
             // Middleware should have been loaded to blazor-devserver before the browser is launched:
             App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorWasmHotReloadMiddleware[0]");
@@ -847,7 +847,7 @@ public async Task BlazorWasm_Restart()
             App.AssertOutputContains(MessageDescriptor.PressCtrlRToRestart);
 
             // Browser is launched based on blazor-devserver output "Now listening on: ...".
-            await App.WaitUntilOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}");
+            await App.WaitUntilOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", ""));
 
             App.SendControlR();
 
@@ -891,7 +891,7 @@ public async Task Razor_Component_ScopedCssAndStaticAssets()
 
             App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh);
             App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser);
-            App.AssertOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}");
+            App.AssertOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", ""));
             App.Process.ClearOutput();
 
             var scopedCssPath = Path.Combine(testAsset.Path, "RazorClassLibrary", "Components", "Example.razor.css");