Additional unit tests.

sblom · sblom · commit f20f867e30b8 · 2013-05-22T12:22:02.000-07:00
diff --git a/src/ScriptCs/Command/ExecuteReplCommand.cs b/src/ScriptCs/Command/ExecuteReplCommand.cs
@@ -20,6 +20,8 @@ internal class ExecuteReplCommand : IScriptCommand
         private readonly ILog _logger;
         private readonly IConsole _console;
 
+        public string[] ScriptArgs { get; private set; }
+
         public ExecuteReplCommand(
             IFileSystem fileSystem,
             IScriptPackResolver scriptPackResolver,
diff --git a/src/ScriptCs/Command/ExecuteScriptCommand.cs b/src/ScriptCs/Command/ExecuteScriptCommand.cs
@@ -10,7 +10,6 @@ namespace ScriptCs.Command
     internal class ExecuteScriptCommand : IScriptCommand
     {
         private readonly string _script;
-        private readonly string[] _scriptArgs;
         private readonly IFileSystem _fileSystem;
         private readonly IScriptExecutor _scriptExecutor;
         private readonly IScriptPackResolver _scriptPackResolver;
@@ -27,14 +26,16 @@ public ExecuteScriptCommand(string script,
             IAssemblyName assemblyName)
         {
             _script = script;
-            _scriptArgs = scriptArgs;
+            ScriptArgs = scriptArgs;
             _fileSystem = fileSystem;
             _scriptExecutor = scriptExecutor;
             _scriptPackResolver = scriptPackResolver;
             _logger = logger;
             _assemblyName = assemblyName;
         }
 
+        public string[] ScriptArgs { get; private set; }
+
         public CommandResult Execute()
         {
             try
@@ -47,7 +48,7 @@ public CommandResult Execute()
                     assemblyPaths = GetAssemblyPaths(workingDirectory);
                 }
 
-                _scriptExecutor.Execute(_script, _scriptArgs, assemblyPaths, _scriptPackResolver.GetPacks());
+                _scriptExecutor.Execute(_script, ScriptArgs, assemblyPaths, _scriptPackResolver.GetPacks());
                 return CommandResult.Success;
             }
             catch (Exception ex)
diff --git a/src/ScriptCs/Command/ICommand.cs b/src/ScriptCs/Command/ICommand.cs
@@ -2,7 +2,9 @@
 
 namespace ScriptCs.Command
 {
-    public interface IScriptCommand : ICommand { }
+    public interface IScriptCommand : ICommand {
+        string[] ScriptArgs { get; }
+    }
 
     public interface IRestoreCommand : ICommand { }
 
diff --git a/test/ScriptCs.Core.Tests/ScriptHostTests.cs b/test/ScriptCs.Core.Tests/ScriptHostTests.cs
@@ -29,7 +29,18 @@ public TheGetMethod()
             public void ShoulGetScriptPackFromScriptPackManagerWhenInvoked()
             {
                 var result = _scriptHost.Require<IScriptPackContext>();
-                _mockScriptPackManager.Verify(s=>s.Get<IScriptPackContext>());
+                _mockScriptPackManager.Verify(s => s.Get<IScriptPackContext>());
+            }
+        }
+
+        public class TheConstructor
+        {
+            [Fact]
+            public void ShouldSetScriptArgsWhenConstructed()
+            {
+                var scriptArgs = new string[0];
+                var scriptHost = new ScriptHost(null, scriptArgs);
+                scriptHost.ScriptArgs.ShouldEqual(scriptArgs);
             }
         }
     }
diff --git a/test/ScriptCs.Tests/CommandFactoryTests.cs b/test/ScriptCs.Tests/CommandFactoryTests.cs
@@ -206,6 +206,23 @@ public void ShouldReturnHelpCommandWhenHelpIsPassed()
 
                 result.ShouldImplement<IHelpCommand>();
             }
