Updated EnumerableTypeCreator to support more enumerable types and st…

…rong type handling on ReadOnly types (#88) Fixed bug in TypeCreatorBase which evaluated the wrong type on Create Added performance fix on DefaultTypeResolver to not search for types when a List<object> or List<T> scenario could be supported Closes #71
roryprimrose · May 2, 2020 · f2e13e7 · f2e13e7
1 parent c9dfb2e
commit f2e13e7
Show file tree

Hide file tree

Showing 11 changed files with 296 additions and 258 deletions.
diff --git a/ModelBuilder.Synchronous.UnitTests/ModelBuilder.Synchronous.UnitTests.csproj b/ModelBuilder.Synchronous.UnitTests/ModelBuilder.Synchronous.UnitTests.csproj
@@ -12,7 +12,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="nsubstitute" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/ModelBuilder.UnitTests/DefaultTypeResolverTests.cs b/ModelBuilder.UnitTests/DefaultTypeResolverTests.cs
@@ -3,7 +3,6 @@
     using System;
     using System.Collections;
     using System.Collections.Generic;
-    using System.Collections.ObjectModel;
     using System.IO;
     using FluentAssertions;
     using ModelBuilder.UnitTests.Models;
@@ -25,9 +24,9 @@ public DefaultTypeResolverTests(ITestOutputHelper output)
         [InlineData(typeof(ICollection), typeof(List<object>))]
         [InlineData(typeof(IList), typeof(List<object>))]
         [InlineData(typeof(IEnumerable<Person>), typeof(List<Person>))]
-        [InlineData(typeof(ICollection<Person>), typeof(Collection<Person>))]
+        [InlineData(typeof(ICollection<Person>), typeof(List<Person>))]
         [InlineData(typeof(IList<Person>), typeof(List<Person>))]
-        [InlineData(typeof(IReadOnlyCollection<Person>), typeof(ReadOnlyCollection<Person>))]
+        [InlineData(typeof(IReadOnlyCollection<Person>), typeof(List<Person>))]
         [InlineData(typeof(IDictionary<Guid, Person>), typeof(Dictionary<Guid, Person>))]
         public void CanCreateEnumerableTypesFromInterfacesWithExpectedResolutionPriority(Type requestedType,
             Type expectedType)

diff --git a/ModelBuilder.UnitTests/ModelBuilder.UnitTests.csproj b/ModelBuilder.UnitTests/ModelBuilder.UnitTests.csproj
@@ -11,9 +11,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NodaTime" Version="2.4.7" />
+    <PackageReference Include="NodaTime" Version="2.4.8" />
     <PackageReference Include="nsubstitute" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/ModelBuilder.UnitTests/Models/IInterfaceCollection.cs b/ModelBuilder.UnitTests/Models/IInterfaceCollection.cs
@@ -0,0 +1,8 @@
+namespace ModelBuilder.UnitTests.Models
+{
+    using System.Collections.Generic;
+
+    public interface IInterfaceCollection<T> : IList<T>
+    {
+    }
+}
diff --git a/ModelBuilder.UnitTests/Models/MultipleGenericArguments.cs b/ModelBuilder.UnitTests/Models/MultipleGenericArguments.cs
@@ -0,0 +1,6 @@
+namespace ModelBuilder.UnitTests.Models
+{
+    public class MultipleGenericArguments<TKey, TValue>
+    {
+    }
+}
diff --git a/ModelBuilder.UnitTests/Scenarios/ScenarioTests.cs b/ModelBuilder.UnitTests/Scenarios/ScenarioTests.cs
@@ -69,8 +69,34 @@ public void CanCreateCustomBuildConfigurationToCreateModels()
             Guid.Parse(actual.Address.AddressLine1).Should().NotBeEmpty();
         }
 
+        [Theory]
+        [InlineData(typeof(IEnumerable<string>))]
+        [InlineData(typeof(ICollection<string>))]
+        [InlineData(typeof(Collection<string>))]
+        [InlineData(typeof(IList<string>))]
+        [InlineData(typeof(List<string>))]
+        [InlineData(typeof(LinkedList<string>))]
+        [InlineData(typeof(InheritedGenericCollection))]
+        [InlineData(typeof(HashSet<string>))]
+        [InlineData(typeof(IList<KeyValuePair<string, Guid>>))]
+        [InlineData(typeof(List<KeyValuePair<string, Guid>>))]
+        [InlineData(typeof(List<MultipleGenericArguments<string, Guid>>))]
+        [InlineData(typeof(IList<MultipleGenericArguments<string, Guid>>))]
+        [InlineData(typeof(Collection<KeyValuePair<string, Guid>>))]
+        [InlineData(typeof(ICollection<KeyValuePair<string, Guid>>))]
+        [InlineData(typeof(IReadOnlyCollection<int>))]
+        [InlineData(typeof(IReadOnlyList<int>))]
+        [InlineData(typeof(IDictionary<string, Person>))]
+        [InlineData(typeof(Dictionary<string, Person>))]
+        public void CanCreateEnumerableTypes(Type type)
+        {
+            var actual = Model.Create(type);
+
+            actual.As<IEnumerable>().Should().NotBeEmpty();
+        }
+
         [Fact]
-        public void CanCreateEnumerableTypes()
+        public void CanCreateInstanceWithEnumerablePropertyTypes()
         {
             var actual = Model.Create<EnumerableParent>();
 
@@ -81,22 +107,6 @@ public void CanCreateEnumerableTypes()
             actual.List.Should().NotBeEmpty();
         }
 
-        [Theory]
-        [InlineData(typeof(IEnumerable))]
-        [InlineData(typeof(ICollection))]
-        [InlineData(typeof(IList))]
-        [InlineData(typeof(IEnumerable<Person>))]
-        [InlineData(typeof(ICollection<Person>))]
-        [InlineData(typeof(IList<Person>))]
-        [InlineData(typeof(IReadOnlyCollection<Person>))]
-        [InlineData(typeof(IDictionary<Guid, Person>))]
-        public void CanCreateEnumerableTypesFromInterfaces(Type type)
-        {
-            var actual = Model.Create(type);
-
-            actual.As<IEnumerable>().Should().NotBeEmpty();
-        }
-
         [Fact]
         public void CanCreateInstanceWithoutProperties()
         {
@@ -110,7 +120,7 @@ public void CanCreateReadOnlyCollection()
         {
             var actual = Model.Create<IReadOnlyCollection<Person>>();
 
-            actual.Should().BeOfType<ReadOnlyCollection<Person>>();
+            actual.Should().BeOfType<List<Person>>();
             actual.Should().NotBeEmpty();
         }