From 18d58db8f55062ecab497e85028e35ed2674a39b Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Fri, 16 Dec 2005 14:06:42 +0000 Subject: * XmlTextWriterTests.cs: No longer derive from deprecated Assertion class. Added WriteDocType tests. * XmlWriterTests.cs: No longer derive from deprecated Assertion class. svn path=/trunk/mcs/; revision=54531 --- mcs/class/System.XML/Test/System.Xml/ChangeLog | 6 + .../Test/System.Xml/XmlTextWriterTests.cs | 715 +++++++++++++-------- .../System.XML/Test/System.Xml/XmlWriterTests.cs | 51 +- 3 files changed, 461 insertions(+), 311 deletions(-) (limited to 'mcs/class/System.XML') diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog index bf8a08e36ad..f27a9df5595 100644 --- a/mcs/class/System.XML/Test/System.Xml/ChangeLog +++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog @@ -1,3 +1,9 @@ +2005-12-16 Gert Driesen + + * XmlTextWriterTests.cs: No longer derive from deprecated Assertion + class. Added WriteDocType tests. + * XmlWriterTests.cs: No longer derive from deprecated Assertion class. + 2005-12-15 Konstantin Triger * XmlTextWriterTests.cs: added WriteCDataNull test. diff --git a/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs index b52cac41251..216a2b73f12 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlTextWriterTests.cs @@ -10,6 +10,7 @@ // using System; +using System.Globalization; using System.IO; using System.Text; using System.Xml; @@ -19,7 +20,7 @@ using NUnit.Framework; namespace MonoTests.System.Xml { [TestFixture] - public class XmlTextWriterTests : Assertion + public class XmlTextWriterTests { StringWriter sw; XmlTextWriter xtw; @@ -43,7 +44,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("foo"); xtw.WriteAttributeString("bar", "baz"); xtw.WriteAttributeString ("xmlns", "abc", null, "http://abc.def"); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText, "WriteCData had incorrect output."); } [Test] - public void CDataNull () - { - xtw.WriteCData (null); - AssertEquals ("WriteCData had incorrect output.", "", StringWriterText); - } + public void CDataNull () + { + xtw.WriteCData (null); + Assert.AreEqual ("", StringWriterText, "WriteCData had incorrect output."); + } [Test] [ExpectedException (typeof (ArgumentException))] @@ -190,7 +188,8 @@ namespace MonoTests.System.Xml xtw.WriteStartElement("bar"); xtw.WriteStartElement("baz"); xtw.Close(); - AssertEquals ("Close didn't write out end elements properly.", "", StringWriterText); + Assert.AreEqual ("", StringWriterText, + "Close didn't write out end elements properly."); } [Test] @@ -205,54 +204,46 @@ namespace MonoTests.System.Xml try { xtw.WriteCData ("foo"); - Fail ("WriteCData after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { + Assert.Fail ("WriteCData after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { // Don't rely on English message assertion. // It is enough to check an exception occurs. -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + // Assert.AreEqual ("The Writer is closed.", e.Message, "Exception message is incorrect."); } try { xtw.WriteComment ("foo"); - Fail ("WriteComment after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + Assert.Fail ("WriteComment after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { + // Assert.AreEqual ("The Writer is closed.", e.Message, "Exception message is incorrect."); } try { xtw.WriteProcessingInstruction ("foo", "bar"); - Fail ("WriteProcessingInstruction after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + Assert.Fail ("WriteProcessingInstruction after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { + // Assert.AreEqual ("The Writer is closed.", e.Message, "Exception message is incorrect."); } try { xtw.WriteStartElement ("foo", "bar", "baz"); - Fail ("WriteStartElement after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + Assert.Fail ("WriteStartElement after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { + // Assert.AreEqual ("The Writer is closed.", e.Message, "Exception message is incorrect."); } - try - { + try { xtw.WriteAttributeString ("foo", "bar"); - Fail ("WriteAttributeString after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) - { -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + Assert.Fail ("WriteAttributeString after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { + // Assert.AreEqual ("Exception message is incorrect.", "The Writer is closed.", e.Message); } try { xtw.WriteString ("foo"); - Fail ("WriteString after Close Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { -// AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message); + Assert.Fail ("WriteString after Close Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { + // Assert.AreEqual ("The Writer is closed.", e.Message, "Exception message is incorrect."); } } @@ -260,7 +251,7 @@ namespace MonoTests.System.Xml public void CommentValid () { xtw.WriteComment ("foo"); - AssertEquals ("WriteComment had incorrect output.", "", StringWriterText); + Assert.AreEqual ("", StringWriterText, "WriteComment had incorrect output."); } [Test] @@ -268,21 +259,19 @@ namespace MonoTests.System.Xml { try { xtw.WriteComment("foo-"); - Fail("Should have thrown an ArgumentException."); - } - catch (ArgumentException) { } + Assert.Fail("Should have thrown an ArgumentException."); + } catch (ArgumentException) { } try { xtw.WriteComment("foo-->bar"); - Fail("Should have thrown an ArgumentException."); - } - catch (ArgumentException) { } + Assert.Fail("Should have thrown an ArgumentException."); + } catch (ArgumentException) { } } [Test] public void ConstructorsAndBaseStream () { - Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (null, this.xtw.BaseStream)); + Assert.IsTrue (Object.ReferenceEquals (null, this.xtw.BaseStream), "BaseStream property returned wrong value."); MemoryStream ms; StreamReader sr; @@ -296,8 +285,8 @@ namespace MonoTests.System.Xml sr = new StreamReader (ms, Encoding.Unicode); string expectedXmlDeclaration = ""; string actualXmlDeclaration = sr.ReadToEnd(); - AssertEquals (expectedXmlDeclaration, actualXmlDeclaration); - Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (ms, xtw.BaseStream)); + Assert.AreEqual (expectedXmlDeclaration, actualXmlDeclaration); + Assert.IsTrue (Object.ReferenceEquals (ms, xtw.BaseStream), "BaseStream property returned wrong value."); ms = new MemoryStream (); xtw = new XmlTextWriter (ms, new UnicodeEncoding ()); @@ -305,7 +294,7 @@ namespace MonoTests.System.Xml xtw.Flush (); ms.Seek (0, SeekOrigin.Begin); sr = new StreamReader (ms, Encoding.Unicode); - AssertEquals ("", sr.ReadToEnd ()); + Assert.AreEqual ("", sr.ReadToEnd ()); ms = new MemoryStream (); xtw = new XmlTextWriter (ms, new UTF8Encoding ()); @@ -313,7 +302,7 @@ namespace MonoTests.System.Xml xtw.Flush (); ms.Seek (0, SeekOrigin.Begin); sr = new StreamReader (ms, Encoding.UTF8); - AssertEquals ("", sr.ReadToEnd ()); + Assert.AreEqual ("", sr.ReadToEnd ()); ms = new MemoryStream (); xtw = new XmlTextWriter (ms, null); @@ -321,7 +310,7 @@ namespace MonoTests.System.Xml xtw.Flush (); ms.Seek (0, SeekOrigin.Begin); sr = new StreamReader (ms, Encoding.UTF8); - AssertEquals ("", sr.ReadToEnd ()); + Assert.AreEqual ("", sr.ReadToEnd ()); ms = new MemoryStream (); xtw = new XmlTextWriter (ms, null); @@ -329,37 +318,35 @@ namespace MonoTests.System.Xml xtw.Flush (); ms.Seek (0, SeekOrigin.Begin); sr = new StreamReader (ms, Encoding.UTF8); - AssertEquals ("", sr.ReadToEnd ()); - Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (ms, xtw.BaseStream)); + Assert.AreEqual ("", sr.ReadToEnd ()); + Assert.IsTrue (Object.ReferenceEquals (ms, xtw.BaseStream), "BaseStream property returned wrong value."); } [Test] public void DocumentStart () { xtw.WriteStartDocument (); - AssertEquals ("XmlDeclaration is incorrect.", "", StringWriterText); + Assert.AreEqual ("", StringWriterText, + "XmlDeclaration is incorrect."); - try - { + try { xtw.WriteStartDocument (); - Fail("Should have thrown an InvalidOperationException."); - } - catch (InvalidOperationException) { + Assert.Fail("Should have thrown an InvalidOperationException."); + } catch (InvalidOperationException) { // Don't rely on English message assertion. // It is enough to check an exception occurs. -// AssertEquals ("Exception message is incorrect.", -// "WriteStartDocument should be the first call.", e.Message); + // Assert.AreEqual ("WriteStartDocument should be the first call.", e.Message, "Exception message is incorrect."); } xtw = new XmlTextWriter (sw = new StringWriter ()); xtw.QuoteChar = '\''; xtw.WriteStartDocument (true); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); xtw = new XmlTextWriter (sw = new StringWriter ()); xtw.QuoteChar = '\''; xtw.WriteStartDocument (false); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -368,7 +355,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("ped", "foo", "urn:foo"); xtw.WriteStartAttribute ("ped", "foo", "urn:foo"); xtw.WriteEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -378,7 +365,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("test", "foo", "'"); xtw.WriteEndElement (); // MS.NET output is : xmlns:test=''' - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -386,26 +373,26 @@ namespace MonoTests.System.Xml { xtw.WriteStartElement ("foo"); xtw.WriteEndElement (); - AssertEquals ("Incorrect output.", "", StringWriterText); + Assert.AreEqual ("", StringWriterText, "Incorrect output."); } [Test] public void ElementWriteElementString () { xtw.WriteElementString ("foo", "bar"); - AssertEquals ("WriteElementString has incorrect output.", "bar", StringWriterText); + Assert.AreEqual ("bar", StringWriterText, "WriteElementString has incorrect output."); xtw.WriteElementString ("baz", ""); - AssertEquals ("bar", StringWriterText); + Assert.AreEqual ("bar", StringWriterText); xtw.WriteElementString ("quux", null); - AssertEquals ("bar", StringWriterText); + Assert.AreEqual ("bar", StringWriterText); xtw.WriteElementString ("", "quuux"); - AssertEquals ("bar<>quuux", StringWriterText); + Assert.AreEqual ("bar<>quuux", StringWriterText); xtw.WriteElementString (null, "quuuux"); - AssertEquals ("bar<>quuux<>quuuux", StringWriterText); + Assert.AreEqual ("bar<>quuux<>quuuux", StringWriterText); } [Test] @@ -416,7 +403,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("foo"); xtw.WriteElementString ("bar", ""); xtw.Close (); - AssertEquals (String.Format ("{0}{0} {0}", Environment.NewLine), StringWriterText); + Assert.AreEqual (String.Format ("{0}{0} {0}", Environment.NewLine), StringWriterText); } [Test] @@ -429,7 +416,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("bar"); xtw.WriteElementString ("baz", ""); xtw.Close (); - AssertEquals (String.Format ("{0}{0}xx{0}xxxx{0}xx{0}", Environment.NewLine), StringWriterText); + Assert.AreEqual (String.Format ("{0}{0}xx{0}xxxx{0}xx{0}", Environment.NewLine), StringWriterText); } [Test] @@ -445,7 +432,7 @@ namespace MonoTests.System.Xml xtw.WriteString (" walks slowly."); xtw.WriteEndElement (); xtw.WriteEndElement (); - AssertEquals (String.Format ("
    {0}
  1. The big Elephant walks slowly.
    2. {0}
