[Strategies] Remove IDependencyContainer parameter from location meth…

…od as frequently unused and can be provided in constructor.
Aleksbgbg · Jun 20, 2019 · 199107e · 199107e
1 parent 33bbf53
commit 199107e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/Wingman.Tests/Container/Strategies/HandlerStrategyTests.cs b/Wingman.Tests/Container/Strategies/HandlerStrategyTests.cs
@@ -1,5 +1,7 @@
 namespace Wingman.Tests.Container.Strategies
 {
+    using System;
+
     using Moq;
 
     using Wingman.Container;
@@ -21,7 +23,7 @@ public void TestReturnsHandlerResult()
         {
             object expectedObject = new object();
 
-            object actualObject = new HandlerStrategy(_ => expectedObject).LocateService(null);
+            object actualObject = HandlerStrategy(_ => expectedObject).LocateService();
 
             Assert.Same(expectedObject, actualObject);
         }
@@ -31,9 +33,14 @@ public void TestPassesDependencyRetrieverArgument()
         {
             IDependencyRetriever actualRetriever = null;
 
-            new HandlerStrategy(passedInRetriever => actualRetriever = passedInRetriever).LocateService(_dependencyRetrieverMock.Object);
+            HandlerStrategy(passedInRetriever => actualRetriever = passedInRetriever).LocateService();
 
             Assert.Same(_dependencyRetrieverMock.Object, actualRetriever);
         }
+
+        private HandlerStrategy HandlerStrategy(Func<IDependencyRetriever, object> handler)
+        {
+            return new HandlerStrategy(_dependencyRetrieverMock.Object, handler);
+        }
     }
 }
diff --git a/Wingman.Tests/Container/Strategies/InstanceStrategyTests.cs b/Wingman.Tests/Container/Strategies/InstanceStrategyTests.cs
@@ -12,7 +12,7 @@ public void TestReturnsImplementation()
             object expectedService = new object();
             InstanceStrategy strategy = new InstanceStrategy(expectedService);
 
-            object actualService = strategy.LocateService(null);
+            object actualService = strategy.LocateService();
 
             Assert.Equal(expectedService, actualService);
         }

diff --git a/Wingman/Container/Strategies/HandlerStrategy.cs b/Wingman/Container/Strategies/HandlerStrategy.cs
@@ -4,16 +4,19 @@
 
     public class HandlerStrategy : IServiceLocationStrategy
     {
+        private readonly IDependencyRetriever _dependencyRetriever;
+
         private readonly Func<IDependencyRetriever, object> _handler;
 
-        public HandlerStrategy(Func<IDependencyRetriever, object> handler)
+        public HandlerStrategy(IDependencyRetriever dependencyRetriever, Func<IDependencyRetriever, object> handler)
         {
+            _dependencyRetriever = dependencyRetriever;
             _handler = handler;
         }
 
-        public object LocateService(IDependencyRetriever dependencyRetriever)
+        public object LocateService()
         {
-            return _handler(dependencyRetriever);
+            return _handler(_dependencyRetriever);
         }
     }
 }
diff --git a/Wingman/Container/Strategies/IServiceLocationStrategy.cs b/Wingman/Container/Strategies/IServiceLocationStrategy.cs
@@ -2,6 +2,6 @@
 {
     internal interface IServiceLocationStrategy
     {
-        object LocateService(IDependencyRetriever dependencyRetriever);
+        object LocateService();
     }
 }
diff --git a/Wingman/Container/Strategies/InstanceStrategy.cs b/Wingman/Container/Strategies/InstanceStrategy.cs
@@ -9,7 +9,7 @@ public InstanceStrategy(object implementation)
             _implementation = implementation;
         }
 
-        public object LocateService(IDependencyRetriever dependencyRetriever)
+        public object LocateService()
         {
             return _implementation;
         }