ValidateAndLoadXmlSchemaTest updated.

src/Core/WinSWCore/ServiceDescriptor.cs

@@ -103,7 +103,10 @@ namespace winsw
 
         public void ValidateAndLoadXmlSchema(XmlReader reader)
         {
-            XmlReaderSettings settings = new XmlReaderSettings();
+            XmlReaderSettings settings =  new XmlReaderSettings();
+
+            settings.ValidationType = ValidationType.Schema;
+            settings.ValidationEventHandler += new ValidationEventHandler(XmlValidationEventHandler);
 
             Assembly a = Assembly.GetExecutingAssembly();
 
@@ -115,10 +118,9 @@ namespace winsw
                 }
             }
 
-            settings.ValidationType = ValidationType.Schema;
+            var new_reader = XmlReader.Create(reader, settings);
-            settings.ValidationEventHandler += new ValidationEventHandler(XmlValidationEventHandler);
 
-            dom.Load(reader);
+            dom.Load(new_reader);
         }
 
         private XmlReader GetXMLReader()

src/Test/winswTests/ServiceDescriptorTests.cs

@@ -448,15 +448,19 @@ $@"<service>
         [Test]
         public void ValidateAndLoadXmlSchemaTest()
         {
-            const string seedXml = "<service>" +
+            const string seedXml = @"<service>
-  "<id>myapp</id> " +
+                                        <id>myapp</id>
-  "<name>MyApp Service (powered by WinSW)</name>" +
+                                        <name>appname</name>
-  "<description>This service is a service created from a minimal configuration</description>" +
+                                        <description>app description</description>
-"</service>";
+                                        <executable>jenkins</executable>
+                                   </service>";
+
+            
+            var dom = new XmlDocument();
+            dom.LoadXml(seedXml);
+            var serviceDescriptor = new ServiceDescriptor(dom);
 
-            var serviceDescriptor = ServiceDescriptor.FromXML(seedXml);
             var reader = XmlReader.Create(new StringReader(seedXml));
-
             Assert.That(() => serviceDescriptor.ValidateAndLoadXmlSchema(reader), Throws.TypeOf<XmlException>());
         }
     }