test: 更新单元测试

Author: ArgoZhang

src/BootstrapBlazor/Components/Upload/AvatarUpload.razor.cs

@@ -187,14 +187,10 @@ public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> r
 
         ValidateModule ??= await LoadValidateModule();
 
-        var invalidItems = IsInValidOnAddItem
-            ? [new { Id = AddId, _results.First().ErrorMessage }]
-            : _results.Select(i => new { Id = i.MemberNames.FirstOrDefault(), i.ErrorMessage }).ToList();
-
         var items = IsInValidOnAddItem
             ? [AddId]
             : Files.Select(i => i.ValidateId).ToList();
-
+        var invalidItems = _results.GetInvalidItems(IsInValidOnAddItem, AddId);
         var addId = IsInValidOnAddItem ? null : AddId;
         await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
     }

src/BootstrapBlazor/Components/Upload/CardUpload.razor.cs

@@ -176,14 +176,10 @@ public override async Task ToggleMessage(IReadOnlyCollection<ValidationResult> r
 
         ValidateModule ??= await LoadValidateModule();
 
-        var invalidItems = IsInValidOnAddItem
-            ? [new { Id = AddId, _results.First().ErrorMessage }]
-            : _results.Select(i => new { Id = i.MemberNames.FirstOrDefault(), i.ErrorMessage }).ToList();
-
         var items = IsInValidOnAddItem
             ? [AddId]
             : Files.Select(i => i.ValidateId).ToList();
-
+        var invalidItems = _results.GetInvalidItems(IsInValidOnAddItem, AddId);
         var addId = IsInValidOnAddItem ? null : AddId;
         await ValidateModule.InvokeVoidAsync("executeUpload", items, invalidItems, addId);
     }

src/BootstrapBlazor/Extensions/ValidateContextExtensions.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the Apache 2.0 License
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
@@ -42,4 +42,16 @@ public static ValidationResult GetValidationResult(this ValidationContext contex
         var memberNames = string.IsNullOrEmpty(context.MemberName) ? null : new string[] { context.MemberName };
         return new ValidationResult(errorMessage, memberNames);
     }
+
+    internal static List<ValidateItem> GetInvalidItems(this IReadOnlyCollection<ValidationResult> source, bool isInValidOnAddItem, string? newId) => isInValidOnAddItem
+        ? [new ValidateItem() { Id = newId, ErrorMessage = source.First().ErrorMessage }]
+        : source.Select(i => new ValidateItem() { Id = i.MemberNames.FirstOrDefault(), ErrorMessage = i.ErrorMessage }).ToList();
+
+    [ExcludeFromCodeCoverage]
+    internal readonly record struct ValidateItem
+    {
+        public string? Id { get; init; }
+
+        public string? ErrorMessage { get; init; }
+    }
 }

test/UnitTest/Components/UploadCardTest.cs

@@ -171,6 +171,7 @@ public async Task CardUpload_ValidateForm_Ok()
                 pb.Add(a => a.Value, foo.Files);
                 pb.Add(a => a.ValueExpression, Utility.GenerateValueExpression(foo, "Files", typeof(List<UploadFile>)));
                 pb.Add(a => a.AllowExtensions, [".jpg"]);
+                pb.Add(a => a.ShowDeleteButton, true);
             });
             pb.Add(a => a.OnValidSubmit, context =>
             {
@@ -208,6 +209,16 @@ await input.Instance.OnChange.InvokeAsync(new InputFileChangeEventArgs(new List<
         });
 
         Assert.DoesNotContain("is-invalid", upload.Markup);
+
+        upload.Render(pb =>
+        {
+            pb.Add(a => a.IsDisabled, false);
+        });
+        // 清空所有文件
+        var items = cut.FindAll(".btn-outline-danger");
+        Assert.Single(items);
+        await cut.InvokeAsync(() => items[0].Click());
+        form.Submit();
     }
 
     [Fact]