Hotfix/improve assembly localization resources helper collect missing translations

docs/CodeDoc/Atc/Atc.Helpers.md

@@ -629,6 +629,21 @@ CultureHelper.
 
 <br />
 
+## CultureInfoHelper
+
+>```csharp
+>public static class CultureInfoHelper
+>```
+
+### Static Methods
+
+#### GetCulturesFromNames
+>```csharp
+>IList<CultureInfo> GetCulturesFromNames(IEnumerable<string> cultureNames)
+>```
+
+<br />
+
 ## DataAnnotationHelper
 
 >```csharp

docs/CodeDoc/Atc/Index.md

@@ -80,6 +80,7 @@
 - [CardinalDirectionTypeHelper](Atc.Helpers.md#cardinaldirectiontypehelper)
 - [CliHelper](Atc.Helpers.md#clihelper)
 - [CultureHelper](Atc.Helpers.md#culturehelper)
+- [CultureInfoHelper](Atc.Helpers.md#cultureinfohelper)
 - [DataAnnotationHelper](Atc.Helpers.md#dataannotationhelper)
 - [DateTimeHelper](Atc.Helpers.md#datetimehelper)
 - [DateTimeOffsetHelper](Atc.Helpers.md#datetimeoffsethelper)

docs/CodeDoc/Atc/IndexExtended.md

@@ -4461,6 +4461,9 @@
      - GetLanguageNames(int displayLanguageLcid, List<int> includeOnlyLcids, DropDownFirstItemType dropDownFirstItemType = None)
      - GetLanguageNames(int displayLanguageLcid, List<string> includeOnlyCultureNames, DropDownFirstItemType dropDownFirstItemType = None)
      - GetSupportedCultures(int displayLanguageLcid = 1033)
+- [CultureInfoHelper](Atc.Helpers.md#cultureinfohelper)
+  -  Static Methods
+     - GetCulturesFromNames(IEnumerable<string> cultureNames)
 - [DataAnnotationHelper](Atc.Helpers.md#dataannotationhelper)
   -  Static Methods
      - TryValidate(T data, out IList`1 validationResults, bool validateAllProperties = True)
@@ -5270,6 +5273,7 @@
      - GetBeautifiedName(this Assembly assembly)
      - GetExportedTypeByName(this Assembly assembly, string typeName)
      - GetFileVersion(this Assembly assembly)
