github
/
winsw
mirror of https://github.com/winsw/winsw
1
0
Fork 0
Code Issues Releases Wiki Activity

ValidateAndLoadXmlSchemaTest updated with new XmlReader

pull/460/merge^2
Buddhika Chathuranga 2020-04-24 09:52:48 +05:30
parent a9b5c50a67
commit 6496b97108
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Core/WinSWCore/ServiceDescriptor.cs
View File

@ -67,7 +67,7 @@ namespace winsw
try try
{ {
ValidateAndLoadXmlSchema(); ValidateAndLoadXmlSchema(GetXMLReader());
} }
catch (XmlException e) catch (XmlException e)
{ {
@ -101,7 +101,7 @@ namespace winsw
this.dom = dom; this.dom = dom;
} }
public void ValidateAndLoadXmlSchema() public void ValidateAndLoadXmlSchema(XmlReader reader)
{ {
XmlReaderSettings settings = new XmlReaderSettings(); XmlReaderSettings settings = new XmlReaderSettings();
@ -117,11 +117,13 @@ namespace winsw
settings.ValidationType = ValidationType.Schema; settings.ValidationType = ValidationType.Schema;
settings.ValidationEventHandler += new ValidationEventHandler(XmlValidationEventHandler); settings.ValidationEventHandler += new ValidationEventHandler(XmlValidationEventHandler);
using(XmlReader reader = XmlReader.Create(BasePath + ".xml")) dom.Load(reader);
{ }
dom.Load(reader);
} private XmlReader GetXMLReader()
{
return XmlReader.Create(BasePath + ".xml");
} }
private void XmlValidationEventHandler(object sender, ValidationEventArgs e) private void XmlValidationEventHandler(object sender, ValidationEventArgs e)

12
src/Test/winswTests/ServiceDescriptorTests.cs
View File

@ -1,6 +1,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Xml;
using NUnit.Framework; using NUnit.Framework;
using winsw; using winsw;
using winsw.Native; using winsw.Native;
@ -455,15 +456,8 @@ $@"<service>
var serviceDescriptor = ServiceDescriptor.FromXML(seedXml); var serviceDescriptor = ServiceDescriptor.FromXML(seedXml);
try var reader = XmlReader.Create(new StringReader(seedXml));
{ serviceDescriptor.ValidateAndLoadXmlSchema(reader);
serviceDescriptor.ValidateAndLoadXmlSchema();
Assert.Fail();
}
catch (FileNotFoundException)
{
Assert.Pass();
}
} }
} }
} }