diff --git a/src/BootstrapBlazor/Components/Divider/Divider.razor b/src/BootstrapBlazor/Components/Divider/Divider.razor index dabd8e69078876d5ac9691427fdea291b6f4375b..3ba34e2dbfae1991a91f5edf455709faa0597733 100644 --- a/src/BootstrapBlazor/Components/Divider/Divider.razor +++ b/src/BootstrapBlazor/Components/Divider/Divider.razor @@ -1,5 +1,5 @@ @namespace BootstrapBlazor.Components -@inherits DividerBase +@inherits BootstrapComponentBase
diff --git a/src/BootstrapBlazor/Components/Divider/DividerBase.cs b/src/BootstrapBlazor/Components/Divider/Divider.razor.cs similarity index 85% rename from src/BootstrapBlazor/Components/Divider/DividerBase.cs rename to src/BootstrapBlazor/Components/Divider/Divider.razor.cs index 6993c570a68d4ec80fb83a4c4266c3f0b7c76a0d..24939f0697547128961ae99d331ed2647a1f804d 100644 --- a/src/BootstrapBlazor/Components/Divider/DividerBase.cs +++ b/src/BootstrapBlazor/Components/Divider/Divider.razor.cs @@ -7,9 +7,9 @@ using Microsoft.AspNetCore.Components; namespace BootstrapBlazor.Components; /// -/// Divider 组件基类 +/// Divider 组件 /// -public abstract class DividerBase : ComponentBase +public partial class Divider { /// /// 获得 class 样式集合 @@ -29,13 +29,6 @@ public abstract class DividerBase : ComponentBase .AddClass("is-right", Alignment.Right == Alignment) .Build(); - /// - /// 获得/设置 用户自定义属性 - /// - /// - [Parameter(CaptureUnmatchedValues = true)] - public IDictionary? AdditionalAttributes { get; set; } - /// /// 获得/设置 是否为垂直显示 默认为 false /// diff --git a/src/BootstrapBlazor/Extensions/ServiceProviderExtensions.cs b/src/BootstrapBlazor/Extensions/ServiceProviderExtensions.cs deleted file mode 100644 index f89335e9e5f592a87917821b43bd73bba321515f..0000000000000000000000000000000000000000 --- a/src/BootstrapBlazor/Extensions/ServiceProviderExtensions.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Argo Zhang (argo@163.com). 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/ - -namespace BootstrapBlazor.Components; - -/// -/// -/// -public static class ServiceProviderExtensions -{ - /// - /// - /// - /// - [Obsolete("可删除此行代码")] - public static void RegisterProvider(this IServiceProvider provider) - { - //TODO: 请移除此代码 - } -} diff --git a/test/UnitTest/Components/CardTest.cs b/test/UnitTest/Components/CardTest.cs index c306a2ef06e21817ce80a635c1dc926aa2fee43d..24314c44b655457c7bdf22a446558d9d4b0b86a4 100644 --- a/test/UnitTest/Components/CardTest.cs +++ b/test/UnitTest/Components/CardTest.cs @@ -43,6 +43,31 @@ public class CardTest : TestBase Assert.Contains("text-center", cut.Markup); } + [Fact] + public void IsShadow_Ok() + { + var cut = Context.RenderComponent(builder => builder.Add(a => a.IsShadow, true)); + Assert.Contains("card-shadow", cut.Markup); + } + + [Fact] + public void HeaderText_Ok() + { + var cut = Context.RenderComponent(builder => builder.Add(a => a.HeaderText, "Header")); + Assert.Contains("Header", cut.Markup); + } + + [Fact] + public void IsCollapsible_Ok() + { + var cut = Context.RenderComponent(builder => + { + builder.Add(a => a.IsCollapsible, true); + builder.Add(a => a.HeaderText, "Header"); + }); + Assert.Contains("card-collapse", cut.Markup); + } + private static RenderFragment CreateComponent() => builder => { diff --git a/test/UnitTest/Components/DividerTest.cs b/test/UnitTest/Components/DividerTest.cs new file mode 100644 index 0000000000000000000000000000000000000000..9d22ef5435167566a4548cb8f69e61a37472036a --- /dev/null +++ b/test/UnitTest/Components/DividerTest.cs @@ -0,0 +1,64 @@ +// Copyright (c) Argo Zhang (argo@163.com). 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/ + +namespace UnitTest.Components; + +public class DividerTest : TestBase +{ + [Fact] + public void TextIcon_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.Text, "Test"); + pb.Add(a => a.Icon, "fa fa-fa"); + }); + Assert.Contains("Test", cut.Markup); + Assert.Contains("fa fa-fa", cut.Markup); + } + + [Fact] + public void IsVertical_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.IsVertical, true); + pb.Add(a => a.Text, "Test"); + }); + Assert.Contains("divider-vertical", cut.Markup); + } + + [Fact] + public void ChildContent_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.ChildContent, new RenderFragment(builder => builder.AddContent(0, "Test"))); + }); + Assert.Contains("Test", cut.Markup); + } + + [Fact] + public void Alignment_Ok() + { + var cut = Context.RenderComponent(pb => + { + pb.Add(a => a.Alignment, Alignment.Left); + pb.Add(a => a.Text, "Test"); + }); + Assert.Contains("is-left", cut.Markup); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.Alignment, Alignment.Center); + }); + Assert.Contains("is-center", cut.Markup); + + cut.SetParametersAndRender(pb => + { + pb.Add(a => a.Alignment, Alignment.Right); + }); + Assert.Contains("is-right", cut.Markup); + } +}