fill the ReferencedAssemblyNames property for all loaded assemblies

Fixes issue TNG#311 Signed-off-by: Karl Rhenius <[email protected]>
made-by-karl · Oct 25, 2024 · 7bb008e · 7bb008e
1 parent 7fd68bc
commit 7bb008e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/ArchUnitNET/Domain/Assembly.cs b/ArchUnitNET/Domain/Assembly.cs
@@ -6,7 +6,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using JetBrains.Annotations;
 
 namespace ArchUnitNET.Domain
 {
@@ -16,7 +15,7 @@ public Assembly(
             string name,
             string fullName,
             bool isOnlyReferenced,
-            [CanBeNull] List<string> referencedAssemblyNames
+            List<string> referencedAssemblyNames
         )
         {
             Name = name;
@@ -29,7 +28,6 @@ [CanBeNull] List<string> referencedAssemblyNames
 
         public string Name { get; }
 
-        [CanBeNull]
         public List<string> ReferencedAssemblyNames { get; }
         public string FullName { get; }
 

diff --git a/ArchUnitNET/Loader/ArchBuilder.cs b/ArchUnitNET/Loader/ArchBuilder.cs
@@ -50,11 +50,10 @@ public ArchBuilder()
 
         public void AddAssembly(
             [NotNull] AssemblyDefinition moduleAssembly,
-            bool isOnlyReferenced,
-            [CanBeNull] IEnumerable<AssemblyNameReference> moduleReferences
+            bool isOnlyReferenced
         )
         {
-            var references = moduleReferences?.Select(reference => reference.Name).ToList();
+            var references = moduleAssembly.MainModule.AssemblyReferences.Select(reference => reference.Name).ToList();
 
             if (!_assemblyRegistry.ContainsAssembly(moduleAssembly.Name.FullName))
             {

diff --git a/ArchUnitNET/Loader/ArchLoader.cs b/ArchUnitNET/Loader/ArchLoader.cs
@@ -134,7 +134,7 @@ private void LoadModule(
                 var processedAssemblies = new List<AssemblyNameReference> { module.Assembly.Name };
                 var resolvedModules = new List<ModuleDefinition>();
                 _assemblyResolver.AddLib(module.Assembly);
-                _archBuilder.AddAssembly(module.Assembly, false, module.AssemblyReferences);
+                _archBuilder.AddAssembly(module.Assembly, false);
                 foreach (var assemblyReference in module.AssemblyReferences)
                 {
                     if (includeDependencies && recursive)
@@ -157,7 +157,7 @@ private void LoadModule(
                                 var assemblyDefinition =
                                     _assemblyResolver.Resolve(assemblyReference)
                                     ?? throw new AssemblyResolutionException(assemblyReference);
-                                _archBuilder.AddAssembly(assemblyDefinition, false, null);
+                                _archBuilder.AddAssembly(assemblyDefinition, false);
                                 resolvedModules.AddRange(assemblyDefinition.Modules);
                             }
                         }
@@ -203,7 +203,7 @@ FilterFunc filterFunc
                 var filterResult = filterFunc?.Invoke(assemblyDefinition);
                 if (filterResult?.LoadThisAssembly != false)
                 {
-                    _archBuilder.AddAssembly(assemblyDefinition, false, null);
+                    _archBuilder.AddAssembly(assemblyDefinition, false);
                     resolvedModules.AddRange(assemblyDefinition.Modules);
                 }
 

diff --git a/ArchUnitNETTests/Loader/ArchLoaderTests.cs b/ArchUnitNETTests/Loader/ArchLoaderTests.cs
@@ -41,12 +41,18 @@ public void SameFullNameInMultipleAssemblies()
         [Fact]
         public void LoadAssembliesIncludingRecursiveDependencies()
         {
-            var archUnitNetTestArchitectureWithRecursiveDependencies = new ArchLoader()
+            var architecture = new ArchLoader()
                 .LoadAssembliesIncludingDependencies(new[] { typeof(BaseClass).Assembly }, true)
                 .Build();
 
             Assert.True(
-                archUnitNetTestArchitectureWithRecursiveDependencies.Assemblies.Count() > 100
+                architecture.Assemblies.Count() > 100
+            );
+
+            // Check for well-known assemblies, that ReferencedAssemblyNames is not empty
+            Assert.All(
+                architecture.Assemblies.Where(x => x.Name.StartsWith("ArchUnit")),
+                x => Assert.NotEmpty(x.ReferencedAssemblyNames)
             );
         }
 
@@ -63,6 +69,12 @@ public void LoadAssembliesRecursivelyWithCustomFilter()
                 .Build();
 
             Assert.Equal(3, architecture.Assemblies.Count());
+
+            // Check that ReferencedAssemblyNames is not empty
+            Assert.All(
+                architecture.Assemblies,
+                x => Assert.NotEmpty(x.ReferencedAssemblyNames)
+            );
         }
 
         [Fact]