Allow multiple Register<T> with Resolve<IEnumerable<T>>

dansiegel · Jun 29, 2020 · 117fd60 · 117fd60
1 parent 94481af
commit 117fd60
Show file tree

Hide file tree

Showing 4 changed files with 95 additions and 3 deletions.
diff --git a/tests/Prism.Container.Extensions.Shared.Tests/Mocks/GenericService.cs b/tests/Prism.Container.Extensions.Shared.Tests/Mocks/GenericService.cs
@@ -9,6 +9,11 @@ public class GenericService : IGenericService
         public string Name { get; set; }
     }
 
+    public class AltGenericService : IGenericService
+    {
+        public string Name { get; set; }
+    }
+
     public interface IGenericService
     {
         string Name { get; }

diff --git a/tests/Prism.DryIoc.Extensions.Tests/ContainerTests.cs b/tests/Prism.DryIoc.Extensions.Tests/ContainerTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Prism.Container.Extensions.Shared.Mocks;
 using Prism.Container.Extensions.Shared.Tests;
 using Prism.Container.Extensions.Tests.Mocks;
@@ -414,6 +415,34 @@ public void ResolveNamedInstance()
             Assert.Same(genB, c.Resolve<IGenericService>("genB"));
         }
 
+        [Fact]
+        public void ResolveTakesLastIn()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            Assert.IsType<AltGenericService>(c.Resolve<IGenericService>());
+        }
+
+        [Fact]
+        public void ResolveEnumerableResolvesAll()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            IEnumerable<IGenericService> all = null;
+            var ex = Record.Exception(() => all = c.Resolve<IEnumerable<IGenericService>>());
+
+            Assert.Null(ex);
+            Assert.NotNull(all);
+            Assert.NotEmpty(all);
+            Assert.Equal(2, all.Count());
+            Assert.Contains(all, x => x is GenericService);
+            Assert.Contains(all, x => x is AltGenericService);
+        }
+
         public static IFoo FooFactory() => new Foo { Message = "expected" };
 
         public static IBar BarFactoryWithIContainerProvider(IContainerProvider containerProvider) =>

diff --git a/tests/Prism.Microsoft.DependencyInjection.Extensions.Tests/ContainerTests.cs b/tests/Prism.Microsoft.DependencyInjection.Extensions.Tests/ContainerTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Prism.Container.Extensions.Shared.Mocks;
 using Prism.Container.Extensions.Shared.Tests;
@@ -516,6 +517,34 @@ public void ResolveNamedInstance()
             }
         }
 
+        [Fact]
+        public void ResolveTakesLastIn()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            Assert.IsType<AltGenericService>(c.Resolve<IGenericService>());
+        }
+
+        [Fact]
+        public void ResolveEnumerableResolvesAll()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            IEnumerable<IGenericService> all = null;
+            var ex = Record.Exception(() => all = c.Resolve<IEnumerable<IGenericService>>());
+
+            Assert.Null(ex);
+            Assert.NotNull(all);
+            Assert.NotEmpty(all);
+            Assert.Equal(2, all.Count());
+            Assert.Contains(all, x => x is GenericService);
+            Assert.Contains(all, x => x is AltGenericService);
+        }
+
         public static IFoo FooFactory() => new Foo { Message = "expected" };
 
         public static IBar BarFactoryWithIContainerProvider(IContainerProvider containerProvider) =>

diff --git a/tests/Prism.Unity.Extensions.Tests/ContainerTests.cs b/tests/Prism.Unity.Extensions.Tests/ContainerTests.cs
@@ -1,13 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Unity;
+using System.Linq;
+using Prism.Container.Extensions.Shared.Mocks;
+using Prism.Container.Extensions.Shared.Tests;
 using Prism.Container.Extensions.Tests.Mocks;
 using Prism.Ioc;
+using Unity;
 using Xunit;
 using Xunit.Abstractions;
-using Prism.Container.Extensions.Shared.Mocks;
-using Prism.Container.Extensions.Shared.Tests;
 
 namespace Prism.Unity.Extensions.Tests
 {
@@ -501,6 +502,34 @@ public void ResolveNamedInstance()
             }
         }
 
+        [Fact]
+        public void ResolveTakesLastIn()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            Assert.IsType<AltGenericService>(c.Resolve<IGenericService>());
+        }
+
+        [Fact(Skip = "Not Supported on Unity")]
+        public void ResolveEnumerableResolvesAll()
+        {
+            var c = CreateContainer();
+            c.Register<IGenericService, GenericService>();
+            c.Register<IGenericService, AltGenericService>();
+
+            IEnumerable<IGenericService> all = null;
+            var ex = Record.Exception(() => all = c.Resolve<IEnumerable<IGenericService>>());
+
+            Assert.Null(ex);
+            Assert.NotNull(all);
+            Assert.NotEmpty(all);
+            Assert.Equal(2, all.Count());
+            Assert.Contains(all, x => x is GenericService);
+            Assert.Contains(all, x => x is AltGenericService);
+        }
+
         public static IFoo FooFactory() => new Foo { Message = "expected" };
 
         public static IBar BarFactoryWithIContainerProvider(IContainerProvider containerProvider) =>