Index: xword/ContentFiltering/Test/Office/Word/Cleaners/CommentsRemoverTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/CommentsRemoverTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/CommentsRemoverTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -61,8 +62,21 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new CommentsRemover().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + + Assert.IsTrue(canLoadXML); } } } Index: xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectAttributesCleanerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectAttributesCleanerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectAttributesCleanerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -28,13 +29,17 @@ [TestFixtureSetUp] public void GlobalSetup() { - initialHTML = "Title" + initialHTML = "Title" + +"" + +"" + "

text

" + "

text

" + "" + "red text" + ""; - expectedHTML = "Title" + expectedHTML = "Title" + +"" + +"" + "

text

" + "

text

" + "

copyright notes

" @@ -44,8 +49,21 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new CorrectAttributesCleaner().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectTagsClosingCleanerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectTagsClosingCleanerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/CorrectTagsClosingCleanerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -42,6 +43,7 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; IHTMLCleaner tagClosingCleaner1 = new CorrectTagsClosingCleaner("img"); initialHTML1 = tagClosingCleaner1.Clean(initialHTML1); @@ -50,6 +52,19 @@ Assert.AreEqual(initialHTML1, expectedHTML1); Assert.AreEqual(initialHTML2, expectedHTML2); + + try + { + new XmlDocument().LoadXml(initialHTML1); + new XmlDocument().LoadXml(initialHTML2); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/DoctypeRemoverTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/DoctypeRemoverTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/DoctypeRemoverTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -41,9 +42,20 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; IHTMLCleaner doctypeRemover = new DoctypeRemover(); initialHTML = doctypeRemover.Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/EmptyParagraphsCleanerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/EmptyParagraphsCleanerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/EmptyParagraphsCleanerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -46,8 +47,19 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new EmptyParagraphsCleaner().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/HeadSectionRemoverTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/HeadSectionRemoverTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/HeadSectionRemoverTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -37,8 +38,19 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new HeadSectionRemover().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/ListCharsCleanerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/ListCharsCleanerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/ListCharsCleanerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -35,8 +36,19 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new ListCharsCleaner().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } Index: xword/ContentFiltering/Test/Office/Word/Cleaners/NbspBetweenTagsRemoverTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/NbspBetweenTagsRemoverTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/NbspBetweenTagsRemoverTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -35,8 +36,19 @@ [Test] public void Test() { + bool canLoadXML = false; initialHTML = new NbspBetweenTagsRemover().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/NbspReplacerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/NbspReplacerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/NbspReplacerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -35,8 +36,19 @@ [Test] public void Test() { + bool canLoadXML = false; initialHTML = new NbspReplacer().Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/OfficeNameSpacesTagsRemoverTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/OfficeNameSpacesTagsRemoverTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/OfficeNameSpacesTagsRemoverTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -46,9 +47,20 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; IHTMLCleaner officeNameSpaceCleaner = new OfficeNameSpacesTagsRemover(); initialHTML = officeNameSpaceCleaner.Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); } } } \ No newline at end of file Index: xword/ContentFiltering/Test/Office/Word/Cleaners/XmlNamespaceDefinitionsReplacerTest.cs =================================================================== --- xword/ContentFiltering/Test/Office/Word/Cleaners/XmlNamespaceDefinitionsReplacerTest.cs (revision 22465) +++ xword/ContentFiltering/Test/Office/Word/Cleaners/XmlNamespaceDefinitionsReplacerTest.cs (working copy) @@ -4,6 +4,7 @@ using System.Text; using NUnit.Framework; using ContentFiltering.Office.Word.Cleaners; +using System.Xml; namespace ContentFiltering.Test.Office.Word.Cleaners { @@ -45,8 +46,19 @@ [Test] public void TestCleaner() { + bool canLoadXML = false; initialHTML = new XmlNamespaceDefinitionsReplacer(newTag).Clean(initialHTML); Assert.AreEqual(initialHTML, expectedHTML); + try + { + new XmlDocument().LoadXml(initialHTML); + canLoadXML = true; + } + catch + { + canLoadXML = false; + } + Assert.IsTrue(canLoadXML); }