Consolidated handling of isUnique parameter for TryGet (fixes ninject…

…#378)
lord-executor · Dec 17, 2020 · c158dda · c158dda
1 parent 3ff6bda
commit c158dda
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/Ninject.Test/Integration/ReadOnlyKernelTests.cs b/src/Ninject.Test/Integration/ReadOnlyKernelTests.cs
@@ -360,8 +360,8 @@ public void TryGet_ServiceAndParameters()
                 bindings.Should().OnlyContain(b => !b.IsImplicit);
             }
 
-            [Fact(Skip = "Unique?")]
-            public void TryGet_ServiceAndNameAndParameters_ResolvesUsingFirstMatchingBindingWhenTypeIsSelfBinding()
+            [Fact()]
+            public void TryGet_ServiceAndNameAndParameters_WhenTypeIsSelfBinding()
             {
                 var service = typeof(Sword);
 
@@ -371,17 +371,16 @@ public void TryGet_ServiceAndNameAndParameters_ResolvesUsingFirstMatchingBinding
                 Kernel = Configuration.BuildReadOnlyKernel();
 
                 var weapon = Kernel.TryGet(service, "a", Array.Empty<IParameter>());
-                weapon.Should().NotBeNull();
-                weapon.Should().BeOfType<Sword>();
+                weapon.Should().BeNull();
 
                 var bindings = Kernel.GetBindings(service);
                 bindings.Should().HaveCount(2);
                 bindings.Should().OnlyContain(b => !b.IsImplicit);
             }
 
 
-            [Fact(Skip = "Unique?")]
-            public void TryGet_ServiceAndNameAndParameters_ResolvesUsingFirstMatchingBindingWhenTypeIsNotSelfBinding()
+            [Fact()]
+            public void TryGet_ServiceAndNameAndParameters_WhenTypeIsNotSelfBinding()
             {
                 var service = typeof(IWeapon);
 
@@ -391,16 +390,15 @@ public void TryGet_ServiceAndNameAndParameters_ResolvesUsingFirstMatchingBinding
                 Kernel = Configuration.BuildReadOnlyKernel();
 
                 var weapon = Kernel.TryGet(service, "a", Array.Empty<IParameter>());
-                weapon.Should().NotBeNull();
-                weapon.Should().BeOfType<Sword>();
+                weapon.Should().BeNull();
 
                 var bindings = Kernel.GetBindings(service);
                 bindings.Should().HaveCount(2);
                 bindings.Should().OnlyContain(b => !b.IsImplicit);
             }
 
-            [Fact(Skip = "Unique?")]
-            public void TryGet_ServiceAndConstraintAndParameters_ResolvesUsingFirstMatchingBindingWhenTypeIsSelfBinding()
+            [Fact()]
+            public void TryGet_ServiceAndConstraintAndParameters_WhenTypeIsSelfBinding()
             {
                 var service = typeof(Sword);
 
@@ -412,16 +410,15 @@ public void TryGet_ServiceAndConstraintAndParameters_ResolvesUsingFirstMatchingB
 
                 var weapon = Kernel.TryGet(service, (metadata) => metadata.Name == "a", Array.Empty<IParameter>());
 
-                weapon.Should().NotBeNull();
-                weapon.Should().BeOfType<Sword>();
+                weapon.Should().BeNull();
 
                 var bindings = Kernel.GetBindings(service);
                 bindings.Should().HaveCount(3);
                 bindings.Should().OnlyContain(b => !b.IsImplicit);
             }
 
-            [Fact(Skip ="Unique?")]
-            public void TryGet_ServiceAndConstraintAndParameters_ResolvesUsingFirstMatchingBindingWhenTypeIsNotSelfBindingAndNotGeneric()
+            [Fact()]
+            public void TryGet_ServiceAndConstraintAndParameters_WhenTypeIsNotSelfBindingAndNotGeneric()
             {
                 var service = typeof(IWeapon);
 
@@ -432,8 +429,7 @@ public void TryGet_ServiceAndConstraintAndParameters_ResolvesUsingFirstMatchingB
 
                 var weapon = Kernel.TryGet(service, (metadata) => metadata.Name == "a", Array.Empty<IParameter>());
 
-                weapon.Should().NotBeNull();
-                weapon.Should().BeOfType<Sword>();
+                weapon.Should().BeNull();
 
                 var bindings = Kernel.GetBindings(service);
                 bindings.Should().HaveCount(2);

diff --git a/src/Ninject/Syntax/ResolutionExtensions.cs b/src/Ninject/Syntax/ResolutionExtensions.cs
@@ -281,7 +281,7 @@ public static object TryGet(this IResolutionRoot root, Type service, params IPar
         /// </returns>
         public static object TryGet(this IResolutionRoot root, Type service, string name, params IParameter[] parameters)
         {
-            return TryGet(() => ResolveSingle(root, service, b => b.Name == name, parameters, true, false));
+            return TryGet(() => ResolveSingle(root, service, b => b.Name == name, parameters, true, true));
         }
 
         /// <summary>
@@ -296,7 +296,7 @@ public static object TryGet(this IResolutionRoot root, Type service, string name
         /// </returns>
         public static object TryGet(this IResolutionRoot root, Type service, Func<IBindingMetadata, bool> constraint, params IParameter[] parameters)
         {
-            return TryGet(() => ResolveSingle(root, service, constraint, parameters, true, false));
+            return TryGet(() => ResolveSingle(root, service, constraint, parameters, true, true));
         }
 
         /// <summary>