Merge pull request #179 from oleg-nenashev/bug/Issue178_arguments

Fix #178 - Improper handling of the arguments parameter

src/Core/WinSWCore/ServiceDescriptor.cs

@@ -186,7 +186,7 @@ namespace winsw
         {
             get
             {
-                string arguments = AppendTags("argument", Defaults.Arguments);
+                string arguments = AppendTags("argument", null);
 
                 if (arguments == null)
                 {

src/Test/winswTests/ServiceDescriptorTests.cs

@@ -311,5 +311,49 @@ namespace winswTests
             var sd = ConfigXmlBuilder.create().WithTag("stoptimeout", "35 secs").ToServiceDescriptor(true);
             Assert.That(sd.StopTimeout, Is.EqualTo(TimeSpan.FromSeconds(35)));
         }
+
+        /// <summary>
+        /// https://github.com/kohsuke/winsw/issues/178
+        /// </summary>
+        [Test]
+        public void Arguments_LegacyParam()
+        {
+            var sd = ConfigXmlBuilder.create().WithTag("arguments", "arg").ToServiceDescriptor(true);
+            Assert.That(sd.Arguments, Is.EqualTo("arg"));
+        }
+
+        [Test]
+        public void Arguments_NewParam_Single()
+        {
+            var sd = ConfigXmlBuilder.create()
+                .WithTag("argument", "--arg1=2")
+                .ToServiceDescriptor(true);
+            Assert.That(sd.Arguments, Is.EqualTo(" --arg1=2"));
+        }
+
+        [Test]
+        public void Arguments_NewParam_MultipleArgs()
+        {
+            var sd = ConfigXmlBuilder.create()
+                .WithTag("argument", "--arg1=2")
+                .WithTag("argument", "--arg2=123")
+                .WithTag("argument", "--arg3=null")
+                .ToServiceDescriptor(true);
+            Assert.That(sd.Arguments, Is.EqualTo(" --arg1=2 --arg2=123 --arg3=null"));
+        }
+
+        /// <summary>
+        /// Ensures that the new single-argument field has a higher priority.
+        /// </summary>
+        [Test]
+        public void Arguments_Bothparam_Priorities()
+        {
+            var sd = ConfigXmlBuilder.create()
+                .WithTag("arguments", "--arg1=2 --arg2=3")
+                .WithTag("argument", "--arg2=123")
+                .WithTag("argument", "--arg3=null")
+                .ToServiceDescriptor(true);
+            Assert.That(sd.Arguments, Is.EqualTo(" --arg2=123 --arg3=null"));
+        }
     }
 }