", Environment.NewLine), StringWriterText); + Assert.AreEqual (String.Format ("
    {0}
  1. The big Elephant walks slowly.
    2. {0}
", Environment.NewLine), StringWriterText); } [Test] @@ -456,18 +443,18 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("one"); xtw.WriteAttributeString ("xmlns", "foo", null, "http://abc.def"); xtw.WriteAttributeString ("xmlns", "bar", null, "http://ghi.jkl"); - AssertEquals ("foo", xtw.LookupPrefix ("http://abc.def")); - AssertEquals ("bar", xtw.LookupPrefix ("http://ghi.jkl")); + Assert.AreEqual ("foo", xtw.LookupPrefix ("http://abc.def")); + Assert.AreEqual ("bar", xtw.LookupPrefix ("http://ghi.jkl")); xtw.WriteEndElement (); xtw.WriteStartElement ("two"); xtw.WriteAttributeString ("xmlns", "baz", null, "http://mno.pqr"); xtw.WriteString("quux"); - AssertEquals ("baz", xtw.LookupPrefix ("http://mno.pqr")); - AssertNull (xtw.LookupPrefix ("http://abc.def")); - AssertNull (xtw.LookupPrefix ("http://ghi.jkl")); + Assert.AreEqual ("baz", xtw.LookupPrefix ("http://mno.pqr")); + Assert.IsNull (xtw.LookupPrefix ("http://abc.def")); + Assert.IsNull (xtw.LookupPrefix ("http://ghi.jkl")); - AssertNull (xtw.LookupPrefix ("http://bogus")); + Assert.IsNull (xtw.LookupPrefix ("http://bogus")); } [Test] @@ -484,10 +471,7 @@ namespace MonoTests.System.Xml xtw.WriteAttributeString ("", "e", null, "f"); xtw.WriteAttributeString (null, "g", null, "h"); - AssertEquals ("barbar", StringWriterText); + Assert.AreEqual ("", + StringWriterText, "XmlTextWriter is incorrectly outputting namespaces."); } [Test] @@ -579,8 +563,8 @@ namespace MonoTests.System.Xml xtw.WriteElementString ("qux", "http://netsack.com/", String.Empty); xtw.WriteEndElement (); xtw.WriteEndElement (); - AssertEquals ("XmlTextWriter is incorrectly outputting prefixes.", - "", StringWriterText); + Assert.AreEqual ("", + StringWriterText, "XmlTextWriter is incorrectly outputting prefixes."); } [Test] @@ -604,20 +588,18 @@ namespace MonoTests.System.Xml public void NamespacesSettingWhenWriteStateNotStart () { xtw.WriteStartElement ("foo"); - try - { + try { xtw.Namespaces = false; - Fail ("Expected an InvalidOperationException."); - } - catch (InvalidOperationException) {} - AssertEquals (true, xtw.Namespaces); + Assert.Fail ("Expected an InvalidOperationException."); + } catch (InvalidOperationException) {} + Assert.IsTrue (xtw.Namespaces); } [Test] public void ProcessingInstructionValid () { xtw.WriteProcessingInstruction("foo", "bar"); - AssertEquals ("WriteProcessingInstruction had incorrect output.", "", StringWriterText); + Assert.AreEqual ("", StringWriterText, "WriteProcessingInstruction had incorrect output."); } [Test] @@ -659,9 +641,7 @@ namespace MonoTests.System.Xml // namespace declaration xtw.WriteElementString ("foo", "http://netsack.com", "bar"); - AssertEquals ("bar", StringWriterText); - - + Assert.AreEqual ("bar", StringWriterText); } [Test] @@ -677,26 +657,26 @@ namespace MonoTests.System.Xml UTF8Encoding encoding = new UTF8Encoding(); byte[] fooBar = encoding.GetBytes("foobar"); xtw.WriteBase64 (fooBar, 0, 6); - AssertEquals("Zm9vYmFy", StringWriterText); + Assert.AreEqual ("Zm9vYmFy", StringWriterText); try { xtw.WriteBase64 (fooBar, 3, 6); - Fail ("Expected an Argument Exception to be thrown."); + Assert.Fail ("Expected an Argument Exception to be thrown."); } catch (ArgumentException) {} try { xtw.WriteBase64 (fooBar, -1, 6); - Fail ("Expected an Argument Exception to be thrown."); + Assert.Fail ("Expected an Argument Exception to be thrown."); } catch (ArgumentOutOfRangeException) {} try { xtw.WriteBase64 (fooBar, 3, -1); - Fail ("Expected an Argument Exception to be thrown."); + Assert.Fail ("Expected an Argument Exception to be thrown."); } catch (ArgumentOutOfRangeException) {} try { xtw.WriteBase64 (null, 0, 6); - Fail ("Expected an Argument Exception to be thrown."); + Assert.Fail ("Expected an Argument Exception to be thrown."); } catch (ArgumentNullException) {} } @@ -705,23 +685,23 @@ namespace MonoTests.System.Xml { byte [] bytes = new byte [] {4,14,34, 54,94,114, 134,194,255, 0,5}; xtw.WriteBinHex (bytes, 0, 11); - AssertEquals ("040E22365E7286C2FF0005", StringWriterText); + Assert.AreEqual ("040E22365E7286C2FF0005", StringWriterText); } [Test] public void WriteCharEntity () { xtw.WriteCharEntity ('a'); - AssertEquals ("a", StringWriterText); + Assert.AreEqual ("a", StringWriterText); xtw.WriteCharEntity ('A'); - AssertEquals ("aA", StringWriterText); + Assert.AreEqual ("aA", StringWriterText); xtw.WriteCharEntity ('1'); - AssertEquals ("aA1", StringWriterText); + Assert.AreEqual ("aA1", StringWriterText); xtw.WriteCharEntity ('K'); - AssertEquals ("aA1K", StringWriterText); + Assert.AreEqual ("aA1K", StringWriterText); try { xtw.WriteCharEntity ((char)0xd800); @@ -740,7 +720,7 @@ namespace MonoTests.System.Xml { try { xtw.WriteEndDocument (); - Fail ("Expected an Exception."); + Assert.Fail ("Expected an Exception."); // in .NET 2.0 it is InvalidOperationException. // in .NET 1,1 it is ArgumentException. } catch (Exception) {} @@ -753,7 +733,7 @@ namespace MonoTests.System.Xml try { xtw.WriteEndDocument (); - Fail ("Expected an Exception."); + Assert.Fail ("Expected an Exception."); // in .NET 2.0 it is InvalidOperationException. // in .NET 1,1 it is ArgumentException. } catch (Exception) {} @@ -765,11 +745,11 @@ namespace MonoTests.System.Xml xtw.WriteStartDocument (); xtw.WriteStartElement ("foo"); xtw.WriteStartAttribute ("bar", null); - AssertEquals ("", StringWriterText); - AssertEquals (WriteState.Start, xtw.WriteState); + Assert.AreEqual ("", StringWriterText); + Assert.AreEqual (WriteState.Start, xtw.WriteState); } [Test] @@ -785,12 +765,12 @@ namespace MonoTests.System.Xml { xtw.WriteStartElement ("foo"); xtw.WriteEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); xtw.WriteStartElement ("bar"); xtw.WriteStartAttribute ("baz", null); xtw.WriteEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -798,17 +778,17 @@ namespace MonoTests.System.Xml { xtw.WriteStartElement ("foo"); xtw.WriteFullEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); xtw.WriteStartElement ("bar"); xtw.WriteAttributeString ("foo", "bar"); xtw.WriteFullEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); xtw.WriteStartElement ("baz"); xtw.WriteStartAttribute ("bar", null); xtw.WriteFullEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -819,7 +799,7 @@ namespace MonoTests.System.Xml xtw.WriteQualifiedName ("bob", "http://localhost/"); xtw.WriteEndElement (); - AssertEquals ("me:bob", StringWriterText); + Assert.AreEqual ("me:bob", StringWriterText); } [Test] @@ -833,10 +813,10 @@ namespace MonoTests.System.Xml xtw.WriteEndAttribute (); xtw.WriteEndElement (); string xml = sw.ToString (); - Assert ("foo", xml.IndexOf ("= 0); - Assert ("qnames", xml.IndexOf ("a='d1p1:attr d1p2:attr'") > 0); - Assert ("xmlns:a", xml.IndexOf (" xmlns:d1p1='urn:a'") > 0); - Assert ("xmlns:b", xml.IndexOf (" xmlns:d1p2='urn:b'") > 0); + Assert.IsTrue (xml.IndexOf ("= 0, "foo"); + Assert.IsTrue (xml.IndexOf ("a='d1p1:attr d1p2:attr'") > 0, "qnames"); + Assert.IsTrue (xml.IndexOf (" xmlns:d1p1='urn:a'") > 0, "xmlns:a"); + Assert.IsTrue (xml.IndexOf (" xmlns:d1p2='urn:b'") > 0, "xmlns:b"); } [Test] @@ -862,13 +842,13 @@ namespace MonoTests.System.Xml public void WriteRaw () { xtw.WriteRaw("&<>\"'"); - AssertEquals ("&<>\"'", StringWriterText); + Assert.AreEqual ("&<>\"'", StringWriterText); xtw.WriteRaw(null); - AssertEquals ("&<>\"'", StringWriterText); + Assert.AreEqual ("&<>\"'", StringWriterText); xtw.WriteRaw(""); - AssertEquals ("&<>\"'", StringWriterText); + Assert.AreEqual ("&<>\"'", StringWriterText); } [Test] @@ -879,21 +859,21 @@ namespace MonoTests.System.Xml xtw.WriteRaw ("&<>\"'"); xtw.WriteEndAttribute (); xtw.WriteEndElement (); - AssertEquals ("", StringWriterText); + Assert.AreEqual ("", StringWriterText); } [Test] public void WriteStateTest () { - AssertEquals (WriteState.Start, xtw.WriteState); + Assert.AreEqual (WriteState.Start, xtw.WriteState); xtw.WriteStartDocument (); - AssertEquals (WriteState.Prolog, xtw.WriteState); + Assert.AreEqual (WriteState.Prolog, xtw.WriteState); xtw.WriteStartElement ("root"); - AssertEquals (WriteState.Element, xtw.WriteState); + Assert.AreEqual (WriteState.Element, xtw.WriteState); xtw.WriteElementString ("foo", "bar"); - AssertEquals (WriteState.Content, xtw.WriteState); + Assert.AreEqual (WriteState.Content, xtw.WriteState); xtw.Close (); - AssertEquals (WriteState.Closed, xtw.WriteState); + Assert.AreEqual (WriteState.Closed, xtw.WriteState); } [Test] @@ -913,7 +893,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("foo"); xtw.WriteAttributeString ("bar", "&<>"); - AssertEquals ("\"'"); - AssertEquals ("&<>\"'", StringWriterText); + Assert.AreEqual ("&<>\"'", StringWriterText); } [Test] public void XmlLang () { - AssertNull (xtw.XmlLang); + Assert.IsNull (xtw.XmlLang); xtw.WriteStartElement ("foo"); xtw.WriteAttributeString ("xml", "lang", null, "langfoo"); - AssertEquals ("langfoo", xtw.XmlLang); - AssertEquals ("baz", StringWriterText); + Assert.AreEqual ("langfoo", xtw.XmlLang); + Assert.AreEqual ("baz", StringWriterText); xtw.WriteString("baz"); - AssertEquals ("langfoo", xtw.XmlLang); - AssertEquals ("bazbaz", StringWriterText); + Assert.AreEqual ("langfoo", xtw.XmlLang); + Assert.AreEqual ("bazbaz", StringWriterText); xtw.WriteStartElement ("quux"); xtw.WriteStartAttribute ("xml", "lang", null); - AssertEquals ("langfoo", xtw.XmlLang); - AssertEquals ("bazbazbazbazbazbazbazbazbazbazbazbazbazbazbazbazbazbazsquonk", StringWriterText); + Assert.AreEqual ("langbar", xtw.XmlLang); + Assert.AreEqual ("bazbazsquonk", StringWriterText); xtw.WriteEndElement (); xtw.WriteEndElement (); - AssertEquals ("langfoo", xtw.XmlLang); - AssertEquals ("bazbazsquonk", StringWriterText); + Assert.AreEqual ("langfoo", xtw.XmlLang); + Assert.AreEqual ("bazbazsquonk", StringWriterText); xtw.WriteEndElement (); - AssertNull (xtw.XmlLang); - AssertEquals ("bazbazsquonk", StringWriterText); + Assert.IsNull (xtw.XmlLang); + Assert.AreEqual ("bazbazsquonk", StringWriterText); xtw.Close (); - AssertNull (xtw.XmlLang); + Assert.IsNull (xtw.XmlLang); } // TODO: test operational aspects @@ -1015,39 +995,39 @@ namespace MonoTests.System.Xml public void XmlSpaceTest () { xtw.WriteStartElement ("foo"); - AssertEquals (XmlSpace.None, xtw.XmlSpace); + Assert.AreEqual (XmlSpace.None, xtw.XmlSpace); xtw.WriteStartElement ("bar"); xtw.WriteAttributeString ("xml", "space", null, "preserve"); - AssertEquals (XmlSpace.Preserve, xtw.XmlSpace); - AssertEquals ("", XmlNodeType.Document, ctx); xtr.Read(); // read XMLDecl - AssertEquals (XmlNodeType.XmlDeclaration, xtr.NodeType); + Assert.AreEqual (XmlNodeType.XmlDeclaration, xtr.NodeType); sw = new StringWriter (); wr = new XmlTextWriter (sw); // This block raises an error on MS.NET 1.0. wr.WriteAttributes(xtr, false); // This method don't always have to take this double-quoted style... - AssertEquals("#WriteAttributes.XmlDecl.2", "version=\"1.0\" standalone=\"no\"", sw.ToString().Trim()); + Assert.AreEqual ("version=\"1.0\" standalone=\"no\"", sw.ToString ().Trim (), + "#WriteAttributes.XmlDecl.2"); sw = new StringWriter (); wr = new XmlTextWriter (sw); sb.Remove(0, sb.Length); // init xtr.Read(); // read root - AssertEquals (XmlNodeType.Element, xtr.NodeType); + Assert.AreEqual (XmlNodeType.Element, xtr.NodeType); wr.WriteStartElement(xtr.LocalName, xtr.NamespaceURI); wr.WriteAttributes(xtr, false); wr.WriteEndElement(); wr.Close(); // This method don't always have to take this double-quoted style... - AssertEquals("#WriteAttributes.Element", "", sw.ToString().Trim()); - xtr.Close (); + Assert.AreEqual ("", sw.ToString ().Trim (), + "#WriteAttributes.Element"); + xtr.Close (); } [Test] @@ -1165,7 +1148,7 @@ namespace MonoTests.System.Xml xtw.WriteEndElement (); xtw.WriteWhitespace ("\n"); xtw.Flush (); - AssertEquals ("\n\t\n\t\n\n", StringWriterText); + Assert.AreEqual ("\n\t\n\t\n\n", StringWriterText); } [Test] @@ -1174,7 +1157,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("foo"); xtw.WriteAttributeString ("bar", "baz"); xtw.Flush (); - AssertEquals (" ", StringWriterText); + Assert.AreEqual (" ", StringWriterText); } [Test] @@ -1193,7 +1176,7 @@ namespace MonoTests.System.Xml doc.LoadXml(""); XmlDocument doc2 = new XmlDocument(); doc2.LoadXml(doc.InnerXml); - AssertEquals ("", + Assert.AreEqual ("", doc2.OuterXml); } @@ -1205,74 +1188,74 @@ namespace MonoTests.System.Xml doc.LoadXml(xml); XmlDocument doc2 = new XmlDocument(); doc2.LoadXml(doc.InnerXml); - AssertEquals (xml.Replace ('\'', '"'), doc2.OuterXml); + Assert.AreEqual (xml.Replace ('\'', '"'), doc2.OuterXml); } [Test] public void DontOutputRemovalDefaultNSDeclaration () { - xtw.WriteStartDocument (); - xtw.WriteStartElement ("foo"); - xtw.WriteAttributeString ("xmlns", "probe"); - AssertEquals (String.Empty, xtw.LookupPrefix ("probe")); - xtw.WriteStartElement ("b"); - AssertEquals (String.Empty, xtw.LookupPrefix ("probe")); - xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns="" - xtw.WriteEndElement (); // b2 - xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns="" - xtw.WriteEndElement (); // b2 - xtw.WriteEndElement (); // b - xtw.WriteEndElement (); // foo - xtw.WriteEndDocument (); - xtw.Close (); - - AssertEquals ("", StringWriterText); + xtw.WriteStartDocument (); + xtw.WriteStartElement ("foo"); + xtw.WriteAttributeString ("xmlns", "probe"); + Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe")); + xtw.WriteStartElement ("b"); + Assert.AreEqual (String.Empty, xtw.LookupPrefix ("probe")); + xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns="" + xtw.WriteEndElement (); // b2 + xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns="" + xtw.WriteEndElement (); // b2 + xtw.WriteEndElement (); // b + xtw.WriteEndElement (); // foo + xtw.WriteEndDocument (); + xtw.Close (); + + Assert.AreEqual ("", StringWriterText); } [Test] public void DontOutputRemovalDefaultNSDeclaration2 () { - xtw.WriteStartDocument (); - // IMPORTANT DIFFERENCE!! ns = "", not null - xtw.WriteStartElement ("foo", ""); - xtw.WriteAttributeString ("xmlns", "probe"); - AssertNull (xtw.LookupPrefix ("probe")); - xtw.WriteStartElement ("b"); - AssertNull (xtw.LookupPrefix ("probe")); - xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns="" - xtw.WriteEndElement (); // b2 - xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns="" - xtw.WriteEndElement (); // b2 - xtw.WriteEndElement (); // b - xtw.WriteEndElement (); // foo - xtw.WriteEndDocument (); - xtw.Close (); - - AssertEquals ("", StringWriterText); + xtw.WriteStartDocument (); + // IMPORTANT DIFFERENCE!! ns = "", not null + xtw.WriteStartElement ("foo", ""); + xtw.WriteAttributeString ("xmlns", "probe"); + Assert.IsNull (xtw.LookupPrefix ("probe")); + xtw.WriteStartElement ("b"); + Assert.IsNull (xtw.LookupPrefix ("probe")); + xtw.WriteStartElement (null, "b2", null); // *Don't* output xmlns="" + xtw.WriteEndElement (); // b2 + xtw.WriteStartElement (null, "b2", ""); // *Do* output xmlns="" + xtw.WriteEndElement (); // b2 + xtw.WriteEndElement (); // b + xtw.WriteEndElement (); // foo + xtw.WriteEndDocument (); + xtw.Close (); + + Assert.AreEqual ("", StringWriterText); } [Test] public void DoOutputRemovalDefaultNSDeclaration () { - xtw.WriteStartElement ("docelem", "a-namespace"); - - XmlDocument doc = new XmlDocument (); - doc.CreateElement ("hola").WriteTo (xtw); - // This means, WriteTo never passes null NamespaceURI argument to XmlWriter. - xtw.WriteEndElement (); - xtw.Close (); - - AssertEquals ("", StringWriterText); + xtw.WriteStartElement ("docelem", "a-namespace"); + + XmlDocument doc = new XmlDocument (); + doc.CreateElement ("hola").WriteTo (xtw); + // This means, WriteTo never passes null NamespaceURI argument to XmlWriter. + xtw.WriteEndElement (); + xtw.Close (); + + Assert.AreEqual ("", StringWriterText); } [Test] public void WriteAttributeTakePrecedenceOnXmlns () { - xtw.WriteStartElement ("root", "urn:foo"); - xtw.WriteAttributeString ("xmlns", "urn:bar"); - xtw.WriteEndElement (); - xtw.Close (); - AssertEquals ("", StringWriterText); + xtw.WriteStartElement ("root", "urn:foo"); + xtw.WriteAttributeString ("xmlns", "urn:bar"); + xtw.WriteEndElement (); + xtw.Close (); + Assert.AreEqual ("", StringWriterText); } [Test] @@ -1292,18 +1275,18 @@ namespace MonoTests.System.Xml [Test] public void LookupPrefixIgnoresXmlnsAttribute () { - AssertNull (xtw.LookupPrefix ("urn:foo")); + Assert.IsNull (xtw.LookupPrefix ("urn:foo")); xtw.WriteStartElement ("root"); - AssertNull (xtw.LookupPrefix ("urn:foo")); + Assert.IsNull (xtw.LookupPrefix ("urn:foo")); xtw.WriteAttributeString ("xmlns", "urn:foo"); // Surprisingly to say, it is ignored!! - AssertEquals (String.Empty, xtw.LookupPrefix ("urn:foo")); + Assert.AreEqual (String.Empty, xtw.LookupPrefix ("urn:foo")); xtw.WriteStartElement ("hoge"); // (still after flushing previous start element.) - AssertEquals (String.Empty, xtw.LookupPrefix ("urn:foo")); - xtw.WriteStartElement ("fuga", "urn:foo"); - // Is this testing on the correct way? Yes, here it is. - AssertEquals (String.Empty, xtw.LookupPrefix ("urn:foo")); + Assert.AreEqual (String.Empty, xtw.LookupPrefix ("urn:foo")); + xtw.WriteStartElement ("fuga", "urn:foo"); + // Is this testing on the correct way? Yes, here it is. + Assert.AreEqual (String.Empty, xtw.LookupPrefix ("urn:foo")); } [Test] @@ -1352,9 +1335,9 @@ namespace MonoTests.System.Xml [Test] public void WriteRawProceedToProlog () { - XmlTextWriter xtw = new XmlTextWriter (new StringWriter ()); - xtw.WriteRaw (""); - AssertEquals (WriteState.Prolog, xtw.WriteState); + XmlTextWriter xtw = new XmlTextWriter (new StringWriter ()); + xtw.WriteRaw (""); + Assert.AreEqual (WriteState.Prolog, xtw.WriteState); } [Test] @@ -1367,7 +1350,7 @@ namespace MonoTests.System.Xml XmlTextWriter xtw = new XmlTextWriter (sw); xtw.Formatting = Formatting.Indented; doc.WriteContentTo (xtw); - AssertEquals (@"_ teststring_ string_", sw.ToString ()); + Assert.AreEqual (@"_ teststring_ string_", sw.ToString ()); } [Test] @@ -1381,8 +1364,10 @@ namespace MonoTests.System.Xml xtw.WriteProcessingInstruction ("xml", "version=\"1.0\""); xtw.WriteComment ("sample XML fragment"); - AssertEquals (@" -", sw.ToString ().Replace ("\r\n", "\n")); + Assert.AreEqual (string.Format(CultureInfo.InvariantCulture, + @"{0}" + + "", Environment.NewLine), + sw.ToString ()); } [Test] @@ -1401,7 +1386,7 @@ namespace MonoTests.System.Xml // WriteRaw () -> WriteString (). xtw.WriteRaw (""); xtw.WriteString ("foo"); - AssertEquals (WriteState.Content, xtw.WriteState); + Assert.AreEqual (WriteState.Content, xtw.WriteState); } [Test] @@ -1410,7 +1395,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("out"); xtw.WriteAttributeString ("xmlns", "baz", "http://www.w3.org/2000/xmlns/", "xyz"); xtw.WriteStartElement ("baz", "foo", "abc"); - AssertNull (xtw.LookupPrefix ("xyz")); + Assert.IsNull (xtw.LookupPrefix ("xyz")); } [Test] @@ -1428,13 +1413,13 @@ namespace MonoTests.System.Xml xtw.WriteEndElement (); xtw.WriteEndElement (); string xml = sw.ToString (); - Assert ("p:foo", xml.IndexOf ("p:foo='xyz'") > 0); - Assert ("d1p1:bar", xml.IndexOf ("d1p1:bar='xyz'") > 0); - Assert ("d1p1:baz", xml.IndexOf ("d1p2:baz='xyz'") > 0); - Assert ("xmlns:d1p2", xml.IndexOf ("xmlns:d1p2='urn:baz'") > 0); - Assert ("xmlns:d1p1", xml.IndexOf ("xmlns:d1p1='urn:bar'") > 0); - Assert ("xmlns:p", xml.IndexOf ("xmlns:p='urn:foo'") > 0); - Assert ("remaining", xml.IndexOf ("") > 0); + Assert.IsTrue (xml.IndexOf ("p:foo='xyz'") > 0, "p:foo"); + Assert.IsTrue (xml.IndexOf ("d1p1:bar='xyz'") > 0, "d1p1:bar"); + Assert.IsTrue (xml.IndexOf ("d1p2:baz='xyz'") > 0, "d1p1:baz"); + Assert.IsTrue (xml.IndexOf ("xmlns:d1p2='urn:baz'") > 0, "xmlns:d1p2"); + Assert.IsTrue (xml.IndexOf ("xmlns:d1p1='urn:bar'") > 0, "xmlns:d1p1"); + Assert.IsTrue (xml.IndexOf ("xmlns:p='urn:foo'") > 0, "xmlns:p"); + Assert.IsTrue (xml.IndexOf ("") > 0, "remaining"); } [Test] @@ -1443,7 +1428,7 @@ namespace MonoTests.System.Xml xtw.WriteStartElement ("root"); xtw.WriteAttributeString ("xml", "space", "abc", "preserve"); xtw.WriteEndElement (); - AssertEquals ("", sw.ToString ()); + Assert.AreEqual ("", sw.ToString ()); } [Test] // bug #75546 @@ -1460,6 +1445,176 @@ namespace MonoTests.System.Xml xtw.WriteEndAttribute (); } + [Test] + public void WriteDocType () + { + // we have the following test matrix: + // + // | name | publicid | systemid | subset| + // |------------------------------------| + // | X | X | X | X | #01 + // | X | E | X | X | #02 + // | X | X | E | X | #03 + // | X | X | X | E | #04 + // | X | E | E | X | #05 + // | X | X | E | E | #06 + // | X | E | X | E | #07 + // | X | E | E | E | #08 + // | X | N | X | X | #09 + // | X | X | N | X | #10 + // | X | X | X | N | #11 + // | X | N | N | X | #12 + // | X | X | N | N | #13 + // | X | N | X | N | #14 + // | X | N | N | N | #15 + // + // Legend: + // ------- + // X = Has value + // E = Zero-length string + // N = Null + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", "sub"); + Assert.AreEqual ("", + sw.ToString (), "#01"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", string.Empty, + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", "sub"); + Assert.AreEqual ("", + sw.ToString (), "#02"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + string.Empty, "sub"); + Assert.AreEqual ("", + sw.ToString (), "#03"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", string.Empty); + Assert.AreEqual ("", + sw.ToString (), "#04"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", string.Empty, string.Empty, "sub"); + Assert.AreEqual ("", + sw.ToString (), "#05"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + string.Empty, string.Empty); + Assert.AreEqual ("", + sw.ToString (), "#06"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", string.Empty, + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", string.Empty); + Assert.AreEqual ("", + sw.ToString (), "#07"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", string.Empty, string.Empty, string.Empty); + Assert.AreEqual ("", + sw.ToString (), "#08"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", (string) null, + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", "sub"); + Assert.AreEqual ("", + sw.ToString (), "#09"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + (string) null, "sub"); + Assert.AreEqual ("", + sw.ToString (), "#10"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", (string) null); + Assert.AreEqual ("", + sw.ToString (), "#11"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", (string) null, (string) null, "sub"); + Assert.AreEqual ("", + sw.ToString (), "#12"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", "-//W3C//DTD XHTML 1.0 Strict//EN", + (string) null, (string) null); + Assert.AreEqual ("", + sw.ToString (), "#13"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", (string) null, + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", (string) null); + Assert.AreEqual ("", + sw.ToString (), "#14"); + + sw.GetStringBuilder ().Length = 0; + xtw = new XmlTextWriter (sw); + + xtw.WriteDocType ("test", (string) null, (string) null, (string) null); + Assert.AreEqual ("", + sw.ToString (), "#15"); + } + + [Test] + [ExpectedException (typeof (ArgumentException))] + public void WriteDocType_EmptyName () + { + xtw.WriteDocType (string.Empty, "-//W3C//DTD XHTML 1.0 Strict//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", "sub"); + } + + [Test] + [ExpectedException (typeof (ArgumentException))] + public void WriteDocType_NullName () + { + xtw.WriteDocType ((string) null, "-//W3C//DTD XHTML 1.0 Strict//EN", + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd", "sub"); + } + [Test] // bug #76095 public void SurrogatePairsInWriteString () { diff --git a/mcs/class/System.XML/Test/System.Xml/XmlWriterTests.cs b/mcs/class/System.XML/Test/System.Xml/XmlWriterTests.cs index ef4dc43bac2..a8a85cfc523 100644 --- a/mcs/class/System.XML/Test/System.Xml/XmlWriterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XmlWriterTests.cs @@ -22,7 +22,7 @@ using NUnit.Framework; namespace MonoTests.System.Xml { [TestFixture] - public class XmlWriterTests : Assertion + public class XmlWriterTests { StringWriter writer; XmlTextWriter xtw; @@ -34,39 +34,33 @@ namespace MonoTests.System.Xml xtw = new XmlTextWriter (writer); } - private void setupWriter () - { - writer.GetStringBuilder ().Length = 0; - } - [Test] public void WriteNodeFullDocument () { - setupWriter (); string xml = ""; XmlTextReader xtr = new XmlTextReader (xml, XmlNodeType.Document, null); xtw.WriteNode (xtr, false); - AssertEquals (xml, writer.ToString ()); + Assert.AreEqual (xml, writer.ToString ()); + + writer.GetStringBuilder ().Length = 0; // With encoding - setupWriter (); xml = ""; xtr = new XmlTextReader (xml, XmlNodeType.Document, null); xtw.WriteNode (xtr, false); - AssertEquals (xml, writer.ToString ()); + Assert.AreEqual (xml, writer.ToString ()); xtr.Close (); } [Test] public void WriteNodeXmlDecl () { - setupWriter (); string xml = ""; StringReader sr = new StringReader (xml); XmlTextReader xtr = new XmlTextReader (sr); xtr.Read (); xtw.WriteNode (xtr, false); - AssertEquals ("", + Assert.AreEqual ("", writer.ToString ()); xtr.Close (); } @@ -74,12 +68,11 @@ namespace MonoTests.System.Xml [Test] public void WriteNodeEmptyElement () { - setupWriter (); string xml = ""; StringReader sr = new StringReader (xml); XmlTextReader xtr = new XmlTextReader (sr); xtw.WriteNode (xtr, false); - AssertEquals (xml.Replace ("'", "\""), + Assert.AreEqual (xml.Replace ("'", "\""), writer.ToString ()); xtr.Close (); } @@ -87,21 +80,19 @@ namespace MonoTests.System.Xml [Test] public void WriteNodeNonEmptyElement () { - setupWriter (); string xml = @""; xtw.WriteNode (new XmlTextReader (xml, XmlNodeType.Document, null), false); - AssertEquals (xml, writer.ToString ()); + Assert.AreEqual (xml, writer.ToString ()); } [Test] public void WriteNodeSingleContentElement () { - setupWriter (); string xml = ""; StringReader sr = new StringReader (xml); XmlTextReader xtr = new XmlTextReader (sr); xtw.WriteNode (xtr, false); - AssertEquals (xml.Replace ("'", "\""), + Assert.AreEqual (xml.Replace ("'", "\""), writer.ToString ()); xtr.Close (); } @@ -109,7 +100,6 @@ namespace MonoTests.System.Xml [Test] public void WriteNodeNone () { - setupWriter (); XmlTextReader xtr = new XmlTextReader ("", XmlNodeType.Element, null); xtr.Read (); xtw.WriteNode (xtr, false); // does not report any errors @@ -136,28 +126,27 @@ namespace MonoTests.System.Xml [Test] public void WriteSurrogateCharEntity () { - setupWriter (); xtw.WriteSurrogateCharEntity ('\udfff', '\udb00'); - AssertEquals ("󐏿", writer.ToString ()); + Assert.AreEqual ("󐏿", writer.ToString ()); try { xtw.WriteSurrogateCharEntity ('\ud800', '\udc00'); - Fail (); + Assert.Fail (); } catch { } try { xtw.WriteSurrogateCharEntity ('\udbff', '\ud800'); - Fail (); + Assert.Fail (); } catch { } try { xtw.WriteSurrogateCharEntity ('\ue000', '\ud800'); - Fail (); + Assert.Fail (); } catch { } try { xtw.WriteSurrogateCharEntity ('\udfff', '\udc00'); - Fail (); + Assert.Fail (); } catch { } } @@ -171,13 +160,13 @@ namespace MonoTests.System.Xml StartElementTestWriter xw = new StartElementTestWriter (); xw.WriteStartDocument (); xw.WriteStartElement ("test"); - AssertEquals ("StartElementOverride.NS", null, xw.NS); - AssertEquals ("StartElementOverride.Prefix", null, xw.Prefix); + Assert.IsNull (xw.NS, "StartElementOverride.NS"); + Assert.IsNull (xw.Prefix, "StartElementOverride.Prefix"); xw.NS = String.Empty; xw.Prefix = String.Empty; xw.WriteStartElement ("test", "urn:hoge"); - AssertEquals ("StartElementOverride.NS", "urn:hoge", xw.NS); - AssertEquals ("StartElementOverride.Prefix", null, xw.Prefix); + Assert.AreEqual ("urn:hoge", xw.NS, "StartElementOverride.NS"); + Assert.IsNull (null, xw.Prefix, "StartElementOverride.Prefix"); } class StartElementTestWriter : DefaultXmlWriter @@ -205,13 +194,13 @@ namespace MonoTests.System.Xml xtr.Read (); xtw.WriteStartElement ("test"); // > xtw.WriteStartElement ("b"); // xtw.WriteEndElement (); // xtw.Close (); - AssertEquals (xml, writer.ToString ()); + Assert.AreEqual (xml, writer.ToString ()); } } -- cgit v1.2.3