+     - GetResourceManagers(this Assembly assembly)
      - GetTypesInheritingFromType(this Assembly assembly, Type type)
      - IsDebugBuild(this Assembly assembly)
 - [FieldInfoExtensions](System.Reflection.md#fieldinfoextensions)

docs/CodeDoc/Atc/System.Reflection.md

@@ -37,6 +37,10 @@ Extensions for the `System.Reflection.Assembly` class.
 >```csharp
 >Version GetFileVersion(this Assembly assembly)
 >```
+#### GetResourceManagers
+>```csharp
+>ResourceManager[] GetResourceManagers(this Assembly assembly)
+>```
 #### GetTypesInheritingFromType
 >```csharp
 >Type[] GetTypesInheritingFromType(this Assembly assembly, Type type)

src/Atc.XUnit/GlobalUsings.cs

@@ -10,6 +10,7 @@
 global using System.Text.Json;
 
 global using Atc.CodeDocumentation;
+global using Atc.Helpers;
 global using Atc.Serialization;
 global using Atc.XUnit.Internal;
 

src/Atc.XUnit/Internal/AssemblyLocalizationResourcesHelper.cs

@@ -8,15 +8,18 @@ public static Dictionary<string, Dictionary<string, List<string>>> CollectMissin
         Assembly assembly,
         IList<string> cultureNames)
     {
+        var resourceManagers = assembly.GetResourceManagers();
+
+        var cultures = CultureInfoHelper.GetCulturesFromNames(cultureNames);
+
         var result = new Dictionary<string, Dictionary<string, List<string>>>(StringComparer.Ordinal);
-        var resourceManagers = GetResourceManagersFromAssembly(assembly);
-        foreach (var resourceManager in resourceManagers.OrderBy(x => x.BaseName, StringComparer.Ordinal))
+        foreach (var resourceManager in resourceManagers)
         {
             result.Add(
                 resourceManager.BaseName,
                 CollectMissingTranslationsForResourceManager(
                     resourceManager,
-                    cultureNames));
+                    cultures));
         }
 
         return result;
@@ -27,43 +30,24 @@ public static Dictionary<string, Dictionary<string, List<string>>> CollectInvali
         IList<string> cultureNames,
         IList<string>? allowSuffixTerms = null)
     {
+        var resourceManagers = assembly.GetResourceManagers();
+
+        var cultures = CultureInfoHelper.GetCulturesFromNames(cultureNames);
+
         var result = new Dictionary<string, Dictionary<string, List<string>>>(StringComparer.Ordinal);
-        var resourceManagers = GetResourceManagersFromAssembly(assembly);
-        foreach (var resourceManager in resourceManagers.OrderBy(x => x.BaseName, StringComparer.Ordinal))
+        foreach (var resourceManager in resourceManagers)
         {
             result.Add(
                 resourceManager.BaseName,
                 CollectInvalidKeySuffixWithPlaceholdersForResourceManager(
                     resourceManager,
-                    cultureNames,
+                    cultures,
                     allowSuffixTerms));
         }
 
         return result;
     }
 
-    private static IEnumerable<ResourceManager> GetResourceManagersFromAssembly(
-        Assembly assembly)
-    {
-        var resourceTypes = assembly.GetTypes();
-        var resourceManagers = new List<ResourceManager>();
-
-        foreach (var type in resourceTypes)
-        {
-            var property = type.GetProperty("ResourceManager", BindingFlags.Public | BindingFlags.Static);
-            if (property is null ||
-                property.PropertyType != typeof(ResourceManager))
-            {
-                continue;
-            }
-
-            var resourceManager = (ResourceManager)property.GetValue(null)!;
-            resourceManagers.Add(resourceManager);
-        }
-
-        return resourceManagers;
-    }
-
     private static List<string> GetMissingKeysInDefault(
         HashSet<string> allKnownKeys,
         List<DictionaryEntry> defaultDictionaryEntries)
@@ -104,7 +88,7 @@ private static List<string> GetInvalidKeySuffixWithPlaceholdersInDefault(
 
     private static Dictionary<string, List<string>> CollectMissingTranslationsForResourceManagerSet(
         ResourceManager resourceManager,
-        IList<string> cultureNames,
+        IList<CultureInfo> cultures,
         ResourceSet resourceSet)
     {
         var result = new Dictionary<string, List<string>>(StringComparer.Ordinal);
@@ -115,28 +99,30 @@ private static Dictionary<string, List<string>> CollectMissingTranslationsForRes
                 continue;
             }
 
-            if (entry.Value is not string neutralValue)
+            foreach (var culture in cultures)
             {
-                continue;
-            }
+                var resourceSetForCulture = resourceManager.GetResourceSet(
+                    culture,
+                    createIfNotExists: true,
+                    tryParents: false);
 
-            foreach (var cultureName in cultureNames)
-            {
-                var cultureInfo = new CultureInfo(cultureName);
-                var translatedValue = resourceManager.GetString(key, cultureInfo);
+                if (resourceSetForCulture is null)
+                {
+                    continue;
+                }
 
-                if (!string.IsNullOrEmpty(translatedValue) &&
-                    translatedValue != neutralValue)
+                var translatedValue = resourceSetForCulture.GetString(key);
+                if (translatedValue is not null)
                 {
                     continue;
                 }
 
-                if (!result.ContainsKey(cultureName))
+                if (!result.ContainsKey(culture.Name))
                 {
-                    result.Add(cultureName, new List<string>());
+                    result.Add(culture.Name, new List<string>());
                 }
 
-                result[cultureName].Add(key);
+                result[culture.Name].Add(key);
             }
         }
 
@@ -145,7 +131,7 @@ private static Dictionary<string, List<string>> CollectMissingTranslationsForRes
 
     private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlaceholdersForResourceManagerSet(
         ResourceManager resourceManager,
-        IList<string> cultureNames,
+        IList<CultureInfo> cultures,
         ResourceSet resourceSet,
         IList<string>? allowSuffixTerms = null)
     {
@@ -162,10 +148,9 @@ private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlace
                 continue;
             }
 
-            foreach (var cultureName in cultureNames)
+            foreach (var culture in cultures)
             {
-                var cultureInfo = new CultureInfo(cultureName);
-                var translatedValue = resourceManager.GetString(key, cultureInfo);
+                var translatedValue = resourceManager.GetString(key, culture);
 
                 if (string.IsNullOrEmpty(translatedValue) ||
                     translatedValue == neutralValue)
@@ -181,12 +166,12 @@ private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlace
                     continue;
                 }
 
-                if (!result.ContainsKey(cultureName))
+                if (!result.ContainsKey(culture.Name))
                 {
-                    result.Add(cultureName, new List<string>());
+                    result.Add(culture.Name, new List<string>());
                 }
 
-                result[cultureName].Add(key);
+                result[culture.Name].Add(key);
             }
         }
 
@@ -195,7 +180,7 @@ private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlace
 
     private static Dictionary<string, List<string>> CollectMissingTranslationsForResourceManager(
         ResourceManager resourceManager,
-        IList<string> cultureNames)
+        IList<CultureInfo> cultures)
     {
         var resourceSet = resourceManager.GetResourceSet(
             CultureInfo.InvariantCulture,
@@ -223,7 +208,7 @@ private static Dictionary<string, List<string>> CollectMissingTranslationsForRes
 
         var resultForTranslations = CollectMissingTranslationsForResourceManagerSet(
             resourceManager,
-            cultureNames,
+            cultures,
             resourceSet);
 
         foreach (var item in resultForTranslations)
@@ -236,7 +221,7 @@ private static Dictionary<string, List<string>> CollectMissingTranslationsForRes
 
     private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlaceholdersForResourceManager(
         ResourceManager resourceManager,
-        IList<string> cultureNames,
+        IList<CultureInfo> cultures,
         IList<string>? allowSuffixTerms = null)
     {
         var resourceSet = resourceManager.GetResourceSet(
@@ -266,7 +251,7 @@ private static Dictionary<string, List<string>> CollectInvalidKeySuffixWithPlace
 
         var resultForTranslations = CollectInvalidKeySuffixWithPlaceholdersForResourceManagerSet(
             resourceManager,
-            cultureNames,
+            cultures,
             resourceSet,
             allowSuffixTerms);
 

src/Atc.XUnit/TestResultHelper.cs

@@ -189,22 +189,33 @@ public static void AssertOnTestResultsFromMissingTranslationsAndInvalidKeysSuffi
         IDictionary<string, Dictionary<string, List<string>>>? missingTranslations,
         IDictionary<string, Dictionary<string, List<string>>>? invalidKeysSuffixWithPlaceholders)
     {
+        var assemblyTotalCount = 0;
+        if (missingTranslations is not null)
+        {
+            assemblyTotalCount += missingTranslations.Sum(item => missingTranslations[item.Key].Values.Sum(x => x.Count));
+        }
+
+        if (invalidKeysSuffixWithPlaceholders is not null)
+        {
+            assemblyTotalCount += invalidKeysSuffixWithPlaceholders.Sum(item => invalidKeysSuffixWithPlaceholders[item.Key].Values.Sum(x => x.Count));
+        }
+
         var testResults = new List<TestResult>
         {
-            new($"Assembly: {assemblyName} (???)"),
+            new($"Assembly: {assemblyName} ({assemblyTotalCount})"),
         };
 
         if (missingTranslations is not null)
         {
             foreach (var item in missingTranslations)
             {
-                var totalCount = missingTranslations[item.Key].Values.Sum(x => x.Count);
-                if (totalCount == 0)
+                var resourceTotalCount = missingTranslations[item.Key].Values.Sum(x => x.Count);
+                if (resourceTotalCount == 0)
                 {
                     continue;
                 }
 
-                testResults.Add(new TestResult(isError: false, 1, $"Resource: {item.Key} ({totalCount})"));
+                testResults.Add(new TestResult(isError: false, 1, $"Resource: {item.Key} ({resourceTotalCount})"));
                 foreach (var itemForResource in item.Value)
                 {
                     testResults.Add(new TestResult(isError: false, 2, $"Missing translation values for '{itemForResource.Key}' ({itemForResource.Value.Count})"));

src/Atc/Extensions/Reflection/AssemblyExtensions.cs

@@ -1,4 +1,5 @@
 // ReSharper disable once CheckNamespace
+// ReSharper disable LoopCanBeConvertedToQuery
 namespace System.Reflection;
 
 /// <summary>
@@ -100,4 +101,33 @@ public static Type[] GetTypesInheritingFromType(this Assembly assembly, Type typ
             .Where(x => x.IsInheritedFrom(type))
             .ToArray();
     }
+
+    public static ResourceManager[] GetResourceManagers(
+        this Assembly assembly)
+    {
+        if (assembly is null)
+        {
+            throw new ArgumentNullException(nameof(assembly));
+        }
+
+        var resourceTypes = assembly.GetTypes();
+        var resourceManagers = new List<ResourceManager>();
+
+        foreach (var type in resourceTypes)
+        {
+            var property = type.GetProperty(nameof(ResourceManager), BindingFlags.Public | BindingFlags.Static);
+            if (property is null ||
+                property.PropertyType != typeof(ResourceManager))
+            {
+                continue;
+            }
+
+            var resourceManager = (ResourceManager)property.GetValue(null)!;
+            resourceManagers.Add(resourceManager);
+        }
+
+        return resourceManagers
+            .OrderBy(x => x.BaseName, StringComparer.Ordinal)
+            .ToArray();
+    }
 }

src/Atc/Helpers/CultureInfoHelper.cs

@@ -0,0 +1,31 @@
+namespace Atc.Helpers;
+
+public static class CultureInfoHelper
+{
+    public static IList<CultureInfo> GetCulturesFromNames(
+        IEnumerable<string> cultureNames)
+    {
+        if (cultureNames is null)
+        {
+            throw new ArgumentNullException(nameof(cultureNames));
+        }
+
+        var cultures = new List<CultureInfo>();
+        foreach (var cultureName in cultureNames)
+        {
+            if (cultureName.IsDigitOnly())
+            {
+                if (NumberHelper.TryParseToInt(cultureName, out var lcid))
+                {
+                    cultures.Add(new CultureInfo(lcid));
+                }
+            }
+            else
+            {
+                cultures.Add(new CultureInfo(cultureName));
+            }
+        }
+
+        return cultures;
+    }
+}