From c0d2d0b6e3c849339563faf0d93a1ad8d32e900d Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Fri, 23 Dec 2016 22:30:15 +0100
Subject: [PATCH] Tests: Add ExamplesTests and fix the issues in the code

---
 examples/allOptions.xml                       | 20 +++++-----
 .../Configuration/DefaultSettings.cs          |  2 +-
 .../Configuration/IWinSWConfiguration.cs      |  2 +-
 .../winswTests/Configuration/ExamplesTest.cs  | 39 +++++++++++++++++++
 src/Test/winswTests/winswTests.csproj         |  1 +
 5 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 src/Test/winswTests/Configuration/ExamplesTest.cs

diff --git a/examples/allOptions.xml b/examples/allOptions.xml
index b4814b5..7af0503 100644
--- a/examples/allOptions.xml
+++ b/examples/allOptions.xml
@@ -18,12 +18,12 @@
 -->
 
 <!--
- - This is a sample configuration of the Windows Service Wrapper.
- - This configuration file should be placed near the WinSW executable, the name should be the same.
- - E.g. for myapp.exe the configuration file name should be myapp.xml
- -
- - You can find more information about the parameters here: https://github.com/kohsuke/winsw/blob/master/doc/xmlConfigFile.md
--->
+ This is a sample configuration of the Windows Service Wrapper.
+ This configuration file should be placed near the WinSW executable, the name should be the same.
+ E.g. for myapp.exe the configuration file name should be myapp.xml
+ 
+ You can find more information about the parameters here: https://github.com/kohsuke/winsw/blob/master/doc/xmlConfigFile.md
+-->
 <configuration>
   
 <!-- 
@@ -148,9 +148,9 @@ SECTION: Executable management
     Additional arguments, which should be passed to the stop executable during termination.
     This OPTION also enables termination of the executable via stop executable
   -->
-  <!--<stoparguments>--stop true</stoparguments>-->
-  
   <!--
+  <stoparguments>-stop true</stoparguments>-->
+  -->
 <!-- 
 SECTION: Service management 
 -->
@@ -205,7 +205,9 @@ SECTION:Logging
     Sets a custom logging directory for all logs being produced by the service wrapper
     Default value: Directory, which contains the executor
   -->
-  <logpath></logpath>
+  <!--
+    <logpath>%BASE%\logs</logpath>
+  -->
   
   <!--
     OPTION: log
diff --git a/src/Core/WinSWCore/Configuration/DefaultSettings.cs b/src/Core/WinSWCore/Configuration/DefaultSettings.cs
index c7e10c8..dbe248b 100644
--- a/src/Core/WinSWCore/Configuration/DefaultSettings.cs
+++ b/src/Core/WinSWCore/Configuration/DefaultSettings.cs
@@ -33,7 +33,7 @@ namespace winsw.Configuration
         // Installation
         public bool AllowServiceAcountLogonRight { get { return false; } }
         public string ServiceAccountPassword { get { return null; } }
-        public string ServiceAccountUser { get { return null; } }
+        public string ServiceAccountUser { get { return "NULL\\NULL"; } }
         public List<winsw.Native.SC_ACTION> FailureActions { get { return new List<winsw.Native.SC_ACTION>(); } }
         public TimeSpan ResetFailureAfter { get { return TimeSpan.FromDays(1); } }
 
diff --git a/src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs b/src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs
index 4a9f621..3fb64dd 100644
--- a/src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs
+++ b/src/Core/WinSWCore/Configuration/IWinSWConfiguration.cs
@@ -5,7 +5,7 @@ using System.Xml;
 using WMI;
 namespace winsw.Configuration
 {
-    interface IWinSWConfiguration
+    public interface IWinSWConfiguration
     {
         //TODO: Document the parameters && refactor
 
diff --git a/src/Test/winswTests/Configuration/ExamplesTest.cs b/src/Test/winswTests/Configuration/ExamplesTest.cs
new file mode 100644
index 0000000..a366354
--- /dev/null
+++ b/src/Test/winswTests/Configuration/ExamplesTest.cs
@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using winsw;
+using winswTests.Util;
+
+namespace winswTests.Configuration
+{
+    /// <summary>
+    /// Tests example configuration files.
+    /// The test uses a relative path to example files, which is based on the current project structure.
+    /// </summary>
+    [TestFixture]
+    class ExamplesTest
+    {
+
+        [Test]
+        public void allOptionsConfigShouldDeclareDefaults()
+        {
+            ServiceDescriptor d = doLoad("allOptions");
+            ServiceDescriptorAssert.AssertAllOptionalPropertiesAreDefault(d);
+        }
+
+        private ServiceDescriptor doLoad(string exampleName) {
+            var dir = Directory.GetCurrentDirectory();
+            string path = dir + "\\..\\..\\..\\..\\..\\examples\\" + exampleName + ".xml";
+            if (!File.Exists(path))
+            {
+                throw new FileNotFoundException("Cannot find the XML file " + path, path);
+            }
+            XmlDocument dom = new XmlDocument();
+            dom.Load(path);
+            return new ServiceDescriptor(dom);
+        }
+    }
+}
diff --git a/src/Test/winswTests/winswTests.csproj b/src/Test/winswTests/winswTests.csproj
index 016ee3a..f3a6ace 100644
--- a/src/Test/winswTests/winswTests.csproj
+++ b/src/Test/winswTests/winswTests.csproj
@@ -55,6 +55,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\ExamplesTest.cs" />
     <Compile Include="Extensions\ExtensionTestBase.cs" />
     <Compile Include="Extensions\RunawayProcessKillerTest.cs" />
     <Compile Include="Extensions\SharedDirectoryMapperTest.cs" />