test(TestBase): redesign test context base (#4144)

* test: 移除 DrawerTestBase 基类 * test: 移除 DialogTestBase 基类 * test: 重构 AuthorizationViewTestBase 单元测试 * test: 更新继承关系精简代码 * test: 移除 EditorForm 测试基类 * test: 更新 EFCore 测试基类 * test: 重构 PdfTest 测试基类 * test: 移除 ErrorLogger 测试基类 * test: 移除 MessageTest 基类 * test: 移除 SwalTestBase * test: 移除 RobbinTabTestBase * test: 移除 PopoverTestBase * test: 重构 TableDialogTestBase * test: 移除 TableDrawerTestBase * test: 移除 TablePopConfirmTestBase * test: 重构 ValidateFormTestBase * test: 重构 TabTestBase * test: 移除 TableTestBase * test: 移除 TableSortDialogTestBase * test: 修复单元测试 * test: 移除 CollectionOrderer 规则 * test: 重构 SpeechTestBase * test: 增加代码覆盖率排除规则 * chore: bump version 8.8.4
dotnetcore · Aug 25, 2024 · 14161aa · 14161aa
1 parent 0cc6eb5
commit 14161aa
Show file tree

Hide file tree

Showing 48 changed files with 57 additions and 1,274 deletions.
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
  <PropertyGroup>
- <Version>8.8.4-beta07</Version>
+ <Version>8.8.4</Version>
  </PropertyGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

diff --git a/test/UnitTest.Localization/CollectionOrder/DisplayNameOrder.cs b/test/UnitTest.Localization/CollectionOrder/DisplayNameOrder.cs
@@ -3,14 +3,3 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 [assembly: CollectionBehavior(DisableTestParallelization = true)]
-[assembly: TestCollectionOrderer("UnitTest.CollectionOrder.DisplayNameOrderer", "UnitTest")]
-
-namespace UnitTest.CollectionOrder;
-
-public class DisplayNameOrderer : ITestCollectionOrderer
-{
- public IEnumerable<ITestCollection> OrderTestCollections(IEnumerable<ITestCollection> testCollections)
- {
- return testCollections.OrderBy(collection => collection.DisplayName);
- }
-}
diff --git a/test/UnitTest.Localization/LocalizerEnTest.cs b/test/UnitTest.Localization/LocalizerEnTest.cs
@@ -23,6 +23,7 @@ public void Foo_Json_Ok()
  [Fact]
  public void Dummy_Resource_Ok()
  {
+ Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
  Assert.Equal("en-US", CultureInfo.CurrentUICulture.Name);
 
  var val = Utility.GetDisplayName(typeof(DummyEn), nameof(DummyEn.Name));

diff --git a/test/UnitTest.Localization/LocalizerZhTest.cs b/test/UnitTest.Localization/LocalizerZhTest.cs
@@ -23,6 +23,7 @@ public void Foo_Json_Ok()
  [Fact]
  public void Dummy_Resource_Ok()
  {
+ Context.Services.GetRequiredService<IStringLocalizer<Foo>>();
  Assert.Equal("zh-CN", CultureInfo.CurrentUICulture.Name);
 
  var val = Utility.GetDisplayName(typeof(Dummy), nameof(Dummy.Name));

diff --git a/test/UnitTest/Components/AuthorizeViewTest.cs b/test/UnitTest/Components/AuthorizeViewTest.cs
@@ -8,7 +8,7 @@
 
 namespace UnitTest.Components;
 
-public class AuthorizeViewTest : AuthorizateViewTestBase
+public class AuthorizeViewTest : AuthorizationViewTestBase
 {
  [Fact]
  public void NotAuthorized_Ok()

diff --git a/test/UnitTest/Components/BlockTest.cs b/test/UnitTest/Components/BlockTest.cs
@@ -24,9 +24,9 @@ public void Authorized_Ok()
  var cut = Context.RenderComponent<Block>(builder =>
  {
  builder.Add(a => a.Condition, true);
- builder.Add(a => a.Authorized, b => b.AddContent(0, "Authorizated"));
+ builder.Add(a => a.Authorized, b => b.AddContent(0, "Authorized"));
  });
- Assert.Equal("Authorizated", cut.Markup);
+ Assert.Equal("Authorized", cut.Markup);
  }
 
  [Fact]
@@ -59,7 +59,7 @@ internal static RenderFragment BuildComponent() => builder =>
  };
 }
 
-public class BlockAuthorizationTest : AuthorizationTestBase
+public class BlockAuthorizationTest : AuthorizationViewTestBase
 {
  [Fact]
  public void User_Ok()

diff --git a/test/UnitTest/Components/DialogTest.cs b/test/UnitTest/Components/DialogTest.cs
@@ -4,7 +4,7 @@
 
 namespace UnitTest.Components;
 
-public class DialogTest : DialogTestBase
+public class DialogTest : BootstrapBlazorTestBase
 {
  [Fact]
  public async Task Show_Ok()

diff --git a/test/UnitTest/Components/EditorFormTest.cs b/test/UnitTest/Components/EditorFormTest.cs
@@ -7,7 +7,7 @@
 
 namespace UnitTest.Components;
 
-public class EditorFormTest : BootstrapEditorFormTestBase
+public class EditorFormTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void CascadedEditContext_Error()

diff --git a/test/UnitTest/Components/ErrorHandlerTest.cs b/test/UnitTest/Components/ErrorHandlerTest.cs
@@ -7,7 +7,7 @@
 
 namespace UnitTest.Components;
 
-public class ErrorHandlerTest : ErrorLoggerTestBase
+public class ErrorHandlerTest : BootstrapBlazorTestBase
 {
  [Fact]
  public async Task HandlerException_Ok()

diff --git a/test/UnitTest/Components/LayoutTest.cs b/test/UnitTest/Components/LayoutTest.cs
@@ -385,7 +385,7 @@ public void CollapseBarTemplate_Ok()
  private static RenderFragment CreateSide(string? content = "Side") => builder => builder.AddContent(0, content);
 }
 
-public class LayoutAuthorizationTest : AuthorizateViewTestBase
+public class LayoutAuthorizationTest : AuthorizationViewTestBase
 {
  [Fact]
  public void Authorized_Ok()

diff --git a/test/UnitTest/Components/MenuTest.cs b/test/UnitTest/Components/MenuTest.cs
@@ -485,10 +485,7 @@ public void MenuItem_Parent()
  Assert.True(item.IsActive);
  Assert.True(parent.IsActive);
  }
-}
 
-public class MenuItemTest_Ok : DialogTestBase
-{
  [Fact]
  public void ActiveItem_Ok()
  {

diff --git a/test/UnitTest/Components/MessageTest.cs b/test/UnitTest/Components/MessageTest.cs
@@ -6,7 +6,7 @@
 
 namespace UnitTest.Components;
 
-public class MessageTest : MessageTestBase
+public class MessageTest : BootstrapBlazorTestBase
 {
  [Fact]
  public async Task Message_Ok()

diff --git a/test/UnitTest/Components/PopConfirmButtonTest.cs b/test/UnitTest/Components/PopConfirmButtonTest.cs
@@ -6,7 +6,7 @@
 
 namespace UnitTest.Components;
 
-public class PopConfirmButtonTest : PopoverTestBase
+public class PopConfirmButtonTest : BootstrapBlazorTestBase
 {
  [Fact]
  public async Task Show_Ok()

diff --git a/test/UnitTest/Components/RecognizerTest.cs b/test/UnitTest/Components/RecognizerTest.cs
@@ -4,7 +4,6 @@
 
 namespace UnitTest.Components;
 
-
 public class RecognizerTest : SpeechTestBase
 {
  [Fact]

diff --git a/test/UnitTest/Components/RibbonTabAnchorTest.cs b/test/UnitTest/Components/RibbonTabAnchorTest.cs
@@ -9,7 +9,7 @@ namespace UnitTest.Components;
 /// <summary>
 /// 
 /// </summary>
-public class RibbonTabAnchorTest : RibbonTabTestBase
+public class RibbonTabAnchorTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void IsSupportAnchor_Ok()

diff --git a/test/UnitTest/Components/SwalTest.cs b/test/UnitTest/Components/SwalTest.cs
@@ -4,7 +4,7 @@
 
 namespace UnitTest.Components;
 
-public class SwalTest : SwalTestBase
+public class SwalTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void Show_Ok()

diff --git a/test/UnitTest/Components/TableConfirmTest.cs b/test/UnitTest/Components/TableConfirmTest.cs
@@ -4,7 +4,7 @@
 
 namespace UnitTest.Components;
 
-public class TableConfirmTest : TableConfirmTestBase
+public class TableConfirmTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void TableCellPopConfirmButton_Ok()

diff --git a/test/UnitTest/Components/TableDrawerTest.cs b/test/UnitTest/Components/TableDrawerTest.cs
@@ -8,7 +8,7 @@
 
 namespace UnitTest.Components;
 
-public class TableDrawerTest : TableDrawerTestBase
+public class TableDrawerTest : TableDialogTestBase
 {
  [Fact]
  public async Task EditAsync_Ok()

diff --git a/test/UnitTest/Components/TableSortDialogTest.cs b/test/UnitTest/Components/TableSortDialogTest.cs
@@ -7,7 +7,7 @@
 
 namespace UnitTest.Components;
 
-public class TableSortDialogTest : TableSortDialogTestBase
+public class TableSortDialogTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void AdvancedSort_Ok()

diff --git a/test/UnitTest/Components/TableTemplateColumnTest.cs b/test/UnitTest/Components/TableTemplateColumnTest.cs
@@ -6,7 +6,7 @@
 
 namespace UnitTest.Components;
 
-public class TableTemplateColumnTest : TableTestBase
+public class TableTemplateColumnTest : BootstrapBlazorTestBase
 {
  [Theory]
  [InlineData(TableRenderMode.CardView)]

diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
@@ -13,7 +13,7 @@
 
 namespace UnitTest.Components;
 
-public class TableTest : TableTestBase
+public class TableTest : BootstrapBlazorTestBase
 {
  [Fact]
  public void Items_Ok()

diff --git a/test/UnitTest/Core/AuthorizateViewTestBase.cs b/test/UnitTest/Core/AuthorizateViewTestBase.cs
diff --git a/test/UnitTest/Core/AuthorizationTestBase.cs b/test/UnitTest/Core/AuthorizationTestBase.cs
diff --git a/test/UnitTest/Core/AuthorizationViewTestBase.cs b/test/UnitTest/Core/AuthorizationViewTestBase.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Argo Zhang ([email protected]). All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+// Website: https://www.blazor.zone or https://argozhang.github.io/
+
+using Bunit.TestDoubles;
+
+namespace UnitTest.Core;
+
+public class AuthorizationViewTestBase : BootstrapBlazorTestBase
+{
+ [NotNull]
+ protected TestAuthorizationContext? AuthorizationContext { get; private set; }
+
+ protected override void ConfigureServices(IServiceCollection services)
+ {
+ base.ConfigureServices(services);
+
+ AuthorizationContext = Context.AddTestAuthorization();
+ }
+}
diff --git a/test/UnitTest/Core/BootstrapBlazorTestBase.cs b/test/UnitTest/Core/BootstrapBlazorTestBase.cs
@@ -6,18 +6,12 @@
 
 namespace UnitTest.Core;
 
-public class BootstrapBlazorTestBase : IDisposable
+public class BootstrapBlazorTestBase : TestBase, IDisposable
 {
- protected TestContext Context { get; }
-
  protected ICacheManager Cache { get; }
 
- public BootstrapBlazorTestBase()
+ public BootstrapBlazorTestBase() : base()
  {
- Context = new TestContext();
- // Mock 脚本
- Context.JSInterop.Mode = JSRuntimeMode.Loose;
-
  ConfigureServices(Context.Services);
 
  ConfigureConfiguration(Context.Services);