Refactored basic behaviour to stand-alone project

Upgraded to .NET Standard 2.0

Author: Code-Grump

Conker.sln

@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.16
+VisualStudioVersion = 15.0.26730.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conker", "src\Conker\Conker.csproj", "{A3ED62B0-6AFF-47F4-B2E7-A615D1555089}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conker", "src\Conker\Conker.csproj", "{A3ED62B0-6AFF-47F4-B2E7-A615D1555089}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conker.Spec", "test\Conker.Spec\Conker.Spec.csproj", "{DCC6B80B-FF54-4564-80CF-0C8F5E89C256}"
 EndProject
@@ -25,4 +25,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BC106EF0-0A89-4E73-99F9-04978EEC4BA8}
+	EndGlobalSection
 EndGlobal

src/Conker/Application.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Conker
+{
+    public class Application
+    {
+        private readonly Dictionary<string, (MethodInfo method, object target)> _commands
+            = new Dictionary<string, (MethodInfo method, object target)>();
+
+        public void AddCommand(string commandName, Action cmd)
+        {
+            _commands.Add(commandName, (cmd.Method, cmd.Target));
+        }
+
+        public void AddCommand(string commandName, MethodInfo handlerMethod, object target)
+        {
+            _commands.Add(commandName, (handlerMethod, target));
+        }
+
+        public void Execute(IReadOnlyList<string> args)
+        {
+            var handler = _commands[args[0]];
+
+            var arguments = new object[args.Count - 1];
+
+            // Convert argument strings to expected types.
+            var parameters = handler.method.GetParameters();
+
+            for (var i = 0; i < parameters.Length; i++)
+            {
+                arguments[i] = Convert.ChangeType(args[i + 1], parameters[i].ParameterType);
+            }
+
+            handler.method.Invoke(handler.target, arguments);
+        }
+    }
+}

src/Conker/Conker.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
 </Project>

test/Conker.Spec/CommandParsingSteps.cs

@@ -37,14 +37,17 @@ protected void Invoke(object arg1, object arg2)
             }
         }
 
-        private readonly Dictionary<string, (MethodInfo method, object target)> _commands 
-            = new Dictionary<string, (MethodInfo method, object target)>();
-
         private string _invokedCommandName;
 
-        private CommandHandler _commandHandler;
+        private CommandParsingSteps.CommandHandler _commandHandler;
 
         private static readonly Regex Whitespace = new Regex("\\s+");
+        private readonly Application _application;
+
+        public CommandParsingSteps()
+        {
+            _application = new Application();
+        }
 
         [Given(@"I have a handler for the command ""(.*)"" which doesn't take arguments")]
         public void GivenIHaveAHandlerForTheCommandWhichDoesnTTakeArguments(string commandName)
@@ -53,29 +56,17 @@ public void GivenIHaveAHandlerForTheCommandWhichDoesnTTakeArguments(string comma
 
             Action cmd = Command;
 
-            _commands.Add(commandName, (cmd.Method, cmd.Target));
+            _application.AddCommand(commandName, cmd);
         }
-        
+
         [When(@"I run my application with the args ""(.*)""")]
         public void WhenIRunMyApplicationWithTheArgs(string args)
         {
             var values = Whitespace.Split(args);
 
-            var handler = _commands[values[0]];
-
-            var arguments = new object[values.Length - 1];
-
-            // Convert argument strings to expected types.
-            var parameters = handler.method.GetParameters();
-
-            for (var i = 0; i < parameters.Length; i++)
-            {
-                arguments[i] = Convert.ChangeType(values[i + 1], parameters[i].ParameterType);
-            }
-
-            handler.method.Invoke(handler.target, arguments);
+            _application.Execute(values);
         }
-        
+
         [Then(@"the ""(.*)"" command is invoked")]
         public void ThenTheCommandIsInvoked(string commandName)
         {
@@ -110,7 +101,7 @@ public void GivenIHaveAHandlerForTheCommandWhichTakesTheFollowingArguments(strin
             var typeBuilder = moduleBuilder.DefineType(
                 "DynamicCommandHandler",
                 TypeAttributes.Public | TypeAttributes.Class,
-                typeof(CommandHandler));
+                typeof(CommandParsingSteps.CommandHandler));
 
             var constructorBuilder = typeBuilder.DefineConstructor(
                 MethodAttributes.Public | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName,
@@ -119,7 +110,7 @@ public void GivenIHaveAHandlerForTheCommandWhichTakesTheFollowingArguments(strin
 
             var constructorBodyGenerator = constructorBuilder.GetILGenerator();
 
-            var baseCtor = typeof(CommandHandler).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).Single();
+            var baseCtor = typeof(CommandParsingSteps.CommandHandler).GetConstructors(BindingFlags.NonPublic | BindingFlags.Instance).Single();
             constructorBodyGenerator.Emit(OpCodes.Ldarg_0);
             constructorBodyGenerator.Emit(OpCodes.Ldarg_1);
             constructorBodyGenerator.Emit(OpCodes.Call, baseCtor);
@@ -153,7 +144,7 @@ public void GivenIHaveAHandlerForTheCommandWhichTakesTheFollowingArguments(strin
             }
 
             // Call the protected "Invoke" method to save the arguments.
-            var captureMethod = typeof(CommandHandler)
+            var captureMethod = typeof(CommandParsingSteps.CommandHandler)
                 .GetMethods(BindingFlags.Instance | BindingFlags.NonPublic)
                 .Where(method => method.Name == "Invoke")
                 .Single(method => method.GetParameters().Length == parameters.Length);
@@ -167,11 +158,11 @@ public void GivenIHaveAHandlerForTheCommandWhichTakesTheFollowingArguments(strin
 
             void Command() => _invokedCommandName = commandName;
 
-            _commandHandler = (CommandHandler)Activator.CreateInstance(handlerType, (Action)Command);
+            _commandHandler = (CommandParsingSteps.CommandHandler)Activator.CreateInstance(handlerType, (Action)Command);
 
             var handlerMethod = handlerType.GetMethod("Handle");
 
-            _commands.Add(commandName, (handlerMethod, _commandHandler));
+            _application.AddCommand(commandName, handlerMethod, _commandHandler);
         }
 
         [Then(@"the ""(.*)"" command is invoked with the following arguments")]

test/Conker.Spec/Conker.Spec.csproj

@@ -17,6 +17,8 @@
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <TargetFrameworkProfile />