diff --git a/src/BootstrapBlazor/Services/WebClientService.cs b/src/BootstrapBlazor/Services/WebClientService.cs
index f51baf66dc5..a0f26949b3f 100644
--- a/src/BootstrapBlazor/Services/WebClientService.cs
+++ b/src/BootstrapBlazor/Services/WebClientService.cs
@@ -26,13 +26,7 @@ public class WebClientService(IIpLocatorFactory ipLocatorFactory,
/// 获得 ClientInfo 实例方法
/// Get ClientInfo Instance Method
///
- public Task GetClientInfo() => GetClientInfo(CancellationToken.None);
-
- ///
- /// 获得 ClientInfo 实例方法
- /// Get ClientInfo Instance Method
- ///
- public async Task GetClientInfo(CancellationToken token)
+ public async Task GetClientInfo(CancellationToken token = default)
{
_client = new ClientInfo()
{
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 482a032863e..800a754b6e9 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -10,12 +10,12 @@
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
@@ -24,7 +24,6 @@
-
diff --git a/test/UnitTest/Components/AjaxTest.cs b/test/UnitTest/Components/AjaxTest.cs
index a5c6bb007ca..e9ac18eeb06 100644
--- a/test/UnitTest/Components/AjaxTest.cs
+++ b/test/UnitTest/Components/AjaxTest.cs
@@ -25,13 +25,13 @@ public async Task Ajax_Test()
Assert.False(option.ToJson);
var service = Context.Services.GetRequiredService();
- await service.InvokeAsync(option);
+ await service.InvokeAsync(option, CancellationToken.None);
}
[Fact]
public async Task Goto_Test()
{
var service = Context.Services.GetRequiredService();
- await service.Goto("http://www.blazor.zone");
+ await service.Goto("http://www.blazor.zone", CancellationToken.None);
}
}
diff --git a/test/UnitTest/Components/ContextMenuTest.cs b/test/UnitTest/Components/ContextMenuTest.cs
index b8d8fe03ae2..c44ed214750 100644
--- a/test/UnitTest/Components/ContextMenuTest.cs
+++ b/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>();
- 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();
}
diff --git a/test/UnitTest/Components/CountButtonTest.cs b/test/UnitTest/Components/CountButtonTest.cs
index e2f39db6a1b..ce344bf7ad8 100644
--- a/test/UnitTest/Components/CountButtonTest.cs
+++ b/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);
}
}
diff --git a/test/UnitTest/Components/DisplayTest.cs b/test/UnitTest/Components/DisplayTest.cs
index 40f9cec93ee..32f022168c0 100644
--- a/test/UnitTest/Components/DisplayTest.cs
+++ b/test/UnitTest/Components/DisplayTest.cs
@@ -56,7 +56,7 @@ 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 =>
@@ -64,7 +64,7 @@ public async Task LookupService_Ok()
pb.Add(a => a.LookupServiceKey, null);
pb.Add(a => a.Lookup, new List { new("v1", "Test3"), new("v2", "Test4") });
});
- await Task.Delay(100);
+ await Task.Delay(100, CancellationToken.None);
Assert.Contains("Test3,Test4", cut.Markup);
}
diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
index 898c76d4f2b..a5d3a176ff2 100644
--- a/test/UnitTest/Components/LayoutTest.cs
+++ b/test/UnitTest/Components/LayoutTest.cs
@@ -500,6 +500,8 @@ public void OnAuthorizing_Ok()
[Fact]
public void Main_Ok()
{
+ var nav = Context.Services.GetRequiredService();
+ nav.NavigateTo("/not-exist");
var cut = Context.Render>>(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();
+ nav.NavigateTo("/not-exist");
var cut = Context.Render>>(pb =>
{
pb.Add(a => a.Value, Task.FromResult(new AuthenticationState(new ClaimsPrincipal())));
diff --git a/test/UnitTest/Components/RecognizerTest.cs b/test/UnitTest/Components/RecognizerTest.cs
index dc7849d49f1..9bf8ac634e0 100644
--- a/test/UnitTest/Components/RecognizerTest.cs
+++ b/test/UnitTest/Components/RecognizerTest.cs
@@ -75,7 +75,7 @@ public async Task SpeechWave_OnTimeout_Test()
}));
});
- await Task.Delay(1200);
+ await Task.Delay(1200, CancellationToken.None);
Assert.True(timeout);
cut.Render(pb =>
@@ -83,7 +83,7 @@ public async Task SpeechWave_OnTimeout_Test()
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 =>
{
diff --git a/test/UnitTest/Components/SearchTest.cs b/test/UnitTest/Components/SearchTest.cs
index d312a546c6d..3950f47032c 100644
--- a/test/UnitTest/Components/SearchTest.cs
+++ b/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());
diff --git a/test/UnitTest/Components/SelectGenericTest.cs b/test/UnitTest/Components/SelectGenericTest.cs
index 1ac5cb0f316..39259bc4ab1 100644
--- a/test/UnitTest/Components/SelectGenericTest.cs
+++ b/test/UnitTest/Components/SelectGenericTest.cs
@@ -1007,7 +1007,7 @@ public async Task OnBeforeSelectedItemChange_OK()
});
var modals = cut.FindComponents();
var modal = modals[modals.Count - 1];
- _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent>().Instance.ConfirmSelectedItem(0)));
+ _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent>().Instance.ConfirmSelectedItem(0)), CancellationToken.None);
var tick = DateTime.Now;
while (!cut.Markup.Contains("test-swal-footer"))
{
diff --git a/test/UnitTest/Components/SelectTest.cs b/test/UnitTest/Components/SelectTest.cs
index 4f2bec7f3f3..c04e003bd50 100644
--- a/test/UnitTest/Components/SelectTest.cs
+++ b/test/UnitTest/Components/SelectTest.cs
@@ -1138,7 +1138,7 @@ public async Task OnBeforeSelectedItemChange_OK()
});
var modals = cut.FindComponents();
var modal = modals[modals.Count - 1];
- _ = Task.Run(() => cut.InvokeAsync(() => cut.FindComponent
-
-
-
-
+
+
+
+