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

ValidateAndLoadXmlSchemaTest updated.

pull/460/merge^2
Buddhika Chathuranga 2020-04-30 12:17:16 +05:30
parent 4597cfa8ce
commit ea74b8e5ab
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
settings.ValidationEventHandler += new ValidationEventHandler(XmlValidationEventHandler);
var new_reader = XmlReader.Create(reader, settings);
dom.Load(reader);
dom.Load(new_reader);
}
private XmlReader GetXMLReader()

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

@ -448,15 +448,19 @@ $@"<service>
[Test]
public void ValidateAndLoadXmlSchemaTest()
{
const string seedXml = "<service>" +
"<id>myapp</id> " +
"<name>MyApp Service (powered by WinSW)</name>" +
"<description>This service is a service created from a minimal configuration</description>" +
"</service>";
const string seedXml = @"<service>
<id>myapp</id>
<name>appname</name>
<description>app description</description>
<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>());
}
}