All WasmBuildTests use dotnet new, unification

src/mono/wasm/Wasm.Build.Tests/Common/SharedBuildPerTestClassFixture.cs → src/mono/wasi/Wasi.Build.Tests/SharedBuildPerTestClassFixture.cs

@@ -9,6 +9,7 @@
 
 #nullable enable
 
+// ToDo: should be common with Wasm.Build.Tests, copied here after Wasm.Build.Tests refactoring
 namespace Wasm.Build.Tests
 {
     public class SharedBuildPerTestClassFixture : IDisposable

src/mono/wasm/Wasm.Build.Tests/Blazor/AppsettingsTests.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
 using Xunit;
@@ -21,39 +22,34 @@ public AppsettingsTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
     [Fact]
     public async Task FileInVfs()
     {
-        string id = $"blazor_{GetRandomId()}";
-        string projectFile = CreateWasmTemplateProject(id, "blazorwasm");
-
-        string projectDirectory = Path.GetDirectoryName(projectFile)!;
-
-        File.WriteAllText(Path.Combine(projectDirectory, "wwwroot", "appsettings.json"), $"{{ \"Id\": \"{id}\" }}");
-
-        string programPath = Path.Combine(projectDirectory, "Program.cs");
-        string programContent = File.ReadAllText(programPath);
-        programContent = programContent.Replace("var builder",
-        """
-        System.Console.WriteLine($"appSettings Exists '{File.Exists("/appsettings.json")}'");
-        System.Console.WriteLine($"appSettings Content '{File.ReadAllText("/appsettings.json")}'");
-        var builder
-        """);
-        File.WriteAllText(programPath, programContent);
-
-        BlazorBuild(new BlazorBuildOptions(id, "debug", NativeFilesType.FromRuntimePack));
+        string config = "debug";
+        ProjectInfo info = CreateWasmTemplateProject(Template.BlazorWasm, config, aot: false, "blazor");
+        UpdateHomePage();
+        string projectDirectory = Path.GetDirectoryName(info.ProjectFilePath)!;
+        File.WriteAllText(Path.Combine(projectDirectory, "wwwroot", "appsettings.json"), $"{{ \"Id\": \"{info.ProjectName}\" }}");
+        UpdateFile("Program.cs", new Dictionary<string, string>
+        {
+            {
+                "var builder",
+                """
+                    System.Console.WriteLine($"appSettings Exists '{File.Exists("/appsettings.json")}'");
+                    System.Console.WriteLine($"appSettings Content '{File.ReadAllText("/appsettings.json")}'");
+                    var builder
+                """
+            }
+        });
 
+        (string _, string buildOutput) = BlazorBuild(info);
         bool existsChecked = false;
         bool contentChecked = false;
-
-        await BlazorRunForBuildWithDotnetRun(new BlazorRunOptions()
-        {
-            Config = "debug",
-            OnConsoleMessage = (_, msg) =>
-            {
-                if (msg.Text.Contains("appSettings Exists 'True'"))
+        await RunForBuildWithDotnetRun(new(
+            info.Configuration,
+            OnConsoleMessage: (_, msg) => {
+                if (msg.Contains("appSettings Exists 'True'"))
                     existsChecked = true;
-                else if (msg.Text.Contains($"appSettings Content '{{ \"Id\": \"{id}\" }}'"))
+                else if (msg.Contains($"appSettings Content '{{ \"Id\": \"{info.ProjectName}\" }}'"))
                     contentChecked = true;
-            }
-        });
+            }));
 
         Assert.True(existsChecked, "File '/appsettings.json' wasn't found");
         Assert.True(contentChecked, "Content of '/appsettings.json' is not matched");