test: 更新单元测试

Author: ArgoZhang

src/BootstrapBlazor/Localization/Json/JsonStringLocalizer.cs

@@ -72,43 +72,39 @@ public override LocalizedString this[string name]
         }
     }
 
-    private string? GetStringSafely(string name)
+    private string? GetStringSafely(string name) => GetStringFromService(name) ?? GetStringFromResourceManager(name) ?? GetStringFromJson(name);
+
+    private string? GetStringFromService(string name)
     {
-        string? val = null;
+        // get string from inject service
+        string? ret = null;
         if (jsonLocalizationOptions.DisableGetLocalizerFromService == false)
         {
-            val = GetStringFromService(name);
-            if (val != null)
+            var localizer = Utility.GetStringLocalizerFromService(Assembly, typeName);
+            if (localizer != null && localizer is not JsonStringLocalizer)
             {
-                return val;
+                var l = localizer[name];
+                if (!l.ResourceNotFound)
+                {
+                    ret = l.Value;
+                }
             }
         }
-
-        if (jsonLocalizationOptions.DisableGetLocalizerFromResourceManager == false)
-        {
-            val = GetStringSafely(name, CultureInfo.CurrentUICulture);
-        }
-        return val ?? GetStringSafelyFromJson(name);
+        return ret;
     }
 
-    private string? GetStringFromService(string name)
+    private string? GetStringFromResourceManager(string name)
     {
-        // get string from inject service
         string? ret = null;
-        var localizer = Utility.GetStringLocalizerFromService(Assembly, typeName);
-        if (localizer != null && localizer is not JsonStringLocalizer)
+        if (jsonLocalizationOptions.DisableGetLocalizerFromResourceManager == false)
         {
-            var l = localizer[name];
-            if (!l.ResourceNotFound)
-            {
-                ret = l.Value;
-            }
+            ret = GetStringSafely(name, CultureInfo.CurrentUICulture);
         }
         return ret;
     }
 
     private readonly ConcurrentDictionary<string, object?> _missingManifestCache = [];
-    private string? GetStringSafelyFromJson(string name)
+    private string? GetStringFromJson(string name)
     {
         // get string from json localization file
         var localizerStrings = MegerResolveLocalizers(CacheManager.GetAllStringsByTypeName(Assembly, typeName));
@@ -131,18 +127,14 @@ public override LocalizedString this[string name]
 
     private List<LocalizedString> MegerResolveLocalizers(IEnumerable<LocalizedString>? localizerStrings)
     {
-        var localizers = new List<LocalizedString>();
-        var resolveLocalizers = CacheManager.GetTypeStringsFromResolve(typeName);
-        localizers.AddRange(resolveLocalizers);
-
+        var localizers = new List<LocalizedString>(CacheManager.GetTypeStringsFromResolve(typeName));
         if (localizerStrings != null)
         {
             localizers.AddRange(localizerStrings);
         }
         return localizers;
     }
 
-
     private void HandleMissingResourceItem(string name)
     {
         localizationMissingItemHandler.HandleMissingItem(name, typeName, CultureInfo.CurrentUICulture.Name);
@@ -177,10 +169,13 @@ public override IEnumerable<LocalizedString> GetAllStrings(bool includeParentCul
         IEnumerable<LocalizedString>? GetAllStringsFromService()
         {
             IEnumerable<LocalizedString>? ret = null;
-            var localizer = Utility.GetStringLocalizerFromService(Assembly, typeName);
-            if (localizer != null && localizer is not JsonStringLocalizer)
+            if (jsonLocalizationOptions.DisableGetLocalizerFromService == false)
             {
-                ret = localizer.GetAllStrings(includeParentCultures);
+                var localizer = Utility.GetStringLocalizerFromService(Assembly, typeName);
+                if (localizer != null && localizer is not JsonStringLocalizer)
+                {
+                    ret = localizer.GetAllStrings(includeParentCultures);
+                }
             }
             return ret;
         }
@@ -189,14 +184,18 @@ public override IEnumerable<LocalizedString> GetAllStrings(bool includeParentCul
         // get all strings from base json localization factory
         IEnumerable<LocalizedString>? GetAllStringsFromBase()
         {
-            IEnumerable<LocalizedString>? ret = base.GetAllStrings(includeParentCultures);
-            try
-            {
-                CheckMissing();
-            }
-            catch (MissingManifestResourceException)
+            IEnumerable<LocalizedString>? ret = null;
+            if (jsonLocalizationOptions.DisableGetLocalizerFromResourceManager == false)
             {
-                ret = null;
+                ret = base.GetAllStrings(includeParentCultures);
+                try
+                {
+                    CheckMissing();
+                }
+                catch (MissingManifestResourceException)
+                {
+                    ret = null;
+                }
             }
             return ret;
 

test/UnitTest/Localization/JsonStringLocalizerTest.cs

@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using System.ComponentModel.DataAnnotations;
@@ -175,6 +176,27 @@ public void GetAllStrings_FromBase()
         Assert.Empty(items);
     }
 
+    [Fact]
+    public void DisableGetLocalizerFromResourceManager_Ok()
+    {
+        var sc = new ServiceCollection();
+        var builder = new ConfigurationBuilder();
+        builder.AddJsonFile("appsettings.json");
+        builder.AddInMemoryCollection(new Dictionary<string, string?>()
+        {
+            ["BootstrapBlazorOptions:DisableGetLocalizerFromService"] = "true",
+            ["BootstrapBlazorOptions:DisableGetLocalizerFromResourceManager"] = "true"
+        });
+        var config = builder.Build();
+        sc.AddSingleton<IConfiguration>(config);
+        sc.AddBootstrapBlazor();
+
+        var provider = sc.BuildServiceProvider();
+        var localizer = provider.GetRequiredService<IStringLocalizer<Dummy>>();
+        var items = localizer.GetAllStrings(false);
+        Assert.Empty(items);
+    }
+
     [Fact]
     public void GetAllStrings_FromResource()
     {
@@ -243,6 +265,7 @@ public void HandleMissingItem()
         var provider = sc.BuildServiceProvider();
         var localizer = provider.GetRequiredService<IStringLocalizer<Foo>>();
         var val = localizer["missing-item"];
+        Assert.True(val.ResourceNotFound);
 
         var handler = provider.GetRequiredService<ILocalizationMissingItemHandler>();
         MockLocalizationMissingItemHandler? mockHandler = null;