test(xUnit): upgrade to v3

src/BootstrapBlazor/Services/WebClientService.cs

@@ -26,13 +26,7 @@ public class WebClientService(IIpLocatorFactory ipLocatorFactory,
     /// <para lang="zh">获得 ClientInfo 实例方法</para>
     /// <para lang="en">Get ClientInfo Instance Method</para>
     /// </summary>
-    public Task<ClientInfo> GetClientInfo() => GetClientInfo(CancellationToken.None);
-
-    /// <summary>
-    /// <para lang="zh">获得 ClientInfo 实例方法</para>
-    /// <para lang="en">Get ClientInfo Instance Method</para>
-    /// </summary>
-    public async Task<ClientInfo> GetClientInfo(CancellationToken token)
+    public async Task<ClientInfo> GetClientInfo(CancellationToken token = default)
     {
         _client = new ClientInfo()
         {

test/Directory.Build.props

@@ -10,12 +10,12 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.*" />
-    <PackageReference Include="xunit" Version="2.*" />
+    <PackageReference Include="xunit.v3" Version="3.*" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.*">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="8.*">
+    <PackageReference Include="coverlet.collector" Version="10.*">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
@@ -24,7 +24,6 @@
   <ItemGroup>
     <Using Include="System.Diagnostics.CodeAnalysis"/>
     <Using Include="Xunit"/>
-    <Using Include="Xunit.Abstractions"/>
   </ItemGroup>
 
 </Project>

test/UnitTest/Components/AjaxTest.cs

@@ -25,13 +25,13 @@ public async Task Ajax_Test()
         Assert.False(option.ToJson);
 
         var service = Context.Services.GetRequiredService<AjaxService>();
-        await service.InvokeAsync(option);
+        await service.InvokeAsync(option, CancellationToken.None);
     }
 
     [Fact]
     public async Task Goto_Test()
     {
         var service = Context.Services.GetRequiredService<AjaxService>();
-        await service.Goto("http://www.blazor.zone");
+        await service.Goto("http://www.blazor.zone", CancellationToken.None);
     }
 }

test/UnitTest/Components/ContextMenuTest.cs

@@ -103,7 +103,7 @@ public async Task ContextMenu_Ok()
         // 测试 Touch 事件
         TriggerTouchStart(row);
 
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         row.TouchEnd();
         Assert.True(clicked);
 
@@ -250,7 +250,7 @@ public async Task ContextMenu_Table(TableRenderMode renderMode)
         TriggerTouchStart(row);
 
         var options = Context.Services.GetRequiredService<IOptions<BootstrapBlazorOptions>>();
-        await Task.Delay(100 + options.Value.ContextMenuOptions.OnTouchDelay);
+        await Task.Delay(100 + options.Value.ContextMenuOptions.OnTouchDelay, CancellationToken.None);
         row.TouchEnd();
     }
 
@@ -314,7 +314,7 @@ public async Task ContextMenu_TreeView()
         TriggerTouchStart(row);
         TriggerTouchStart(row);
 
-        await Task.Delay(100 + 2 * options.CurrentValue.ContextMenuOptions.OnTouchDelay);
+        await Task.Delay(100 + 2 * options.CurrentValue.ContextMenuOptions.OnTouchDelay, CancellationToken.None);
         row.TouchEnd();
     }
 

test/UnitTest/Components/CountButtonTest.cs

@@ -24,7 +24,7 @@ await cut.InvokeAsync(() =>
         });
         Assert.Contains("disabled=\"disabled\"", cut.Markup);
 
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         Assert.Contains("(1) DisplayText", cut.Markup);
 
         cut.WaitForState(() => !cut.Markup.Contains("disabled=\"disabled\""), TimeSpan.FromSeconds(1));
