Commit 3bc78081 authored by mrbean-bremen's avatar mrbean-bremen Committed by mrbean-bremen
Browse files

Added existing file path for MultiThreadingTest

- fixed a few other tests by using the Svg DTD Resolver to avoid web requests
parent 0b5f4ccb
...@@ -25,10 +25,8 @@ namespace Svg.UnitTests ...@@ -25,10 +25,8 @@ namespace Svg.UnitTests
[TestMethod] [TestMethod]
[Ignore]
public void TestOperatingPlanRendering() public void TestOperatingPlanRendering()
{ {
// FIXME: loading file times out - probably regression
LoadSvg(GetXMLDocFromResource()); LoadSvg(GetXMLDocFromResource());
} }
......
...@@ -124,6 +124,7 @@ namespace Svg.UnitTests ...@@ -124,6 +124,7 @@ namespace Svg.UnitTests
{ {
Trace.WriteLine("Load XmlDocument from resource data."); Trace.WriteLine("Load XmlDocument from resource data.");
var xmlDoc = new XmlDocument(); var xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = new SvgDtdResolver();
xmlDoc.Load(s); xmlDoc.Load(s);
Trace.WriteLine("Done XmlDocument loading from resource data."); Trace.WriteLine("Done XmlDocument loading from resource data.");
return xmlDoc; return xmlDoc;
...@@ -151,7 +152,7 @@ namespace Svg.UnitTests ...@@ -151,7 +152,7 @@ namespace Svg.UnitTests
protected virtual XmlDocument GetXMLDocFromFile(string file) protected virtual XmlDocument GetXMLDocFromFile(string file)
{ {
if (!File.Exists(file)) if (!File.Exists(file))
Assert.Fail("Test file missing." + Directory.GetCurrentDirectory() + file); Assert.Fail("Test file missing.", file);
var xmlDoc = new XmlDocument(); var xmlDoc = new XmlDocument();
xmlDoc.LoadXml(File.ReadAllText(file)); xmlDoc.LoadXml(File.ReadAllText(file));
......
...@@ -16,10 +16,8 @@ namespace Svg.UnitTests ...@@ -16,10 +16,8 @@ namespace Svg.UnitTests
private const string PureTextElementSvg = "Issue_TextElement.Text.svg"; private const string PureTextElementSvg = "Issue_TextElement.Text.svg";
[TestMethod] [TestMethod]
[Ignore]
public void TestSvgTextElementDeepCopy() public void TestSvgTextElementDeepCopy()
{ {
// FIXME: test currently times out during loading the file stream
var svgDocument = OpenSvg(GetResourceXmlDoc(GetFullResourceString(PureTextElementSvg))); var svgDocument = OpenSvg(GetResourceXmlDoc(GetFullResourceString(PureTextElementSvg)));
CheckDocument(svgDocument); CheckDocument(svgDocument);
...@@ -46,10 +44,12 @@ namespace Svg.UnitTests ...@@ -46,10 +44,12 @@ namespace Svg.UnitTests
memoryStream.Seek(0, SeekOrigin.Begin); memoryStream.Seek(0, SeekOrigin.Begin);
var xmlDocument = new XmlDocument(); var xmlDocument = new XmlDocument();
xmlDocument.XmlResolver = new SvgDtdResolver();
xmlDocument.Load(memoryStream); xmlDocument.Load(memoryStream);
Assert.AreEqual(2, xmlDocument.ChildNodes.Count); // the first node is the added DTD declaration
var svgNode = xmlDocument.ChildNodes[1]; Assert.AreEqual(3, xmlDocument.ChildNodes.Count);
var svgNode = xmlDocument.ChildNodes[2];
// Filter all significant whitespaces. // Filter all significant whitespaces.
var svgChildren = svgNode.ChildNodes var svgChildren = svgNode.ChildNodes
......
...@@ -13,10 +13,8 @@ namespace Svg.UnitTests ...@@ -13,10 +13,8 @@ namespace Svg.UnitTests
{ {
[TestMethod] [TestMethod]
[Ignore]
public void TextPropertyAffectsSvgOutput() public void TextPropertyAffectsSvgOutput()
{ {
// FIXME: test currently times out, maybe regression
var document = new SvgDocument(); var document = new SvgDocument();
document.Children.Add(new SvgText { Text = "test1" }); document.Children.Add(new SvgText { Text = "test1" });
using(var stream = new MemoryStream()) using(var stream = new MemoryStream())
...@@ -25,6 +23,7 @@ namespace Svg.UnitTests ...@@ -25,6 +23,7 @@ namespace Svg.UnitTests
stream.Position = 0; stream.Position = 0;
var xmlDoc = new XmlDocument(); var xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = new SvgDtdResolver();
xmlDoc.Load(stream); xmlDoc.Load(stream);
Assert.AreEqual("test1", xmlDoc.DocumentElement.FirstChild.InnerText); Assert.AreEqual("test1", xmlDoc.DocumentElement.FirstChild.InnerText);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment