commit b5a7ed241127412d4d9c22c79b3961239bef49e8
author csharptest <roger@csharptest.net> Sat Oct 01 15:10:05 2011 -0500
committer rogerk <devnull@localhost> Sat Oct 01 15:10:05 2011 -0500
tree 4ce8fc01ec3208751050c347d54c41eef8e545b3
parent 4ad552692f737dc27e0ea7829eb8f771b852013c

Conditional extensions in serialization, Removed usages of extensions methods from unit tests

src/ProtocolBuffers.Test/TestWriterFormatXml.cs

diff --git a/src/ProtocolBuffers.Test/TestWriterFormatXml.cs b/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
index a52d04e..aa4db87 100644
--- a/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
+++ b/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
@@ -18,7 +18,8 @@
             TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder();

 

             XmlReader rdr = XmlReader.Create(new StringReader(@"<root><valid>true</valid></root>"));

-            builder.MergeFromXml(rdr);

+            //3.5: builder.MergeFromXml(rdr);

+            Extensions.MergeFromXml(builder, rdr);

 

             TestXmlMessage message = builder.Build();

             Assert.AreEqual(true, message.Valid);

@@ -32,7 +33,8 @@
                 .SetValid(true)

                 .Build();

 

-            string Xml = message.ToXml();

+            //3.5: string Xml = message.ToXml();

+            string Xml = Extensions.ToXml(message);

 

             Assert.AreEqual(@"<root><valid>true</valid></root>", Xml);

         }

@@ -75,9 +77,9 @@
         public void TestToXmlParseFromXml()

         {

             TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build();

-            string xml = msg.ToXml();

+            string xml = Extensions.ToXml(msg);

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

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

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

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

             Assert.AreEqual(msg, copy);

         }

@@ -86,9 +88,9 @@
         public void TestToXmlParseFromXmlWithRootName()

         {

             TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build();

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

+            string xml = Extensions.ToXml(msg, "message");

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

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

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

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

             Assert.AreEqual(msg, copy);

         }

@@ -447,7 +449,7 @@
             StringBuilder sb = new StringBuilder(8192);

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

                 sb.Append("<child>");

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

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

         }

     }

 }