Merge branch 'hotfix-1.3.7'

Author: Pete

packaging/chocolatey/Setup.Install.nuspec

@@ -0,0 +1,150 @@
+namespace ServicePulse.Host.Tests
+{
+    using NUnit.Framework;
+    using ServicePulse.Host.Hosting;
+
+    [TestFixture]
+    public class CaseLessOptionSetTests
+    {
+        bool flag;
+        private OptionSet testOptions;
+
+        [SetUp]
+        public void Setup()
+        {
+            testOptions = new CaseLessOptionSet
+            {
+                {
+                    "t|test",
+                    "Test option",
+                    key => { flag = true; }
+                }
+            };
+        }
+        
+        [Test]
+        public void LowercaseTestShouldSucceed()
+        {
+            flag = false;
+            testOptions.Parse(new[]{"-test"});
+            Assert.IsTrue(flag, "-test did not parse as a valid option");
+        }
+
+        [Test]
+        public void MixedCaseTestShouldSucceed()
+        {
+            flag = false;
+            testOptions.Parse(new[] { "-Test" });
+            Assert.IsTrue(flag, "-Test did not parse as a valid option");
+        }
+
+        [Test]
+        public void UppercaseTestShouldSucceed()
+        {
+            flag = false;
+            testOptions.Parse(new[] { "-TEST" });
+            Assert.IsTrue(flag, "-TEST did not parse as a valid option");
+        }
+
+        [Test]
+        public void ShortTestShouldSucceed()
+        {
+            flag = false;
+            testOptions.Parse(new[] { "-t" });
+            Assert.IsTrue(flag, "-TEST did not parse as a valid option");
+        }
+
+        [Test]
+        public void ShortTestShouldFail()
+        {
+            flag = false;
+            testOptions.Parse(new[] { "-x" });
+            Assert.IsFalse(flag, "-x should not parse as a valid option");
+        }
+
+        [Test]
+        public void Ensure_MultiSet_Option_Work()
+        {
+            
+            const string validUrl = @"http://localhost:1010/sp/";
+            var executionMode = ExecutionMode.Run;
+            
+            var installOptions = new CaseLessOptionSet
+            {
+                {
+                    "?|h|help",
+                    "Help about the command line options.",
+                    key => { }
+                },
+                {
+                    "i|install",
+                    @"Install the endpoint as a Windows service.",
+                    s =>{executionMode = ExecutionMode.Install;}
+                },
+                {
+                    "servicename=",
+                    @"Specify the service name for the installed service.",
+                    s => {  }
+                },
+                {
+                    "servicecontrolurl=",
+                    @"Configures the service control url.",
+                    s => {  }
+                },
+                {
+                    "url=",
+                    @"Configures ServicePulse to listen on the specified url.",
+                    s => {  }
+                }
+            };
+
+
+            var extractOptions = new CaseLessOptionSet
+            {
+                {
+                    "?|h|help",
+                    "Help about the command line options.",
+                    key => { }
+                },
+                {
+                    "e|extract",
+                    @"Extract files to be installed in a Web Server.",
+                    s => {executionMode = ExecutionMode.Extract;}
+                },
+                {
+                    "servicecontrolurl=",
+                    @"Configures the service control url.",
+                    s => { }
+                },
+                {
+                    "outpath=",
+                    @"The output path to extract files to. By default it extracts to the current directory.",
+                    s => {  }
+                }
+            };
+
+            var path = @"c:\foo\bar";
+            var args = new[]
+            {
+                "-e",
+                $"--servicecontrolurl={validUrl}",
+                $"--outpath={path}"
+            };
+
+
+            installOptions.Parse(args);
+            Assert.IsTrue(executionMode == ExecutionMode.Run);
+            extractOptions.Parse(args);
+            Assert.IsTrue(executionMode == ExecutionMode.Extract);
+        }
+
+
+        [Test]
+        public void ReturnsUnknownArguments()
+        {
+            var unknownArgs = testOptions.Parse(new[] { "-test", "-unknown" });
+            Assert.IsTrue(unknownArgs.Count == 1, "Unknown argument was not detected");
+            Assert.IsTrue(unknownArgs[0].Equals("-unknown"), "Unknown argument was not returned");
+        }
+    }
+}

src/ServicePulse.Chocolatey.sln

