commit 0f3540e24b7b5cf66b59b97cb824fd5449fb77b4
author csharptest <roger@csharptest.net> Fri Aug 05 20:40:14 2011 -0500
committer rogerk <devnull@localhost> Fri Aug 05 20:40:14 2011 -0500
tree f07ad11ac6c814df0f6b8091eae023cf5f5d5cc1
parent 304ff3a83823fdfce6e2eac40cc44e2b4b1fd3c3

Split off the Serialization namespace into a new assembly.

src/ProtocolBuffers.Test/TestWriterFormatXml.cs

diff --git a/src/ProtocolBuffers.Test/TestWriterFormatXml.cs b/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
index acad6f1..2ffca9f 100644
--- a/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
+++ b/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
@@ -18,7 +18,7 @@
             TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build();

             string xml = msg.ToXml();

             Assert.AreEqual("<root><default_bool>true</default_bool></root>", xml);

-            TestAllTypes copy = TestAllTypes.ParseFromXml(XmlReader.Create(new StringReader(xml)));

+            TestAllTypes copy = new TestAllTypes.Builder().MergeFromXml(XmlReader.Create(new StringReader(xml))).Build();

             Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool);

             Assert.AreEqual(msg, copy);

         }

@@ -29,7 +29,7 @@
             TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build();

             string xml = msg.ToXml("message");

             Assert.AreEqual("<message><default_bool>true</default_bool></message>", xml);

-            TestAllTypes copy = TestAllTypes.ParseFromXml("message", XmlReader.Create(new StringReader(xml)));

+            TestAllTypes copy = new TestAllTypes.Builder().MergeFromXml("message", XmlReader.Create(new StringReader(xml))).Build();

             Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool);

             Assert.AreEqual(msg, copy);

         }

@@ -324,13 +324,13 @@
             TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build();

             Assert.AreEqual(message, copy);

         }

-        [Test, ExpectedException(typeof(InvalidProtocolBufferException))]

+        [Test, ExpectedException(typeof(RecursionLimitExceededException))]

         public void TestRecursiveLimit()

         {

             StringBuilder sb = new StringBuilder(8192);

             for (int i = 0; i < 80; i++)

                 sb.Append("<child>");

-            TestXmlRescursive msg = TestXmlRescursive.ParseFromXml("child", XmlReader.Create(new StringReader(sb.ToString())));

+            TestXmlRescursive msg = new TestXmlRescursive.Builder().MergeFromXml("child", XmlReader.Create(new StringReader(sb.ToString()))).Build();

         }

     }

 }