[browser] Fix passing parameter to test added in #108190 (#108199)

dotnet · Sep 25, 2024 · bdcfb10 · bdcfb10
1 parent 080fcae
commit bdcfb10
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs b/src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
@@ -35,14 +35,24 @@ public async Task LoadSatelliteAssembly(bool loadAllSatelliteResources)
         var result = await RunSdkStyleAppForBuild(new(
             Configuration: "Debug", 
             TestScenario: "SatelliteAssembliesTest",
-            BrowserQueryString: new Dictionary<string, string> { ["loadAllSatelliteResources"] = loadAllSatelliteResources.ToString() }
+            BrowserQueryString: new Dictionary<string, string> { ["loadAllSatelliteResources"] = loadAllSatelliteResources.ToString().ToLowerInvariant() }
         ));
+
+        var expectedOutput = new List<Action<string>>();
+        if (!loadAllSatelliteResources)
+        {
+            // If we are loading all satellite, we don't have a way to test resources without satellite assemblies being loaded.
+            // So there messages are should be present only when we are lazily loading satellites.
+            expectedOutput.Add(m => Assert.Equal("default: hello", m));
+            expectedOutput.Add(m => Assert.Equal("es-ES without satellite: hello", m));
+        }
+
+        expectedOutput.Add(m => Assert.Equal("default: hello", m));
+        expectedOutput.Add(m => Assert.Equal("es-ES with satellite: hola", m));
+
         Assert.Collection(
             result.TestOutput,
-            m => Assert.Equal("default: hello", m),
-            m => Assert.Equal("es-ES without satellite: hello", m),
-            m => Assert.Equal("default: hello", m),
-            m => Assert.Equal("es-ES with satellite: hola", m)
+            expectedOutput.ToArray()
         );
     }
 

diff --git a/src/mono/wasm/testassets/WasmBasicTestApp/App/SatelliteAssembliesTest.cs b/src/mono/wasm/testassets/WasmBasicTestApp/App/SatelliteAssembliesTest.cs
@@ -10,10 +10,11 @@ public partial class SatelliteAssembliesTest
     [JSExport]
     public static async Task Run(bool loadSatelliteAssemblies)
     {
-        ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);
-
         if (loadSatelliteAssemblies)
+        {
+            ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);
             await LoadSatelliteAssemblies(new[] { "es-ES" });
+        }
 
         ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, true);
     }