@@ -0,0 +1,134 @@
+namespace ServicePulse.Host.Tests
+{
+    using System;
+    using NUnit.Framework;
+    using ServicePulse.Host.Hosting;
+
+    [TestFixture]
+    public class HostArgumentsTests
+    {
+        string[] args;
+        const string validUrl = @"http://localhost:1010/sp/";
+        const string invalidUrl = @"http//localhost:1010/sp/";
+
+        [Test]
+        public void Run_Args_Unknown_Argument_Shows_Help()
+        {
+            args = new[]
+            {
+                "--foobar"
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.Help, "Unknown argument did not set help flag");
+        }
+
+        [Test]
+        public void Run_Args_No_Arguments_Is_Valid()
+        {
+            // No Arguments
+            args = new string[] {};
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Run, "With no args execution mode should be run");
+            Assert.IsFalse(hostArgs.Help, "With no args help should not be triggered");
+        }
+
+        [Test]
+        public void Run_Args_With_Valid_URL()
+        {
+            args = new[]
+            {
+                $"--url={validUrl}"
+            };
+
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Run, "With only valid url args execution mode should be run");
+            Assert.IsFalse(hostArgs.Help, "With only valid url arguments help should not be triggered");
+            Assert.IsTrue(hostArgs.Url.Equals(validUrl, StringComparison.Ordinal), "Valid url argument was not parsed correctly");
+        }
+
+        [Test]
+        public void Run_Args_With_Invalid_URL()
+        {
+           
+            args = new[]
+            {
+                $"--url={invalidUrl}"
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.Help, "With invalid url argument help should be triggered");
+        }
+
+        [Test]
+        public void Run_Args_Extra_Args_Trigger_help()
+        {
+            
+            args = new[]
+            {
+                $"--url={validUrl}",
+                $"--serviceControlUrl={validUrl}"    //ServiceControl URL isn't valid in run mode. Needs to be manually set
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.Help, "With extra arguments help should be triggered");
+        }
+        
+        [Test]
+        public void Extract_Args_With_Defaults()
+        {
+            args = new[]
+            {
+                "-extract"
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsFalse(hostArgs.Help, "extract argument should not show help");
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Extract, "extract argument did not parse to correct execution mode");
+        }
+
+        [Test]
+        public void Extract_Args_With_SC_Specified()
+        {
+            args = new[]
+            {
+                "-extract",
+                $"--serviceControlUrl={validUrl}"
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsFalse(hostArgs.Help, "extract argument should not show help");
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Extract, "extract argument did not parse to correct execution mode");
+            Assert.IsTrue(hostArgs.ServiceControlUrl.Equals(validUrl, StringComparison.Ordinal), "ServiceControlUrl argument was not parsed correctly");
+        }
+
+        [Test]
+        public void Extract_Args_With_Output_Specified()
+        {
+            var path = @"c:\foo\bar";
+            args = new[]
+            {
+                "-extract",
+                $"--outPath={path}"
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Extract, "extract argument did not parse to correct execution mode");
+            Assert.IsFalse(hostArgs.Help, "extract argument should not show help");
+            Assert.IsTrue(hostArgs.OutputPath.Equals(path, StringComparison.Ordinal), "outpath argument was not parsed correctly");
+        }
+        
+        [Test]
+        public void Extract_Args_With_All_Params_Specified()
+        {
+            var path = @"c:\foo\bar";
+            args = new[]
+            {
+                "-e",
+                $"--servicecontrolurl={validUrl}",
+                $"--outpath={path}"
+
+            };
+            var hostArgs = new HostArguments(args);
+            Assert.IsTrue(hostArgs.executionMode == ExecutionMode.Extract, "extract argument did not parse to correct execution mode");
+            Assert.IsFalse(hostArgs.Help, "extract argument should not show help");
+            Assert.IsTrue(hostArgs.OutputPath.Equals(path, StringComparison.Ordinal), "outpath argument was not parsed correctly");
+            Assert.IsTrue(hostArgs.ServiceControlUrl.Equals(validUrl, StringComparison.Ordinal), "ServiceControlUrl argument was not parsed correctly");
+        }
+    }
+}
+

src/ServicePulse.Host.Tests/CommandLineTests/CaseLessOptionSetTests.cs

@@ -0,0 +1,26 @@
+## Setting up javascript unit tests
+
+We use Resharper to manage our development javascript tests
+
+First, install [PhantomJs](http://phantomjs.org/), a headless browser. It comes as a zip, don't forget to unlock the zip before extracting it. I put mine here `C:\Apps\phantomjs-2.0.0-windows\bin\phantomjs.exe`.
+
+From the Resharper menu in Visual Studio select Options...
+
+In the Tasks tab expand Unit Testing and highlight Javascript Tests 
+
+You will need to
+
+- Enable [QUnit](http://qunitjs.com/) support  
+- Enable [Jasmine](http://jasmine.github.io/) support 
+- Set the Jasmine version to 2.0
+- You will need to specify path to the PhantomJS.exe. 
+- Add the command line arguments `--proxy-type=none`
+- Optionally add a path to a custom html harness `SpecsRunner.html`
+
+
+Like this 
+
+<img src="readme_fig_1.png" />
+
+
+When you open up a javascript test file you will be able to run the test like you would a regular C# unit test.

src/ServicePulse.Host.Tests/CommandLineTests/HostArgsTests.cs

@@ -45,11 +45,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CommandLineTests\CaseLessOptionSetTests.cs" />
+    <Compile Include="CommandLineTests\HostArgsTests.cs" />
     <Compile Include="VerifyAppConstantsJSTextReplacement.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\packages\PhantomJS.2.0.0\tools\phantomjs\phantomjs.exe">
@@ -65,6 +68,7 @@
     <Content Include="phantomjs-license.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="README_fig_1.PNG" />
     <Content Include="Scripts\jasmine-samples\Player.js" />
     <Content Include="Scripts\jasmine-samples\PlayerSpec.js" />
     <Content Include="Scripts\jasmine-samples\Song.js" />
@@ -84,7 +88,12 @@
     <Content Include="tests\js\_references.js" />
     <Content Include="tests\js\services\services.spec.js" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\ServicePulse.Host\ServicePulse.Host.csproj">
+      <Project>{d120b791-bd1b-4e06-b4e1-69801a73209b}</Project>
+      <Name>ServicePulse.Host</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.