@@ -39,9 +39,9 @@ await cut.InvokeAsync(() =>
             var button = cut.Find("button");
             button.Click();
         });
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         Assert.Contains("(1) CountText", cut.Markup);
-        await Task.Delay(600);
+        await Task.Delay(600, CancellationToken.None);
 
         cut.Render(pb =>
         {
@@ -57,10 +57,10 @@ await cut.InvokeAsync(() =>
         });
         Assert.Contains("disabled=\"disabled\"", cut.Markup);
 
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         Assert.Contains("2-test-callback", cut.Markup);
 
-        await Task.Delay(700);
+        await Task.Delay(700, CancellationToken.None);
         Assert.DoesNotContain("disabled=\"disabled\"", cut.Markup);
         Assert.Contains("DisplayText", cut.Markup);
 
@@ -78,9 +78,9 @@ await cut.InvokeAsync(() =>
             var button = cut.Find("button");
             button.Click();
         });
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         Assert.Equal(1, clickCount);
-        await Task.Delay(600);
+        await Task.Delay(600, CancellationToken.None);
 
         cut.Render(pb =>
         {
@@ -95,8 +95,8 @@ await cut.InvokeAsync(() =>
             var button = cut.Find("button");
             button.Click();
         });
-        await Task.Delay(500);
+        await Task.Delay(500, CancellationToken.None);
         Assert.Equal(3, clickCount);
-        await Task.Delay(600);
+        await Task.Delay(600, CancellationToken.None);
     }
 }

test/UnitTest/Components/DisplayTest.cs

@@ -56,15 +56,15 @@ public async Task LookupService_Ok()
         {
             pb.Add(a => a.LookupService, new MockLookupService());
         });
-        await Task.Delay(100);
+        await Task.Delay(100, CancellationToken.None);
         Assert.Contains("Test1,Test2", cut.Markup);
 
         cut.Render(pb =>
         {
             pb.Add(a => a.LookupServiceKey, null);
             pb.Add(a => a.Lookup, new List<SelectedItem> { new("v1", "Test3"), new("v2", "Test4") });
         });
-        await Task.Delay(100);
+        await Task.Delay(100, CancellationToken.None);
         Assert.Contains("Test3,Test4", cut.Markup);
     }
 

test/UnitTest/Components/LayoutTest.cs

@@ -500,6 +500,8 @@ public void OnAuthorizing_Ok()
     [Fact]
     public void Main_Ok()
     {
+        var nav = Context.Services.GetRequiredService<BunitNavigationManager>();
+        nav.NavigateTo("/not-exist");
         var cut = Context.Render<CascadingValue<Task<AuthenticationState>>>(pb =>
         {
             pb.Add(a => a.Value, Task.FromResult(new AuthenticationState(new ClaimsPrincipal())));
@@ -514,6 +516,8 @@ public void Main_Ok()
     [Fact]
     public void NotAuthorized_Ok()
     {
+        var nav = Context.Services.GetRequiredService<BunitNavigationManager>();
+        nav.NavigateTo("/not-exist");
         var cut = Context.Render<CascadingValue<Task<AuthenticationState>>>(pb =>
         {
             pb.Add(a => a.Value, Task.FromResult(new AuthenticationState(new ClaimsPrincipal())));

test/UnitTest/Components/RecognizerTest.cs

@@ -75,15 +75,15 @@ public async Task SpeechWave_OnTimeout_Test()
             }));
         });
 
-        await Task.Delay(1200);
+        await Task.Delay(1200, CancellationToken.None);
         Assert.True(timeout);
 
         cut.Render(pb =>
         {
             pb.Add(a => a.Show, true);
             pb.Add(a => a.ShowUsedTime, false);
         });
-        await Task.Delay(1200);
+        await Task.Delay(1200, CancellationToken.None);
 
         cut.Render(pb =>
         {

test/UnitTest/Components/SearchTest.cs

@@ -25,7 +25,7 @@ public async Task OnBlurAsync_Ok()
             });
         });
         await cut.InvokeAsync(() => cut.Instance.TriggerFilter("t"));
-        await Task.Delay(20);
+        await Task.Delay(20, CancellationToken.None);
 
         var item = cut.Find(".dropdown-item");
         await cut.InvokeAsync(() => item.Click());
@@ -60,7 +60,7 @@ public async Task ItemTemplate_Ok()
         });
 
         await cut.InvokeAsync(() => cut.Instance.TriggerFilter("t"));
-        await Task.Delay(20);
+        await Task.Delay(20, CancellationToken.None);
 
         Assert.Contains("Template-test1-Address 1", cut.Markup);
         Assert.Contains("Template-test2-Address 2", cut.Markup);
@@ -172,7 +172,7 @@ public async Task OnSelectedItemChanged_Ok()
         });
 
         await cut.InvokeAsync(() => cut.Instance.TriggerFilter("t"));
-        await Task.Delay(20);
+        await Task.Delay(20, CancellationToken.None);
 
         var item = cut.Find(".dropdown-item");
         await cut.InvokeAsync(() => item.Click());

