Updated set of unit tests and unit test protos.

This commit includes changes to the C#-specific protos, and rebuilt versions of the "stock" protos.
The stock protos have been locally updated to have a specific C# namespace, but this is expected to change soon, so hasn't been committed.
Four areas are currently not tested:
1) Serialization - we may restore this at some point, possibly optionally.
2) Services - currently nothing is generated for this; will need to see how it interacts with GRPC
3) Fields beginning with _{digit} - see https://github.com/google/protobuf/issues/308
4) Fields with names which conflict with the declaring type in nasty ways - see https://github.com/google/protobuf/issues/309

1 files changed, 10 insertions, 10 deletions

diff --git a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
index 13ea060b..695daa84 100644
--- a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
+++ b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs
@@ -315,7 +315,7 @@ namespace Google.ProtocolBuffers
         public void TestXmlWithExtensionText()

         {

             TestXmlMessage message = TestXmlMessage.CreateBuilder()

-                .SetExtension(UnitTestXmlSerializerTestProtoFile.ExtensionText, " extension text value ! ")

+                .SetExtension(UnittestExtrasXmltest.ExtensionText, " extension text value ! ")

                 .Build();

 

             StringWriter sw = new StringWriter();

@@ -324,7 +324,7 @@ namespace Google.ProtocolBuffers
             string xml = sw.ToString();

 

             ExtensionRegistry registry = ExtensionRegistry.CreateInstance();

-            UnitTestXmlSerializerTestProtoFile.RegisterAllExtensions(registry);

+            UnittestExtrasXmltest.RegisterAllExtensions(registry);

 

             XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml);

             TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build();

@@ -334,7 +334,7 @@ namespace Google.ProtocolBuffers
         public void TestXmlWithExtensionMessage()

         {

             TestXmlMessage message = TestXmlMessage.CreateBuilder()

-                .SetExtension(UnitTestXmlSerializerTestProtoFile.ExtensionMessage,

+                .SetExtension(UnittestExtrasXmltest.ExtensionMessage,

                 new TestXmlExtension.Builder().SetNumber(42).Build()).Build();

 

             StringWriter sw = new StringWriter();

@@ -343,7 +343,7 @@ namespace Google.ProtocolBuffers
             string xml = sw.ToString();

 

             ExtensionRegistry registry = ExtensionRegistry.CreateInstance();

-            UnitTestXmlSerializerTestProtoFile.RegisterAllExtensions(registry);

+            UnittestExtrasXmltest.RegisterAllExtensions(registry);

 

             XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml);

             TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build();

@@ -353,9 +353,9 @@ namespace Google.ProtocolBuffers
         public void TestXmlWithExtensionArray()

         {

             TestXmlMessage message = TestXmlMessage.CreateBuilder()

-                .AddExtension(UnitTestXmlSerializerTestProtoFile.ExtensionNumber, 100)

-                .AddExtension(UnitTestXmlSerializerTestProtoFile.ExtensionNumber, 101)

-                .AddExtension(UnitTestXmlSerializerTestProtoFile.ExtensionNumber, 102)

+                .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 100)

+                .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 101)

+                .AddExtension(UnittestExtrasXmltest.ExtensionNumber, 102)

                 .Build();

 

             StringWriter sw = new StringWriter();

@@ -364,7 +364,7 @@ namespace Google.ProtocolBuffers
             string xml = sw.ToString();

 

             ExtensionRegistry registry = ExtensionRegistry.CreateInstance();

-            UnitTestXmlSerializerTestProtoFile.RegisterAllExtensions(registry);

+            UnittestExtrasXmltest.RegisterAllExtensions(registry);

 

             XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml);

             TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build();

@@ -374,7 +374,7 @@ namespace Google.ProtocolBuffers
         public void TestXmlWithExtensionEnum()

         {

             TestXmlMessage message = TestXmlMessage.CreateBuilder()

-                .SetExtension(UnitTestXmlSerializerTestProtoFile.ExtensionEnum, EnumOptions.ONE)

+                .SetExtension(UnittestExtrasXmltest.ExtensionEnum, EnumOptions.ONE)

                 .Build();

 

             StringWriter sw = new StringWriter();

@@ -383,7 +383,7 @@ namespace Google.ProtocolBuffers
             string xml = sw.ToString();

 

             ExtensionRegistry registry = ExtensionRegistry.CreateInstance();

-            UnitTestXmlSerializerTestProtoFile.RegisterAllExtensions(registry);

+            UnittestExtrasXmltest.RegisterAllExtensions(registry);

 

             XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml);

             TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build();