test(GetUniqueName): add uni test improve code coverage (#3288)

* chore: bump version 8.0.1

* chore: 移除注释

* chore: 更新依赖版本

* revert: 撤销打包工具误删除

* refactor: 重构代码

* test: 增加单元测试

* test: 更新单元测试

* chore: bump version 8.4.6

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>8.4.5</Version>
+    <Version>8.4.6</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">

src/BootstrapBlazor/Extensions/AssemblyExtensions.cs

@@ -13,7 +13,7 @@ static class AssemblyExtensions
     /// </summary>
     /// <param name="assembly"></param>
     /// <returns></returns>
-    public static string GetUniqueName(this Assembly assembly) => (assembly.IsCollectible
-        ? $"{assembly.GetHashCode()}"
-        : $"{assembly.GetName().Name}");
+    public static string GetUniqueName(this Assembly assembly) => assembly.IsCollectible
+        ? $"{assembly.GetName().Name}-{assembly.GetHashCode()}"
+        : $"{assembly.GetName().Name}";
 }

src/BootstrapBlazor/Extensions/TypeExtensions.cs

@@ -58,7 +58,7 @@ void EnsureNoAuthenticationSchemeSpecified()
     /// </summary>
     /// <param name="type"></param>
     /// <returns></returns>
-    public static string GetUniqueTypeName(this Type type) => (type.IsCollectible
+    public static string GetUniqueTypeName(this Type type) => type.IsCollectible
         ? $"{type.FullName}-{type.TypeHandle.Value}"
-        : $"{type.FullName}");
+        : $"{type.FullName}";
 }

src/BootstrapBlazor/wwwroot/src/css/motronic.css

@@ -357,21 +357,15 @@
     border-color: var(--bs-secondary);
 }
 
-/*dropdonw*/
 .dropdown-menu {
     --bs-dropdown-item-padding-y: 6px;
     --bs-dropdown-item-padding-x: 20px;
 }
-/*end dropdown*/
 
-/*tree*/
 .tree-view {
     --bb-tree-item-hover-color: var(--bs-primary);
 }
-/*end tree*/
 
-/*btn*/
 .btn-xs, .btn-group-xs > .btn {
     --bs-btn-border-radius: .375rem;
 }
-/*end btn*/

src/Bundle.props

@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="BuildBundlerMinifierPlus" Version="5.3.0" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net8.0'" />
+    <PackageReference Include="AspNetCore.SassCompiler" Version="1.75.0" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == 'net8.0'" />
   </ItemGroup>
 
 </Project>

src/Extensions/Components/BootstrapBlazor.TagHelper/BootstrapBlazor.TagHelper.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>8.0.1-beta01</Version>
+    <Version>8.0.1</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="8.4.4-beta01" />
+    <PackageReference Include="BootstrapBlazor" Version="8.4.5" />
   </ItemGroup>
 
   <ItemGroup>

test/UnitTest/Extensions/AssemblyExtensionsTest.cs

@@ -0,0 +1,82 @@
+// 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 System.Reflection;
+using System.Runtime.Loader;
+
+namespace UnitTest.Extensions;
+
+public class AssemblyExtensionsTest
+{
+    [Fact]
+    public void GetUniqueName_Ok()
+    {
+        var type = Type.GetType("BootstrapBlazor.Components.AssemblyExtensions, BootstrapBlazor");
+        Assert.NotNull(type);
+
+        var methodInfo = type.GetMethod("GetUniqueName", BindingFlags.Static | BindingFlags.Public);
+        Assert.NotNull(methodInfo);
+
+        var actual = methodInfo.Invoke(null, [GetType().Assembly]);
+        Assert.Equal(GetType().Assembly.GetName().Name, actual);
+
+        actual = methodInfo.Invoke(null, [new MockAssembly()]);
+        Assert.Equal("", actual);
+
+        var loader = new AssemblyLoadContext("Test", true);
+        var assemblyFile = Path.Combine(AppContext.BaseDirectory, "Plugins", "Test.dll");
+        Assert.True(File.Exists(assemblyFile));
+
+        var assembly = loader.LoadFromAssemblyPath(assemblyFile);
+        actual = methodInfo.Invoke(null, [assembly]);
+        Assert.Contains("Test-", actual?.ToString());
+        loader.Unload();
+    }
+
+    [Fact]
+    public void GetUniqueTypeName_Ok()
+    {
+        var type = Type.GetType("BootstrapBlazor.Components.TypeExtensions, BootstrapBlazor");
+        Assert.NotNull(type);
+
+        var methodInfo = type.GetMethod("GetUniqueTypeName", BindingFlags.Static | BindingFlags.Public);
+        Assert.NotNull(methodInfo);
+
+        var actual = methodInfo.Invoke(null, [GetType()]);
+        Assert.Equal(GetType().FullName, actual);
+
+        actual = methodInfo.Invoke(null, [new MockTypeInfo()]);
+        Assert.Equal("", actual);
+
+        var loader = new AssemblyLoadContext("Test", true);
+        var assemblyFile = Path.Combine(AppContext.BaseDirectory, "Plugins", "Test.dll");
+        Assert.True(File.Exists(assemblyFile));
+
+        var assembly = loader.LoadFromAssemblyPath(assemblyFile);
+        type = assembly.GetType("ConsoleApp3.TestClass");
+        actual = methodInfo.Invoke(null, [type]);
+        Assert.Contains("ConsoleApp3.TestClass-", actual?.ToString());
+
+        loader.Unload();
+    }
+
+    class MockTypeInfo : TypeDelegator
+    {
+        public override string? FullName => null;
+
+        public override bool IsCollectible => false;
+
+        public override RuntimeTypeHandle TypeHandle => new();
+    }
+
+    class MockAssembly : Assembly
+    {
+        public override AssemblyName GetName() => new();
+
+        public override bool IsCollectible => false;
+    }
+
+    //[UnsafeAccessor(UnsafeAccessorKind.StaticMethod, Name = "GetUniqueName")]
+    //static extern int CallMethod(Assembly assembly);
+}

test/UnitTest/UnitTest.csproj

@@ -37,6 +37,13 @@
     <ProjectReference Include="..\..\src\BootstrapBlazor\BootstrapBlazor.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="Plugins\Test.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Remove="Plugins\Test.dll" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="appsettings.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>