+
+            [Fact]
+            public void ShouldPassScriptArgsToExecuteCommandConstructor()
+            {
+                var args = new ScriptCsArgs
+                {
+                    AllowPreRelease = false,
+                    Install = null,
+                    ScriptName = "test.csx"
+                };
+
+                var scriptArgs = new string[0];
+                var factory = new CommandFactory(CreateRoot());
+                var result = factory.CreateCommand(args, scriptArgs) as IScriptCommand;
+
+                result.ScriptArgs.ShouldEqual(scriptArgs);
+            }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace ScriptCs.Command`
`10`	`10`	`internal class ExecuteScriptCommand : IScriptCommand`
`11`	`11`	`{`
`12`	`12`	`private readonly string _script;`
`13`		`- private readonly string[] _scriptArgs;`
`14`	`13`	`private readonly IFileSystem _fileSystem;`
`15`	`14`	`private readonly IScriptExecutor _scriptExecutor;`
`16`	`15`	`private readonly IScriptPackResolver _scriptPackResolver;`
`@@ -27,14 +26,16 @@ public ExecuteScriptCommand(string script,`
`27`	`26`	`IAssemblyName assemblyName)`
`28`	`27`	`{`
`29`	`28`	`_script = script;`
`30`		`- _scriptArgs = scriptArgs;`
	`29`	`+ ScriptArgs = scriptArgs;`
`31`	`30`	`_fileSystem = fileSystem;`
`32`	`31`	`_scriptExecutor = scriptExecutor;`
`33`	`32`	`_scriptPackResolver = scriptPackResolver;`
`34`	`33`	`_logger = logger;`
`35`	`34`	`_assemblyName = assemblyName;`
`36`	`35`	`}`
`37`	`36`
	`37`	`+ public string[] ScriptArgs { get; private set; }`
	`38`	`+`
`38`	`39`	`public CommandResult Execute()`
`39`	`40`	`{`
`40`	`41`	`try`
`@@ -47,7 +48,7 @@ public CommandResult Execute()`
`47`	`48`	`assemblyPaths = GetAssemblyPaths(workingDirectory);`
`48`	`49`	`}`
`49`	`50`
`50`		`- _scriptExecutor.Execute(_script, _scriptArgs, assemblyPaths, _scriptPackResolver.GetPacks());`
	`51`	`+ _scriptExecutor.Execute(_script, ScriptArgs, assemblyPaths, _scriptPackResolver.GetPacks());`
`51`	`52`	`return CommandResult.Success;`
`52`	`53`	`}`
`53`	`54`	`catch (Exception ex)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace ScriptCs.Command`
`4`	`4`	`{`
`5`		`- public interface IScriptCommand : ICommand { }`
	`5`	`+ public interface IScriptCommand : ICommand {`
	`6`	`+ string[] ScriptArgs { get; }`
	`7`	`+ }`
`6`	`8`
`7`	`9`	`public interface IRestoreCommand : ICommand { }`
`8`	`10`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,18 @@ public TheGetMethod()`
`29`	`29`	`public void ShoulGetScriptPackFromScriptPackManagerWhenInvoked()`
`30`	`30`	`{`
`31`	`31`	`var result = _scriptHost.Require<IScriptPackContext>();`
`32`		`- _mockScriptPackManager.Verify(s=>s.Get<IScriptPackContext>());`
	`32`	`+ _mockScriptPackManager.Verify(s => s.Get<IScriptPackContext>());`
	`33`	`+ }`
	`34`	`+ }`
	`35`	`+`
	`36`	`+ public class TheConstructor`
	`37`	`+ {`
	`38`	`+ [Fact]`
	`39`	`+ public void ShouldSetScriptArgsWhenConstructed()`
	`40`	`+ {`
	`41`	`+ var scriptArgs = new string[0];`
	`42`	`+ var scriptHost = new ScriptHost(null, scriptArgs);`
	`43`	`+ scriptHost.ScriptArgs.ShouldEqual(scriptArgs);`
`33`	`44`	`}`
`34`	`45`	`}`
`35`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,23 @@ public void ShouldReturnHelpCommandWhenHelpIsPassed()`
`206`	`206`
`207`	`207`	`result.ShouldImplement<IHelpCommand>();`
`208`	`208`	`}`
	`209`	`+`
	`210`	`+ [Fact]`
	`211`	`+ public void ShouldPassScriptArgsToExecuteCommandConstructor()`
	`212`	`+ {`
	`213`	`+ var args = new ScriptCsArgs`
	`214`	`+ {`
	`215`	`+ AllowPreRelease = false,`
	`216`	`+ Install = null,`
	`217`	`+ ScriptName = "test.csx"`
	`218`	`+ };`
	`219`	`+`
	`220`	`+ var scriptArgs = new string[0];`
	`221`	`+ var factory = new CommandFactory(CreateRoot());`
	`222`	`+ var result = factory.CreateCommand(args, scriptArgs) as IScriptCommand;`
	`223`	`+`
	`224`	`+ result.ScriptArgs.ShouldEqual(scriptArgs);`
	`225`	`+ }`
`209`	`226`	`}`
`210`	`227`	`}`
`211`	`228`	`}`