Test updates

Author: SteveSandersonMS

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.EventDispatch.cs

@@ -77,7 +77,7 @@ private void UpdateNamedEvents(in RenderBatch renderBatch)
                         // We could allow multiple events with the same name, since they are all tracked separately. However
                         // this is most likely a mistake on the developer's part so we will consider it an error.
                         var existingEntry = _namedSubmitEventsByScopeQualifiedName[scopeQualifiedName];
-                        throw new InvalidOperationException($"There is more than one named event with the name '{scopeQualifiedName}'. Ensure named events have unique names. The following components both use this name:"
+                        throw new InvalidOperationException($"There is more than one named event with the name '{scopeQualifiedName}'. Ensure named events have unique names, or are in scopes with distinct names. The following components both use this name:"
                             + $"\n - {GenerateComponentPath(existingEntry.ComponentId)}"
                             + $"\n - {GenerateComponentPath(addedEntry.ComponentId)}");
                     }

src/Components/Endpoints/test/EndpointHtmlRendererTest.cs

@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Components.Endpoints.Forms;
 using Microsoft.AspNetCore.Components.Endpoints.Tests.TestComponents;
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.Forms.Mapping;
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Rendering;
 using Microsoft.AspNetCore.Components.Test.Helpers;
@@ -821,7 +822,7 @@ public async Task CanRender_AsyncComponent()
     public void Duplicate_NamedEventHandlers_AcrossComponents_Throws()
     {
         // Arrange
-        var expectedError = @"There is more than one named event with the name 'default'. Ensure named events have unique names. The following components both use this name:
+        var expectedError = @"There is more than one named event with the name 'default'. Ensure named events have unique names, or are in scopes with distinct names. The following components both use this name:
  - TestComponent > NamedEventHandlerComponent
  - TestComponent > OtherNamedEventHandlerComponent";
 
@@ -1228,6 +1229,7 @@ private static ServiceCollection CreateDefaultServiceCollection()
         services.AddSingleton<ComponentStatePersistenceManager>();
         services.AddSingleton<PersistentComponentState>(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
         services.AddSingleton<AntiforgeryStateProvider, EndpointAntiforgeryStateProvider>();
+        services.AddSingleton<ICascadingValueSupplier>(_ => new SupplyParameterFromFormValueProvider(null, ""));
 
         return services;
     }

src/Components/Web/test/Forms/EditFormTest.cs

@@ -155,7 +155,7 @@ public async Task AddSSRContentWhenMappingContextPresent()
 
             // Assigns name to the submit event
             frame => AssertFrame.Attribute(frame, "onsubmit"),
-            frame => AssertFrame.NamedEvent(frame, "onsubmit", "mapping-context-name.my-form"),
+            frame => AssertFrame.NamedEvent(frame, "onsubmit", "my-form"),
 
             frame => AssertFrame.Region(frame, 4),
 
@@ -273,7 +273,7 @@ void RenderForm(RenderTreeBuilder builder)
 
     private class TestFormValueModelBinder : IFormValueMapper
     {
-        public bool CanMap(Type valueType, string formName = null) => false;
+        public bool CanMap(Type valueType, string mappingScopeName, string formName) => false;
         public void Map(FormValueMappingContext context) { }
     }
 }

src/Components/Web/test/Forms/Mapping/FormMappingScopeTest.cs

@@ -146,7 +146,7 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
 
     private class TestFormValueMapper : IFormValueMapper
     {
-        public bool CanMap(Type valueType, string formName = null) => false;
+        public bool CanMap(Type valueType, string mappingScopeName, string formName) => false;
         public void Map(FormValueMappingContext context) { }
     }
 }

src/Components/Web/test/Forms/Mapping/SupplyParameterFromFormTest.cs

@@ -29,14 +29,14 @@ public async Task FindCascadingParameters_HandlesSupplyParameterFromFormValues()
     }
 
     [Fact]
-    public async Task FindCascadingParameters_HandlesSupplyParameterFromFormValues_WithName()
+    public async Task FindCascadingParameters_HandlesSupplyParameterFromFormValues_WithMappingScopeName()
     {
         // Arrange
         var renderer = CreateRendererWithFormValueModelBinder();
         var formMappingScope = new FormMappingScope
         {
             Name = "scope-name",
-            FormValueModelBinder = new TestFormModelValueBinder("scope-name.handler-name"),
+            FormValueModelBinder = new TestFormModelValueBinder("[scope-name]handler-name"),
             ChildContent = modelBindingContext => builder =>
             {
                 builder.OpenComponent<FormParametersComponentWithName>(0);
@@ -78,12 +78,21 @@ class FormParametersComponentWithName : TestComponentBase
         [SupplyParameterFromForm(Handler = "handler-name")] public string FormParameter { get; set; }
     }
 
-    class TestFormModelValueBinder(string FormName = "") : IFormValueMapper
+    class TestFormModelValueBinder(string IncomingScopeQualifiedFormName = "") : IFormValueMapper
     {
         public void Map(FormValueMappingContext context) { }
 
-        public bool CanMap(Type valueType, string formName = null)
-            => formName is null || formName == FormName;
+        public bool CanMap(Type valueType, string mappingScopeName, string formName)
+        {
+            if (string.IsNullOrEmpty(mappingScopeName))
+            {
+                return IncomingScopeQualifiedFormName == (formName ?? string.Empty);
+            }
+            else
+            {
+                return IncomingScopeQualifiedFormName == $"[{mappingScopeName}]{formName ?? string.Empty}";
+            }
+        }
     }
 
     class TestComponentBase : IComponent

src/Components/Web/test/HtmlRendering/HtmlRendererTest.cs

@@ -1079,7 +1079,7 @@ await htmlRenderer.Dispatcher.InvokeAsync(async () =>
             var result = await htmlRenderer.RenderComponentAsync<TestComponent>();
 
             // Assert
-            Assert.Equal("<form><input type=\"hidden\" name=\"handler\" value=\"myscope.somename\" /></form>", result.ToHtmlString());
+            Assert.Equal("<form><input type=\"hidden\" name=\"handler\" value=\"[myscope]somename\" /></form>", result.ToHtmlString());
         });
     }
 
@@ -1262,7 +1262,7 @@ HtmlRenderer GetHtmlRenderer(IServiceProvider serviceProvider = null)
 
     class TestFormValueMapper : IFormValueMapper
     {
-        public bool CanMap(Type valueType, string formName = null)
+        public bool CanMap(Type valueType, string mappingScopeName, string formName)
             => throw new NotImplementedException();
 
         public void Map(FormValueMappingContext context)