Merge pull request #95 from Pondidum/commandline-di

CommandLine DI
DarthFubuMVC · Dec 2, 2015 · 8f3ec2b · 8f3ec2b
2 parents 44ec1e1 + 7420fb4
commit 8f3ec2b
Show file tree

Hide file tree

Showing 7 changed files with 105 additions and 5 deletions.
diff --git a/src/FubuCore.Testing/CommandLine/ActivatorCommandCreatorTests.cs b/src/FubuCore.Testing/CommandLine/ActivatorCommandCreatorTests.cs
@@ -0,0 +1,51 @@
+using System;
+using FubuCore.CommandLine;
+using FubuTestingSupport;
+using NUnit.Framework;
+
+namespace FubuCore.Testing.CommandLine
+{
+    public class ActivatorCommandCreatorTests
+    {
+        [Test]
+        public void builds_an_instance_with_no_ctor_parameters()
+        {
+            var creator = new ActivatorCommandCreator();
+            var instance = creator.Create(typeof (NoParamsCommand));
+
+            instance.ShouldBeOfType<NoParamsCommand>();
+        }
+
+        [Test]
+        public void throws_if_the_ctor_has_parameters()
+        {
+            var creator = new ActivatorCommandCreator();
+
+            Assert.Throws<MissingMethodException>(() => creator.Create(typeof (ParamsCommand)));
+        }
+
+        public class FakeModel
+        {
+        }
+
+        private class NoParamsCommand : FubuCommand<FakeModel>
+        {
+            public override bool Execute(FakeModel input)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+
+        private class ParamsCommand : FubuCommand<FakeModel>
+        {
+            public ParamsCommand(string testArgument)
+            {
+            }
+
+            public override bool Execute(FakeModel input)
+            {
+                throw new System.NotImplementedException();
+            }
+        }
+    }
+}
diff --git a/src/FubuCore.Testing/CommandLine/CommandFactoryTester.cs b/src/FubuCore.Testing/CommandLine/CommandFactoryTester.cs
@@ -3,6 +3,7 @@
 using FubuCore.CommandLine;
 using FubuTestingSupport;
 using NUnit.Framework;
+using Rhino.Mocks;
 
 namespace FubuCore.Testing.CommandLine
 {
@@ -205,8 +206,23 @@ public void build_command_with_multiargs()
             input.ThirdFlag.ShouldBeTrue();
         }
 
-    }
+        [Test]
+        public void build_command_with_a_replacement_commandcreator()
+        {
+            var creator = MockRepository.GenerateMock<ICommandCreator>();
+            creator.Stub(c => c.Create(typeof (MyCommand)))
+                .Repeat.Once()
+                .Return(new MyCommand());
+
+            var factory = new CommandFactory(creator);
+            factory.RegisterCommands(GetType().Assembly);
+
+            var cmd = factory.Build("my");
 
+            creator.VerifyAllExpectations();
+            cmd.ShouldBeOfType<MyCommand>();
+        }
+    }
 
     public class RebuildAuthorizationCommand : FubuCommand<MyCommandInput>
     {

diff --git a/src/FubuCore.Testing/FubuCore.Testing.csproj b/src/FubuCore.Testing/FubuCore.Testing.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Binding\ConversionPropertyBinderTester.cs" />
     <Compile Include="Binding\ConverterFamilyTester.cs" />
     <Compile Include="Binding\ConvertProblemTester.cs" />
+    <Compile Include="CommandLine\ActivatorCommandCreatorTests.cs" />
     <Compile Include="CommandLine\DumpCommandSmokeTester.cs" />
     <Compile Include="Csv\ColumnDefinitionTester.cs" />
     <Compile Include="Csv\ColumnExpressionTester.cs" />

diff --git a/src/FubuCore/CommandLine/ActivatorCommandCreator.cs b/src/FubuCore/CommandLine/ActivatorCommandCreator.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace FubuCore.CommandLine
+{
+    public class ActivatorCommandCreator : ICommandCreator
+    {
+        public IFubuCommand Create(Type commandType)
+        {
+            return Activator.CreateInstance(commandType).As<IFubuCommand>();
+        }
+    }
+}
diff --git a/src/FubuCore/CommandLine/CommandFactory.cs b/src/FubuCore/CommandLine/CommandFactory.cs
@@ -12,8 +12,19 @@ public class CommandFactory : ICommandFactory
     {
         private static readonly string[] _helpCommands = new []{"help", "?"}; 
         private readonly Cache<string, Type> _commandTypes = new Cache<string, Type>();
+        private readonly ICommandCreator _commandCreator;
         private string _appName;
 
+        public CommandFactory()
+        {
+            _commandCreator = new ActivatorCommandCreator();
+        }
+
+        public CommandFactory(ICommandCreator creator)
+        {
+            _commandCreator = creator;
+        }
+
         public CommandRun BuildRun(string commandLine)
         {
             var args = StringTokenizer.Tokenize(commandLine);
@@ -125,15 +136,13 @@ public void RegisterCommands(Assembly assembly)
 
         public IEnumerable<IFubuCommand> BuildAllCommands()
         {
-            return _commandTypes.Select(x => {
-                return Activator.CreateInstance(x).As<IFubuCommand>();
-            });
+            return _commandTypes.Select(x => _commandCreator.Create(x));
         }
 
 
         public IFubuCommand Build(string commandName)
         {
-            return (IFubuCommand) Activator.CreateInstance(_commandTypes[commandName.ToLower()]);
+            return _commandCreator.Create(_commandTypes[commandName.ToLower()]);
         }
 
 

diff --git a/src/FubuCore/CommandLine/ICommandCreator.cs b/src/FubuCore/CommandLine/ICommandCreator.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace FubuCore.CommandLine
+{
+    public interface ICommandCreator
+    {
+        IFubuCommand Create(Type commandType);
+    }
+}
diff --git a/src/FubuCore/FubuCore.csproj b/src/FubuCore/FubuCore.csproj
@@ -113,10 +113,12 @@
     <Compile Include="Binding\Values\NamedKeyValues.cs" />
     <Compile Include="Binding\Values\ValueReport.cs" />
     <Compile Include="Binding\Values\ValueReportBase.cs" />
+    <Compile Include="CommandLine\ActivatorCommandCreator.cs" />
     <Compile Include="CommandLine\ArgPreprocessor.cs" />
     <Compile Include="CommandLine\DumpUsagesCommand.cs" />
     <Compile Include="CommandLine\EnumerableFlag.cs" />
     <Compile Include="CommandLine\FlagAliases.cs" />
+    <Compile Include="CommandLine\ICommandCreator.cs" />
     <Compile Include="CommandLine\InvalidUsageException.cs" />
     <Compile Include="CommandLine\UsageReport.cs" />
     <Compile Include="Configuration\SettingsData.cs" />