test/UnitTest/Components/SelectGenericTest.cs

@@ -1007,7 +1007,7 @@ public async Task OnBeforeSelectedItemChange_OK()
         });
         var modals = cut.FindComponents<Modal>();
         var modal = modals[modals.Count - 1];
-        _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<SelectGeneric<string>>().Instance.ConfirmSelectedItem(0)));
+        _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<SelectGeneric<string>>().Instance.ConfirmSelectedItem(0)), CancellationToken.None);
         var tick = DateTime.Now;
         while (!cut.Markup.Contains("test-swal-footer"))
         {

test/UnitTest/Components/SelectTest.cs

@@ -1138,7 +1138,7 @@ public async Task OnBeforeSelectedItemChange_OK()
         });
         var modals = cut.FindComponents<Modal>();
         var modal = modals[modals.Count - 1];
-        _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<Select<string>>().Instance.ConfirmSelectedItem(0)));
+        _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<Select<string>>().Instance.ConfirmSelectedItem(0)), CancellationToken.None);
         var tick = DateTime.Now;
         while (!cut.Markup.Contains("test-swal-footer"))
         {

test/UnitTest/Components/SwalTest.cs

@@ -152,7 +152,7 @@ public void Show_Ok()
                     return Task.CompletedTask;
                 }
             });
-        }));
+        }), CancellationToken.None);
 
         var tick = DateTime.Now;
         while (!cut.Markup.Contains("test-cancel-text"))
@@ -192,7 +192,7 @@ public void Show_Ok()
                     return Task.CompletedTask;
                 }
             });
-        }));
+        }), CancellationToken.None);
 
         tick = DateTime.Now;
         while (!cut.Markup.Contains("test-cancel-text"))
@@ -231,7 +231,7 @@ public void Show_Ok()
             });
         });
 
-        Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<Select<string>>().Instance.ConfirmSelectedItem(0)));
+        Task.Run(() => cut.InvokeAsync(() => cut.FindComponent<Select<string>>().Instance.ConfirmSelectedItem(0)), CancellationToken.None);
         tick = DateTime.Now;
         while (!cut.Markup.Contains("test-swal-footer"))
         {

test/UnitTest/Components/TableTest.cs

@@ -7916,7 +7916,7 @@ public async Task AutoRefresh_Ok()
                 });
             });
         });
-        await Task.Delay(1200);
+        await Task.Delay(1200, CancellationToken.None);
         Assert.True(index > 1);
     }
 

test/UnitTest/Components/TimerTest.cs

@@ -113,7 +113,7 @@ public async Task OnStart_Ok()
         var confirm = cut.Find(".time-panel-btn.confirm");
         await cut.InvokeAsync(() => confirm.Click());
 
-        await Task.Delay(2000);
+        await Task.Delay(2000, CancellationToken.None);
         Assert.True(timeout);
     }
 
@@ -138,7 +138,7 @@ public async Task OnCancel_Ok()
         Assert.True(buttons[1].ClassList.Contains("btn-warning"));
         Assert.Equal("暂停", buttons[1].GetInnerText());
         await cut.InvokeAsync(() => buttons[1].Click());
-        await Task.Delay(1000);
+        await Task.Delay(1000, CancellationToken.None);
 
         // resume
         buttons = cut.FindAll(".timer-buttons button");

test/UnitTest/Components/TreeViewTest.cs

@@ -617,7 +617,7 @@ public async Task IsVirtualize_Ok()
         // 触发第一个节点展开
         await cut.InvokeAsync(() => cut.Find(".node-icon.visible").Click());
         cut.WaitForState(() => cut.Instance.Items[0].Items.Count == 2);
-        await Task.Delay(50);
+        await Task.Delay(50, CancellationToken.None);
 
         cut.Contains("--bb-tree-view-level: 0;");
         cut.Contains("--bb-tree-view-level: 1;");

test/UnitTest/Components/ValidateTest.cs

@@ -406,7 +406,7 @@ public async Task AsyncRules_Ok()
         var form = cut.Find("form");
         var c = cut.Find("input");
         await cut.InvokeAsync(() => c.Change("Test"));
-        await Task.Delay(300);
+        await Task.Delay(300, CancellationToken.None);
         await cut.InvokeAsync(() => form.Submit());
         Assert.True(invalid);
     }