From 44539e826e4e6d6b010c38fade002be51455d9f8 Mon Sep 17 00:00:00 2001
From: zhangpeihang <948869991@qq.com>
Date: Tue, 22 Mar 2022 21:59:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?test:=20=E6=B7=BB=E5=8A=A0=20Nav=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/NavTest.cs | 133 ++++++++++++++++++++++++++++
 1 file changed, 133 insertions(+)
 create mode 100644 test/UnitTest/Components/NavTest.cs

diff --git a/test/UnitTest/Components/NavTest.cs b/test/UnitTest/Components/NavTest.cs
new file mode 100644
index 000000000..19607f4e2
--- /dev/null
+++ b/test/UnitTest/Components/NavTest.cs
@@ -0,0 +1,133 @@
+// 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/
+
+using Microsoft.AspNetCore.Components.Routing;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace UnitTest.Components;
+
+public class NavTest : BootstrapBlazorTestBase
+{
+    [Fact]
+    public void Items_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder => builder.Add(s => s.Items, GetItems()));
+
+        Assert.Contains("href=\"/Admin/Index\"", cut.Markup);
+    }
+
+    [Fact]
+    public void Alignment_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.Alignment, Alignment.Right);
+        });
+
+        var ele = cut.Find(".justify-content-end");
+
+        Assert.NotNull(ele);
+    }
+
+    [Fact]
+    public void IsVertical_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.IsVertical, true);
+        });
+
+        var ele = cut.Find(".flex-column");
+
+        Assert.NotNull(ele);
+    }
+
+    [Fact]
+    public void IsPills_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.IsPills, true);
+        });
+
+        var ele = cut.Find(".nav-pills");
+
+        Assert.NotNull(ele);
+    }
+
+    [Fact]
+    public void IsFill_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.IsPills, true);
+            builder.Add(s => s.IsFill, true);
+        });
+
+        var ele = cut.Find(".nav-fill");
+
+        Assert.NotNull(ele);
+    }
+
+    [Fact]
+    public void IsJustified_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.IsPills, true);
+            builder.Add(s => s.IsFill, true);
+            builder.Add(s => s.IsJustified, true);
+        });
+
+        var ele = cut.Find(".nav-justified");
+
+        Assert.NotNull(ele);
+    }
+
+    [Fact]
+    public void ChildContent_OK()
+    {
+        var cut = Context.RenderComponent<Nav>(builder =>
+        {
+            builder.Add(s => s.Items, GetItems());
+            builder.Add(s => s.ChildContent, new RenderFragment(builder =>
+            {
+                builder.OpenComponent<Button>(0);
+                builder.CloseComponent();
+            }));
+        });
+
+        var component = cut.FindComponent<Button>();
+
+        Assert.NotNull(component);
+    }
+
+    private IEnumerable<NavLink> GetItems()
+    {
+        var ret = new List<NavLink>();
+        var link = new NavLink();
+        var parameters = new Dictionary<string, object?>()
+        {
+            ["href"] = "/Admin/Index",
+            ["class"] = "nav-link nav-item",
+            ["target"] = "_blank",
+            ["ChildContent"] = new RenderFragment(builder =>
+            {
+                builder.AddContent(0, "BootstrapAdmin");
+            })
+        };
+        link.SetParametersAsync(ParameterView.FromDictionary(parameters!));
+        ret.Add(link);
+        return ret;
+    }
+}
-- 
Gitee


From df6d43a72a5ccd9fe9d6a0c5b643c6037a489646 Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Tue, 22 Mar 2022 22:40:43 +0800
Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Nav/Nav.razor  |  4 ++--
 src/BootstrapBlazor/Components/Nav/NavBase.cs | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Nav/Nav.razor b/src/BootstrapBlazor/Components/Nav/Nav.razor
index f3eeef926..1a802e51d 100644
--- a/src/BootstrapBlazor/Components/Nav/Nav.razor
+++ b/src/BootstrapBlazor/Components/Nav/Nav.razor
@@ -2,9 +2,9 @@
 @inherits NavBase
 
 <nav @attributes="@AdditionalAttributes" class="@ClassString">
-    @foreach(var item in Items?? new NavLink[0])
+    @foreach (var item in Items)
     {
         @Render(item)
     }
     @ChildContent
-</nav>
\ No newline at end of file
+</nav>
diff --git a/src/BootstrapBlazor/Components/Nav/NavBase.cs b/src/BootstrapBlazor/Components/Nav/NavBase.cs
index c63670df9..0b360e228 100644
--- a/src/BootstrapBlazor/Components/Nav/NavBase.cs
+++ b/src/BootstrapBlazor/Components/Nav/NavBase.cs
@@ -30,6 +30,7 @@ public abstract class NavBase : BootstrapComponentBase
     /// 获得/设置 组件数据源
     /// </summary>
     [Parameter]
+    [NotNull]
     public IEnumerable<NavLink>? Items { get; set; }
 
     /// <summary>
@@ -68,6 +69,16 @@ public abstract class NavBase : BootstrapComponentBase
     [Parameter]
     public RenderFragment? ChildContent { get; set; }
 
+    /// <summary>
+    /// OnParametersSet 方法
+    /// </summary>
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        Items ??= Enumerable.Empty<NavLink>();
+    }
+
     /// <summary>
     /// 获得 NavLink 组件渲染内容
     /// </summary>
-- 
Gitee


From 56d9512b47102a69e0225e18d98195b9396508ac Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <argo@163.com>
Date: Tue, 22 Mar 2022 22:40:55 +0800
Subject: [PATCH 3/3] =?UTF-8?q?test:=20=E5=A2=9E=E5=8A=A0=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A6=86=E7=9B=96=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/NavTest.cs | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/test/UnitTest/Components/NavTest.cs b/test/UnitTest/Components/NavTest.cs
index 19607f4e2..7bf7bcbfe 100644
--- a/test/UnitTest/Components/NavTest.cs
+++ b/test/UnitTest/Components/NavTest.cs
@@ -3,11 +3,6 @@
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
 using Microsoft.AspNetCore.Components.Routing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace UnitTest.Components;
 
@@ -17,8 +12,9 @@ public class NavTest : BootstrapBlazorTestBase
     public void Items_OK()
     {
         var cut = Context.RenderComponent<Nav>(builder => builder.Add(s => s.Items, GetItems()));
-
         Assert.Contains("href=\"/Admin/Index\"", cut.Markup);
+
+        cut.SetParametersAndRender(pb => pb.Add(a => a.Items, null));
     }
 
     [Fact]
@@ -31,7 +27,13 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var ele = cut.Find(".justify-content-end");
+        Assert.NotNull(ele);
 
+        cut.SetParametersAndRender(pb =>
+        {
+            pb.Add(a => a.Alignment, Alignment.Center);
+        });
+        ele = cut.Find(".justify-content-center");
         Assert.NotNull(ele);
     }
 
@@ -45,7 +47,6 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var ele = cut.Find(".flex-column");
-
         Assert.NotNull(ele);
     }
 
@@ -59,7 +60,6 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var ele = cut.Find(".nav-pills");
-
         Assert.NotNull(ele);
     }
 
@@ -74,7 +74,6 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var ele = cut.Find(".nav-fill");
-
         Assert.NotNull(ele);
     }
 
@@ -90,7 +89,6 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var ele = cut.Find(".nav-justified");
-
         Assert.NotNull(ele);
     }
 
@@ -108,7 +106,6 @@ public class NavTest : BootstrapBlazorTestBase
         });
 
         var component = cut.FindComponent<Button>();
-
         Assert.NotNull(component);
     }
 
-- 
Gitee