Merge pull request #552 from stormaref/master

Fix test bug
MapsterMapper · Feb 26, 2023 · 5c82daa · 5c82daa
2 parents 0e31a0b + ae0f376
commit 5c82daa
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 11 deletions.
diff --git a/src/Mapster.Tests/WhenUsingIMapFrom.cs b/src/Mapster.Tests/WhenUsingIMapFrom.cs
@@ -1,3 +1,5 @@
+using System;
+using System.Collections.Generic;
 using System.Reflection;
 using Mapster.Utils;
 using MapsterMapper;
@@ -14,7 +16,13 @@ public class WhenUsingIMapFrom
     public WhenUsingIMapFrom()
     {
         _mapper = new Mapper();
-        TypeAdapterConfig.GlobalSettings.ScanInheritedTypes(Assembly.GetExecutingAssembly());
+        var types = new List<Type>
+        {
+            typeof(SourceModel),
+            typeof(InheritedDestinationModel),
+            typeof(DestinationModel)
+        };
+        TypeAdapterConfig.GlobalSettings.ScanInheritedTypes(types);
     }
 
     [TestMethod]

diff --git a/src/Mapster/Utils/InterfaceDynamicMapper.cs b/src/Mapster/Utils/InterfaceDynamicMapper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 
@@ -7,22 +8,17 @@ namespace Mapster.Utils;
 public class InterfaceDynamicMapper
 {
     private readonly TypeAdapterConfig _config;
-    private readonly Assembly _assembly;
+    private readonly List<Type> _types;
 
-    public InterfaceDynamicMapper(TypeAdapterConfig config, Assembly assembly)
+    public InterfaceDynamicMapper(TypeAdapterConfig config, List<Type> types)
     {
         _config = config;
-        _assembly = assembly;
+        _types = types;
     }
 
     internal void ApplyMappingFromAssembly()
     {
-        var types = _assembly.GetTypes()
-            .Where(t =>
-                t.GetInterfaces()
-                    .Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IMapFrom<>)));
-
-        foreach (var type in types)
+        foreach (var type in _types)
         {
             var instance = Activator.CreateInstance(type);
             var method = GetMethod(type);

diff --git a/src/Mapster/Utils/TypeAdapterConfigExtensions.cs b/src/Mapster/Utils/TypeAdapterConfigExtensions.cs
@@ -1,3 +1,6 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
 
 namespace Mapster.Utils;
@@ -6,7 +9,22 @@ public static class TypeAdapterConfigExtensions
 {
     public static void ScanInheritedTypes(this TypeAdapterConfig config, Assembly assembly)
     {
-        InterfaceDynamicMapper dynamicMapper = new(config, assembly);
+        var types = assembly.GetTypes()
+            .Where(t =>
+                t.GetInterfaces()
+                    .Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IMapFrom<>)))
+            .ToList();
+        InterfaceDynamicMapper dynamicMapper = new(config, types);
+        dynamicMapper.ApplyMappingFromAssembly();
+    }
+
+    internal static void ScanInheritedTypes(this TypeAdapterConfig config, List<Type> types)
+    {
+        types = types.Where(t =>
+                t.GetInterfaces()
+                    .Any(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IMapFrom<>)))
+            .ToList();
+        InterfaceDynamicMapper dynamicMapper = new(config, types);
         dynamicMapper.ApplyMappingFromAssembly();
     }
 }