From f3504cf3b1d456a843e8242fdee9ba0bf2991dc1 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Tue, 28 Apr 2015 14:49:49 +0100 Subject: First part of making the C# runtime work with the new codegen. 1) Remove CSharpOptions 2) A new version of DescriptorProtoFile (with manual changes from codegen - it would otherwise be Descriptor.cs) 3) Turn off CLS compliance (which we'll remove from the codebase entirely; I don't think it's actually relevant these days) 4) Add "public imports" to FileDescriptor, with code broadly copied from the Java codebase. Lots more changes to commit before it will build and tests run, but one step at a time... --- .../src/ProtocolBuffers.Test/CSharpOptionsTest.cs | 127 --------------------- .../Descriptors/MessageDescriptorTest.cs | 72 ------------ .../Properties/AssemblyInfo.cs | 2 +- .../ProtocolBuffers.Test.csproj | 2 - 4 files changed, 1 insertion(+), 202 deletions(-) delete mode 100644 csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs b/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs deleted file mode 100644 index 752d9a0c..00000000 --- a/csharp/src/ProtocolBuffers.Test/CSharpOptionsTest.cs +++ /dev/null @@ -1,127 +0,0 @@ -#region Copyright notice and license - -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// http://github.com/jskeet/dotnet-protobufs/ -// Original C++/Java/Python code: -// http://code.google.com/p/protobuf/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#endregion - -using Google.ProtocolBuffers.DescriptorProtos; -using Google.ProtocolBuffers.Descriptors; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Google.ProtocolBuffers -{ - [TestClass] - public class DescriptorUtilTest - { - [TestMethod] - public void ExplicitNamespace() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder - { - Name = "x", - Package = "pack", - Options = - new FileOptions.Builder().SetExtension( - CSharpOptions.CSharpFileOptions, - new CSharpFileOptions.Builder {Namespace = "Foo.Bar"}.Build()). - Build() - }.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("Foo.Bar", descriptor.CSharpOptions.Namespace); - } - - [TestMethod] - public void NoNamespaceFallsBackToPackage() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x", Package = "pack"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("pack", descriptor.CSharpOptions.Namespace); - } - - [TestMethod] - public void NoNamespaceOrPackageFallsBackToEmptyString() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("", descriptor.CSharpOptions.Namespace); - } - - [TestMethod] - public void ExplicitlyNamedFileClass() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder - { - Name = "x", - Options = - new FileOptions.Builder().SetExtension( - CSharpOptions.CSharpFileOptions, - new CSharpFileOptions.Builder {UmbrellaClassname = "Foo"}.Build()) - .Build() - }.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("Foo", descriptor.CSharpOptions.UmbrellaClassname); - } - - [TestMethod] - public void ImplicitFileClassWithProtoSuffix() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.proto"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname); - } - - [TestMethod] - public void ImplicitFileClassWithProtoDevelSuffix() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar.protodevel"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname); - } - - [TestMethod] - public void ImplicitFileClassWithNoSuffix() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "foo_bar"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname); - } - - [TestMethod] - public void ImplicitFileClassWithDirectoryStructure() - { - FileDescriptorProto proto = new FileDescriptorProto.Builder {Name = "x/y/foo_bar"}.Build(); - FileDescriptor descriptor = FileDescriptor.BuildFrom(proto, null); - Assert.AreEqual("FooBar", descriptor.CSharpOptions.UmbrellaClassname); - } - } -} \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs b/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs deleted file mode 100644 index 79033e6e..00000000 --- a/csharp/src/ProtocolBuffers.Test/Descriptors/MessageDescriptorTest.cs +++ /dev/null @@ -1,72 +0,0 @@ -#region Copyright notice and license - -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// http://github.com/jskeet/dotnet-protobufs/ -// Original C++/Java/Python code: -// http://code.google.com/p/protobuf/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#endregion - -using Microsoft.VisualStudio.TestTools.UnitTesting; -using Google.ProtocolBuffers.TestProtos; - -namespace Google.ProtocolBuffers.Descriptors -{ - [TestClass] - public class MessageDescriptorTest - { - [TestMethod] - public void FindPropertyWithDefaultName() - { - Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.NormalFieldNumber), - OptionsMessage.Descriptor.FindFieldByPropertyName("Normal")); - } - - [TestMethod] - public void FindPropertyWithAutoModifiedName() - { - Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.OptionsMessage_FieldNumber), - OptionsMessage.Descriptor.FindFieldByPropertyName("OptionsMessage_")); - } - - [TestMethod] - public void FindPropertyWithCustomizedName() - { - Assert.AreSame(OptionsMessage.Descriptor.FindFieldByNumber(OptionsMessage.CustomNameFieldNumber), - OptionsMessage.Descriptor.FindFieldByPropertyName("CustomName")); - } - - [TestMethod] - public void FindPropertyWithInvalidName() - { - Assert.IsNull(OptionsMessage.Descriptor.FindFieldByPropertyName("Bogus")); - } - } -} \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs index cea5da58..b443ea3a 100644 --- a/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs +++ b/csharp/src/ProtocolBuffers.Test/Properties/AssemblyInfo.cs @@ -32,4 +32,4 @@ using System.Runtime.InteropServices; // We don't really need CLSCompliance, but if the assembly builds with no warnings, // that means the generator is okay. -[assembly: CLSCompliant(true)] \ No newline at end of file +[assembly: CLSCompliant(false)] \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 267fedc0..0dcdd1e6 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -86,10 +86,8 @@ - - -- cgit v1.2.3 From ce66c5f1b99fe36b5b91e8b59cc75ce8a4e9cba5 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Tue, 28 Apr 2015 15:06:59 +0100 Subject: 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 --- csharp/protos/extest/unittest_extras.proto | 37 - csharp/protos/extest/unittest_extras_full.proto | 13 +- csharp/protos/extest/unittest_extras_lite.proto | 14 +- csharp/protos/extest/unittest_extras_xmltest.proto | 7 +- .../protos/extest/unittest_generic_services.proto | 35 +- csharp/protos/extest/unittest_issues.proto | 36 +- .../ProtocolBuffers.Test/AbstractMessageTest.cs | 8 +- .../Compatibility/CompatibilityTests.cs | 2 +- csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs | 116 +- .../ProtocolBuffers.Test/ExtendableMessageTest.cs | 244 +- .../ProtocolBuffers.Test/GeneratedMessageTest.cs | 42 +- .../ProtocolBuffers.Test.csproj | 34 +- .../src/ProtocolBuffers.Test/ReflectionTester.cs | 6 +- .../src/ProtocolBuffers.Test/SerializableTest.cs | 33 +- csharp/src/ProtocolBuffers.Test/ServiceTest.cs | 262 - .../ProtocolBuffers.Test/TestProtos/GoogleSize.cs | 4569 +++ .../ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs | 6634 ++++ .../TestProtos/UnitTestCSharpOptionsProtoFile.cs | 426 - .../TestProtos/UnitTestCustomOptionsProtoFile.cs | 6411 ---- .../UnitTestEmbedOptimizeForProtoFile.cs | 442 - .../TestProtos/UnitTestEmptyProtoFile.cs | 50 - .../TestProtos/UnitTestExtrasIssuesProtoFile.cs | 3443 -- .../TestProtos/UnitTestExtrasProtoFile.cs | 401 - .../TestProtos/UnitTestGenericServices.cs | 260 - .../TestProtos/UnitTestGoogleSizeProtoFile.cs | 4573 --- .../TestProtos/UnitTestGoogleSpeedProtoFile.cs | 6638 ---- .../TestProtos/UnitTestImportLiteProtoFile.cs | 308 - .../TestProtos/UnitTestImportProtoFile.cs | 346 - .../TestProtos/UnitTestMessageSetProtoFile.cs | 1826 - .../UnitTestNoGenericServicesProtoFile.cs | 368 - .../TestProtos/UnitTestOptimizeForProtoFile.cs | 659 - .../TestProtos/UnitTestProtoFile.cs | 21602 ----------- .../TestProtos/UnitTestRpcInterop.cs | 1467 - .../UnitTestXmlSerializerTestProtoFile.cs | 2292 -- .../ProtocolBuffers.Test/TestProtos/Unittest.cs | 33513 +++++++++++++++++ .../TestProtos/UnittestCustomOptions.cs | 7549 ++++ .../TestProtos/UnittestDropUnknownFields.cs | 791 + .../TestProtos/UnittestEnormousDescriptor.cs | 36189 +++++++++++++++++++ .../TestProtos/UnittestExtrasXmltest.cs | 2277 ++ .../TestProtos/UnittestImport.cs | 347 + .../TestProtos/UnittestImportPublic.cs | 333 + .../TestProtos/UnittestIssues.cs | 2311 ++ .../TestProtos/UnittestMset.cs | 1824 + .../TestProtos/UnittestNoFieldPresence.cs | 4065 +++ .../TestProtos/UnittestOptimizeFor.cs | 719 + .../TestProtos/UnittestPreserveUnknownEnum.cs | 1320 + .../TestProtos/UnittestPreserveUnknownEnum2.cs | 684 + .../TestProtos/UnknownEnumTest.cs | 809 + .../ProtocolBuffers.Test/TestRpcForMimeTypes.cs | 386 - .../src/ProtocolBuffers.Test/TestRpcGenerator.cs | 171 - csharp/src/ProtocolBuffers.Test/TestUtil.cs | 1399 +- .../ProtocolBuffers.Test/TestWriterFormatJson.cs | 46 +- .../ProtocolBuffers.Test/TestWriterFormatXml.cs | 20 +- .../ProtocolBuffers.Test/UnknownFieldSetTest.cs | 4 +- csharp/src/ProtocolBuffers.Test/WireFormatTest.cs | 8 +- .../AbstractBuilderLiteTest.cs | 18 +- .../ExtendableBuilderLiteTest.cs | 132 +- .../ExtendableMessageLiteTest.cs | 378 +- .../ProtocolBuffersLite.Test/InteropLiteTest.cs | 18 +- csharp/src/ProtocolBuffersLite.Test/LiteTest.cs | 20 +- .../MissingFieldAndExtensionTest.cs | 28 +- .../ProtocolBuffersLite.Test.csproj | 15 +- .../ProtocolBuffersLiteMixed.Test.csproj | 17 +- .../SerializableLiteTest.cs | 2 + .../src/ProtocolBuffersLite.Test/TestLiteByApi.cs | 4 +- .../TestProtos/UnitTestExtrasFullProtoFile.cs | 2144 -- .../TestProtos/UnitTestExtrasLiteProtoFile.cs | 4226 --- .../TestProtos/UnitTestImportLiteProtoFile.cs | 308 - .../TestProtos/UnitTestImportProtoFile.cs | 346 - .../UnitTestLiteImportNonLiteProtoFile.cs | 324 - .../TestProtos/UnitTestLiteProtoFile.cs | 8948 ----- .../TestProtos/UnitTestProtoFile.cs | 21602 ----------- .../TestProtos/UnitTestRpcInteropLite.cs | 1395 - .../TestProtos/Unittest.cs | 33513 +++++++++++++++++ .../TestProtos/UnittestExtrasFull.cs | 2141 ++ .../TestProtos/UnittestExtrasLite.cs | 4209 +++ .../TestProtos/UnittestExtrasXmltest.cs | 2277 ++ .../TestProtos/UnittestImport.cs | 347 + .../TestProtos/UnittestImportLite.cs | 309 + .../TestProtos/UnittestImportPublic.cs | 333 + .../TestProtos/UnittestImportPublicLite.cs | 300 + .../TestProtos/UnittestIssues.cs | 3437 ++ .../TestProtos/UnittestLite.cs | 12460 +++++++ .../TestProtos/UnittestLiteImportsNonlite.cs | 325 + 84 files changed, 164903 insertions(+), 93042 deletions(-) delete mode 100644 csharp/protos/extest/unittest_extras.proto delete mode 100644 csharp/src/ProtocolBuffers.Test/ServiceTest.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSize.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestCSharpOptionsProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestCustomOptionsProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestEmptyProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasIssuesProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestExtrasProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestGenericServices.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSizeProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestGoogleSpeedProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestImportLiteProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestImportProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestNoGenericServicesProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestOptimizeForProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestRpcInterop.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnitTestXmlSerializerTestProtoFile.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/Unittest.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestCustomOptions.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestEnormousDescriptor.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestExtrasXmltest.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImport.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestImportPublic.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestIssues.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestMset.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestOptimizeFor.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum2.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnknownEnumTest.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestRpcForMimeTypes.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestRpcGenerator.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasFullProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestExtrasLiteProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportLiteProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestImportProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteImportNonLiteProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestLiteProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestProtoFile.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnitTestRpcInteropLite.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/Unittest.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasFull.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasLite.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasXmltest.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestImport.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestImportLite.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestImportPublic.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestImportPublicLite.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestIssues.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestLite.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestLiteImportsNonlite.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/protos/extest/unittest_extras.proto b/csharp/protos/extest/unittest_extras.proto deleted file mode 100644 index 91f10fbd..00000000 --- a/csharp/protos/extest/unittest_extras.proto +++ /dev/null @@ -1,37 +0,0 @@ -// Additional options required for C# generation. File from copyright -// line onwards is as per original distribution. -import "google/protobuf/csharp_options.proto"; -option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestExtrasProtoFile"; -option (google.protobuf.csharp_file_options).add_serializable = true; - -package protobuf_unittest_extra; - -option java_package = "com.google.protobuf"; - -message TestUnpackedExtensions { - extensions 1 to max; -} - -extend TestUnpackedExtensions { - repeated int32 unpacked_int32_extension = 90; - repeated int64 unpacked_int64_extension = 91; - repeated uint32 unpacked_uint32_extension = 92; - repeated uint64 unpacked_uint64_extension = 93; - repeated sint32 unpacked_sint32_extension = 94; - repeated sint64 unpacked_sint64_extension = 95; - repeated fixed32 unpacked_fixed32_extension = 96; - repeated fixed64 unpacked_fixed64_extension = 97; - repeated sfixed32 unpacked_sfixed32_extension = 98; - repeated sfixed64 unpacked_sfixed64_extension = 99; - repeated float unpacked_float_extension = 100; - repeated double unpacked_double_extension = 101; - repeated bool unpacked_bool_extension = 102; - repeated UnpackedExtensionsForeignEnum unpacked_enum_extension = 103; -} - -enum UnpackedExtensionsForeignEnum { - FOREIGN_FOO = 4; - FOREIGN_BAR = 5; - FOREIGN_BAZ = 6; -} diff --git a/csharp/protos/extest/unittest_extras_full.proto b/csharp/protos/extest/unittest_extras_full.proto index a334bbf1..1b546053 100644 --- a/csharp/protos/extest/unittest_extras_full.proto +++ b/csharp/protos/extest/unittest_extras_full.proto @@ -1,13 +1,9 @@ -// Additional options required for C# generation. File from copyright -// line onwards is as per original distribution. -import "google/protobuf/csharp_options.proto"; -option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestExtrasFullProtoFile"; +syntax = "proto2"; package protobuf_unittest_extra; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; option optimize_for = CODE_SIZE; - option java_package = "com.google.protobuf"; message TestInteropPerson { @@ -45,7 +41,10 @@ message TestInteropEmployeeId { } extend TestInteropPerson { - required TestInteropEmployeeId employee_id = 126; + // Note: changed from required to optional, as required fields are not + // permitted in extensions. (The fact that this was allowed in protogen + // before was almost certainly a bug.) + optional TestInteropEmployeeId employee_id = 126; } message TestMissingFieldsA { diff --git a/csharp/protos/extest/unittest_extras_lite.proto b/csharp/protos/extest/unittest_extras_lite.proto index ea1bcd25..0c242d2f 100644 --- a/csharp/protos/extest/unittest_extras_lite.proto +++ b/csharp/protos/extest/unittest_extras_lite.proto @@ -1,14 +1,9 @@ -// Additional options required for C# generation. File from copyright -// line onwards is as per original distribution. -import "google/protobuf/csharp_options.proto"; -option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestExtrasLiteProtoFile"; -option (google.protobuf.csharp_file_options).add_serializable = true; +syntax = "proto2"; package protobuf_unittest_extra; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; option optimize_for = LITE_RUNTIME; - option java_package = "com.google.protobuf"; message TestRequiredLite { @@ -58,7 +53,10 @@ message TestInteropEmployeeIdLite { } extend TestInteropPersonLite { - required TestInteropEmployeeIdLite employee_id_lite = 126; + // Note: changed from required to optional, as required fields are not + // permitted in extensions. (The fact that this was allowed in protogen + // before was almost certainly a bug.) + optional TestInteropEmployeeIdLite employee_id_lite = 126; } /* Removed from unittest_lite.proto and added back here */ diff --git a/csharp/protos/extest/unittest_extras_xmltest.proto b/csharp/protos/extest/unittest_extras_xmltest.proto index ab8088a7..fae36165 100644 --- a/csharp/protos/extest/unittest_extras_xmltest.proto +++ b/csharp/protos/extest/unittest_extras_xmltest.proto @@ -1,7 +1,6 @@ -import "google/protobuf/csharp_options.proto"; -option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestXmlSerializerTestProtoFile"; -option (google.protobuf.csharp_file_options).add_serializable = true; +syntax = "proto2"; + +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; package protobuf_unittest_extra; diff --git a/csharp/protos/extest/unittest_generic_services.proto b/csharp/protos/extest/unittest_generic_services.proto index 3fe2e8eb..4e68ff0f 100644 --- a/csharp/protos/extest/unittest_generic_services.proto +++ b/csharp/protos/extest/unittest_generic_services.proto @@ -1,29 +1,30 @@ +syntax = "proto2"; + // Additional options required for C# generation. File from copyright // line onwards is as per original distribution. -import "google/protobuf/csharp_options.proto"; import "google/protobuf/unittest.proto"; import "google/protobuf/unittest_custom_options.proto"; -option (google.protobuf.csharp_file_options).namespace = "Google.ProtocolBuffers.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestGenericServices"; -option (google.protobuf.csharp_file_options).service_generator_type = GENERIC; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; + +// option (google.protobuf.csharp_file_options).service_generator_type = GENERIC; + +// We don't put this in a package within proto2 because we need to make sure +// that the generated code doesn't depend on being in the proto2 namespace. +package protobuf_unittest; -// We don't put this in a package within proto2 because we need to make sure -// that the generated code doesn't depend on being in the proto2 namespace. -package protobuf_unittest; - option optimize_for = SPEED; service TestGenericService { rpc Foo(FooRequest) returns (FooResponse); rpc Bar(BarRequest) returns (BarResponse); } - -service TestGenericServiceWithCustomOptions { - option (service_opt1) = -9876543210; - - rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) { - option (method_opt1) = METHODOPT1_VAL2; - } -} - + +service TestGenericServiceWithCustomOptions { + option (service_opt1) = -9876543210; + + rpc Foo(CustomOptionFooRequest) returns (CustomOptionFooResponse) { + option (method_opt1) = METHODOPT1_VAL2; + } +} + diff --git a/csharp/protos/extest/unittest_issues.proto b/csharp/protos/extest/unittest_issues.proto index cb803791..97249dff 100644 --- a/csharp/protos/extest/unittest_issues.proto +++ b/csharp/protos/extest/unittest_issues.proto @@ -1,10 +1,10 @@ +syntax = "proto2"; + // These proto descriptors have at one time been reported as an issue or defect. // They are kept here to replicate the issue, and continue to verify the fix. -import "google/protobuf/csharp_options.proto"; // Issue: Non-"Google.Protobuffers" namespace will ensure that protobuffer library types are qualified -option (google.protobuf.csharp_file_options).namespace = "UnitTest.Issues.TestProtos"; -option (google.protobuf.csharp_file_options).umbrella_classname = "UnitTestExtrasIssuesProtoFile"; +option csharp_namespace = "UnitTest.Issues.TestProtos"; package unittest_issues; option optimize_for = SPEED; @@ -67,24 +67,28 @@ service TestGenericService { rpc Bar(TestBasicNoFields) returns (TestBasicMessage); } */ -// Issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13 + +// Old issue 13: http://code.google.com/p/protobuf-csharp-port/issues/detail?id=13 +// New issue 309: https://github.com/google/protobuf/issues/309 -message A { - optional int32 _A = 1; -} +// message A { +// optional int32 _A = 1; +// } -message B { - optional int32 B_ = 1; -} +// message B { +// optional int32 B_ = 1; +// } -message AB { - optional int32 a_b = 1; -} +//message AB { +// optional int32 a_b = 1; +//} // Similar issue with numeric names -message NumberField { - optional int32 _01 = 1; -} +// Java code failed too, so probably best for this to be a restriction. +// See https://github.com/google/protobuf/issues/308 +// message NumberField { +// optional int32 _01 = 1; +// } // Issue 28: Circular message dependencies result in null defaults for DefaultInstance diff --git a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs index 02793aeb..54f400c3 100644 --- a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs @@ -132,8 +132,8 @@ namespace Google.ProtocolBuffers { byte[] bytes = TestUtil.GetPackedSet().ToByteArray(); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); - UnitTestProtoFile.RegisterAllExtensions(registry); - UnitTestExtrasProtoFile.RegisterAllExtensions(registry); + Unittest.RegisterAllExtensions(registry); + UnittestImport.RegisterAllExtensions(registry); TestUnpackedExtensions message = TestUnpackedExtensions.ParseFrom(bytes, registry); TestUtil.AssertUnpackedExtensionsSet(message); } @@ -143,7 +143,7 @@ namespace Google.ProtocolBuffers { byte[] bytes = TestUnpackedTypes.ParseFrom(TestUtil.GetPackedSet().ToByteArray()).ToByteArray(); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); - UnitTestProtoFile.RegisterAllExtensions(registry); + Unittest.RegisterAllExtensions(registry); TestPackedExtensions message = TestPackedExtensions.ParseFrom(bytes, registry); TestUtil.AssertPackedExtensionsSet(message); } @@ -250,7 +250,7 @@ namespace Google.ProtocolBuffers TestAllTypes d = TestAllTypes.CreateBuilder(c).AddRepeatedString("y").Build(); TestAllExtensions e = TestUtil.GetAllExtensionsSet(); TestAllExtensions f = TestAllExtensions.CreateBuilder(e) - .AddExtension(UnitTestProtoFile.RepeatedInt32Extension, 999).Build(); + .AddExtension(Unittest.RepeatedInt32Extension, 999).Build(); CheckEqualsIsConsistent(a); CheckEqualsIsConsistent(b); diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs index 20189617..5befe96f 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs @@ -7,7 +7,7 @@ namespace Google.ProtocolBuffers.Compatibility { /// /// This abstract base implements several tests to ensure that well-known messages can be written - /// and read to/from various formats without loosing data. Implementations overload the two serailization + /// and read to/from various formats without losing data. Implementations overload the two serailization /// methods to provide the tests with the means to read and write for a given format. /// public abstract class CompatibilityTests diff --git a/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs b/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs index ca10c621..e74236fb 100644 --- a/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs +++ b/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs @@ -51,7 +51,7 @@ namespace Google.ProtocolBuffers [TestMethod] public void FileDescriptor() { - FileDescriptor file = UnitTestProtoFile.Descriptor; + FileDescriptor file = Unittest.Descriptor; Assert.AreEqual("google/protobuf/unittest.proto", file.Name); Assert.AreEqual("protobuf_unittest", file.Package); @@ -59,9 +59,13 @@ namespace Google.ProtocolBuffers Assert.AreEqual("UnittestProto", file.Options.JavaOuterClassname); Assert.AreEqual("google/protobuf/unittest.proto", file.Proto.Name); -// TODO(jonskeet): Either change to expect 2 dependencies, or don't emit them. -// Assert.AreEqual(2, file.Dependencies.Count); - Assert.AreEqual(UnitTestImportProtoFile.Descriptor, file.Dependencies[1]); + // unittest.proto doesn't have any public imports, but unittest_import.proto does. + Assert.AreEqual(0, file.PublicDependencies.Count); + Assert.AreEqual(1, UnittestImport.Descriptor.PublicDependencies.Count); + Assert.AreEqual(UnittestImportPublic.Descriptor, UnittestImport.Descriptor.PublicDependencies[0]); + + Assert.AreEqual(1, file.Dependencies.Count); + Assert.AreEqual(UnittestImport.Descriptor, file.Dependencies[0]); MessageDescriptor messageType = TestAllTypes.Descriptor; Assert.AreEqual(messageType, file.MessageTypes[0]); @@ -76,33 +80,19 @@ namespace Google.ProtocolBuffers Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName("ForeignEnum")); Assert.IsNull(file.FindTypeByName("NoSuchType")); Assert.IsNull(file.FindTypeByName("protobuf_unittest.ForeignEnum")); - Assert.AreEqual(1, UnitTestImportProtoFile.Descriptor.EnumTypes.Count); - Assert.AreEqual("ImportEnum", UnitTestImportProtoFile.Descriptor.EnumTypes[0].Name); + Assert.AreEqual(1, UnittestImport.Descriptor.EnumTypes.Count); + Assert.AreEqual("ImportEnum", UnittestImport.Descriptor.EnumTypes[0].Name); for (int i = 0; i < file.EnumTypes.Count; i++) { Assert.AreEqual(i, file.EnumTypes[i].Index); } - ServiceDescriptor service = TestGenericService.Descriptor; - Assert.AreEqual(service, UnitTestGenericServices.Descriptor.Services[0]); - Assert.AreEqual(service, - UnitTestGenericServices.Descriptor.FindTypeByName("TestGenericService")); - Assert.IsNull(UnitTestGenericServices.Descriptor.FindTypeByName("NoSuchType")); - Assert.IsNull( - UnitTestGenericServices.Descriptor.FindTypeByName( - "protobuf_unittest.TestGenericService")); - Assert.AreEqual(0, UnitTestImportProtoFile.Descriptor.Services.Count); - for (int i = 0; i < file.Services.Count; i++) - { - Assert.AreEqual(i, file.Services[i].Index); - } - - FieldDescriptor extension = UnitTestProtoFile.OptionalInt32Extension.Descriptor; + FieldDescriptor extension = Unittest.OptionalInt32Extension.Descriptor; Assert.AreEqual(extension, file.Extensions[0]); Assert.AreEqual(extension, file.FindTypeByName("optional_int32_extension")); Assert.IsNull(file.FindTypeByName("no_such_ext")); Assert.IsNull(file.FindTypeByName("protobuf_unittest.optional_int32_extension")); - Assert.AreEqual(0, UnitTestImportProtoFile.Descriptor.Extensions.Count); + Assert.AreEqual(0, UnittestImport.Descriptor.Extensions.Count); for (int i = 0; i < file.Extensions.Count; i++) { Assert.AreEqual(i, file.Extensions[i].Index); @@ -117,14 +107,14 @@ namespace Google.ProtocolBuffers Assert.AreEqual("TestAllTypes", messageType.Name); Assert.AreEqual("protobuf_unittest.TestAllTypes", messageType.FullName); - Assert.AreEqual(UnitTestProtoFile.Descriptor, messageType.File); + Assert.AreEqual(Unittest.Descriptor, messageType.File); Assert.IsNull(messageType.ContainingType); Assert.AreEqual(DescriptorProtos.MessageOptions.DefaultInstance, messageType.Options); Assert.AreEqual("TestAllTypes", messageType.Proto.Name); Assert.AreEqual("NestedMessage", nestedType.Name); Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName); - Assert.AreEqual(UnitTestProtoFile.Descriptor, nestedType.File); + Assert.AreEqual(Unittest.Descriptor, nestedType.File); Assert.AreEqual(messageType, nestedType.ContainingType); FieldDescriptor field = messageType.Fields[0]; @@ -162,7 +152,7 @@ namespace Google.ProtocolBuffers FieldDescriptor enumField = messageType.FindDescriptor("optional_nested_enum"); FieldDescriptor messageField = messageType.FindDescriptor("optional_foreign_message"); FieldDescriptor cordField = messageType.FindDescriptor("optional_cord"); - FieldDescriptor extension = UnitTestProtoFile.OptionalInt32Extension.Descriptor; + FieldDescriptor extension = Unittest.OptionalInt32Extension.Descriptor; FieldDescriptor nestedExtension = TestRequired.Single.Descriptor; Assert.AreEqual("optional_int32", primitiveField.Name); @@ -170,7 +160,7 @@ namespace Google.ProtocolBuffers primitiveField.FullName); Assert.AreEqual(1, primitiveField.FieldNumber); Assert.AreEqual(messageType, primitiveField.ContainingType); - Assert.AreEqual(UnitTestProtoFile.Descriptor, primitiveField.File); + Assert.AreEqual(Unittest.Descriptor, primitiveField.File); Assert.AreEqual(FieldType.Int32, primitiveField.FieldType); Assert.AreEqual(MappedType.Int32, primitiveField.MappedType); Assert.AreEqual(DescriptorProtos.FieldOptions.DefaultInstance, primitiveField.Options); @@ -180,7 +170,7 @@ namespace Google.ProtocolBuffers Assert.AreEqual("optional_nested_enum", enumField.Name); Assert.AreEqual(FieldType.Enum, enumField.FieldType); Assert.AreEqual(MappedType.Enum, enumField.MappedType); - // Assert.AreEqual(TestAllTypes.Types.NestedEnum.Descriptor, enumField.EnumType); + // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType); Assert.AreEqual("optional_foreign_message", messageField.Name); Assert.AreEqual(FieldType.Message, messageField.FieldType); @@ -196,7 +186,7 @@ namespace Google.ProtocolBuffers Assert.AreEqual("protobuf_unittest.optional_int32_extension", extension.FullName); Assert.AreEqual(1, extension.FieldNumber); Assert.AreEqual(TestAllExtensions.Descriptor, extension.ContainingType); - Assert.AreEqual(UnitTestProtoFile.Descriptor, extension.File); + Assert.AreEqual(Unittest.Descriptor, extension.File); Assert.AreEqual(FieldType.Int32, extension.FieldType); Assert.AreEqual(MappedType.Int32, extension.MappedType); Assert.AreEqual(DescriptorProtos.FieldOptions.DefaultInstance, @@ -249,12 +239,12 @@ namespace Google.ProtocolBuffers public void EnumDescriptor() { // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor - EnumDescriptor enumType = UnitTestProtoFile.Descriptor.FindTypeByName("ForeignEnum"); + EnumDescriptor enumType = Unittest.Descriptor.FindTypeByName("ForeignEnum"); EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor("NestedEnum"); Assert.AreEqual("ForeignEnum", enumType.Name); Assert.AreEqual("protobuf_unittest.ForeignEnum", enumType.FullName); - Assert.AreEqual(UnitTestProtoFile.Descriptor, enumType.File); + Assert.AreEqual(Unittest.Descriptor, enumType.File); Assert.IsNull(enumType.ContainingType); Assert.AreEqual(DescriptorProtos.EnumOptions.DefaultInstance, enumType.Options); @@ -262,7 +252,7 @@ namespace Google.ProtocolBuffers Assert.AreEqual("NestedEnum", nestedType.Name); Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedEnum", nestedType.FullName); - Assert.AreEqual(UnitTestProtoFile.Descriptor, nestedType.File); + Assert.AreEqual(Unittest.Descriptor, nestedType.File); Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType); EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO"); @@ -277,74 +267,22 @@ namespace Google.ProtocolBuffers Assert.AreEqual(i, enumType.Values[i].Index); } } - - [TestMethod] - public void ServiceDescriptor() - { - ServiceDescriptor service = TestGenericService.Descriptor; - - Assert.AreEqual("TestGenericService", service.Name); - Assert.AreEqual("protobuf_unittest.TestGenericService", service.FullName); - Assert.AreEqual(UnitTestGenericServices.Descriptor, service.File); - - Assert.AreEqual(2, service.Methods.Count); - - MethodDescriptor fooMethod = service.Methods[0]; - Assert.AreEqual("Foo", fooMethod.Name); - Assert.AreEqual(FooRequest.Descriptor, fooMethod.InputType); - Assert.AreEqual(FooResponse.Descriptor, fooMethod.OutputType); - Assert.AreEqual(fooMethod, service.FindMethodByName("Foo")); - - MethodDescriptor barMethod = service.Methods[1]; - Assert.AreEqual("Bar", barMethod.Name); - Assert.AreEqual(BarRequest.Descriptor, barMethod.InputType); - Assert.AreEqual(BarResponse.Descriptor, barMethod.OutputType); - Assert.AreEqual(barMethod, service.FindMethodByName("Bar")); - - Assert.IsNull(service.FindMethodByName("NoSuchMethod")); - - for (int i = 0; i < service.Methods.Count; i++) - { - Assert.AreEqual(i, service.Methods[i].Index); - } - } + [TestMethod] public void CustomOptions() { MessageDescriptor descriptor = TestMessageWithCustomOptions.Descriptor; - Assert.IsTrue(descriptor.Options.HasExtension(UnitTestCustomOptionsProtoFile.MessageOpt1)); - Assert.AreEqual(-56, descriptor.Options.GetExtension(UnitTestCustomOptionsProtoFile.MessageOpt1)); + Assert.IsTrue(descriptor.Options.HasExtension(UnittestCustomOptions.MessageOpt1)); + Assert.AreEqual(-56, descriptor.Options.GetExtension(UnittestCustomOptions.MessageOpt1)); FieldDescriptor field = descriptor.FindFieldByName("field1"); Assert.IsNotNull(field); - Assert.IsTrue(field.Options.HasExtension(UnitTestCustomOptionsProtoFile.FieldOpt1)); - Assert.AreEqual(8765432109uL, field.Options.GetExtension(UnitTestCustomOptionsProtoFile.FieldOpt1)); - - // TODO: Write out enum descriptors - /* - EnumDescriptor enumType = TestMessageWithCustomOptions.Types. - UnittestCustomOptions.TestMessageWithCustomOptions.AnEnum.getDescriptor(); - - Assert.IsTrue( - enumType.getOptions().hasExtension(UnittestCustomOptions.enumOpt1)); - Assert.AreEqual(Integer.valueOf(-789), - enumType.getOptions().getExtension(UnittestCustomOptions.enumOpt1)); - */ - - ServiceDescriptor service = TestGenericServiceWithCustomOptions.Descriptor; - - Assert.IsTrue(service.Options.HasExtension(UnitTestCustomOptionsProtoFile.ServiceOpt1)); - Assert.AreEqual(-9876543210L, service.Options.GetExtension(UnitTestCustomOptionsProtoFile.ServiceOpt1)); - - MethodDescriptor method = service.FindMethodByName("Foo"); - Assert.IsNotNull(method); - - Assert.IsTrue(method.Options.HasExtension(UnitTestCustomOptionsProtoFile.MethodOpt1)); - Assert.AreEqual(MethodOpt1.METHODOPT1_VAL2, - method.Options.GetExtension(UnitTestCustomOptionsProtoFile.MethodOpt1)); + Assert.IsTrue(field.Options.HasExtension(UnittestCustomOptions.FieldOpt1)); + Assert.AreEqual(8765432109uL, field.Options.GetExtension(UnittestCustomOptions.FieldOpt1)); + } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs b/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs index 68f37c3c..4e0bf8e6 100644 --- a/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs @@ -48,7 +48,7 @@ namespace Google.ProtocolBuffers [TestMethod, ExpectedException(typeof(ArgumentException))] public void ExtensionWriterInvalidExtension() { - TestPackedExtensions.CreateBuilder()[UnitTestProtoFile.OptionalForeignMessageExtension.Descriptor] = + TestPackedExtensions.CreateBuilder()[Unittest.OptionalForeignMessageExtension.Descriptor] = ForeignMessage.DefaultInstance; } @@ -56,73 +56,73 @@ namespace Google.ProtocolBuffers public void ExtensionWriterTest() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder() - .SetExtension(UnitTestProtoFile.DefaultBoolExtension, true) - .SetExtension(UnitTestProtoFile.DefaultBytesExtension, ByteString.CopyFromUtf8("123")) - .SetExtension(UnitTestProtoFile.DefaultCordExtension, "123") - .SetExtension(UnitTestProtoFile.DefaultDoubleExtension, 123) - .SetExtension(UnitTestProtoFile.DefaultFixed32Extension, 123u) - .SetExtension(UnitTestProtoFile.DefaultFixed64Extension, 123u) - .SetExtension(UnitTestProtoFile.DefaultFloatExtension, 123) - .SetExtension(UnitTestProtoFile.DefaultForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) - .SetExtension(UnitTestProtoFile.DefaultImportEnumExtension, ImportEnum.IMPORT_BAZ) - .SetExtension(UnitTestProtoFile.DefaultInt32Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultInt64Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) - .SetExtension(UnitTestProtoFile.DefaultSfixed32Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultSfixed64Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultSint32Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultSint64Extension, 123) - .SetExtension(UnitTestProtoFile.DefaultStringExtension, "123") - .SetExtension(UnitTestProtoFile.DefaultStringPieceExtension, "123") - .SetExtension(UnitTestProtoFile.DefaultUint32Extension, 123u) - .SetExtension(UnitTestProtoFile.DefaultUint64Extension, 123u) + .SetExtension(Unittest.DefaultBoolExtension, true) + .SetExtension(Unittest.DefaultBytesExtension, ByteString.CopyFromUtf8("123")) + .SetExtension(Unittest.DefaultCordExtension, "123") + .SetExtension(Unittest.DefaultDoubleExtension, 123) + .SetExtension(Unittest.DefaultFixed32Extension, 123u) + .SetExtension(Unittest.DefaultFixed64Extension, 123u) + .SetExtension(Unittest.DefaultFloatExtension, 123) + .SetExtension(Unittest.DefaultForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) + .SetExtension(Unittest.DefaultImportEnumExtension, ImportEnum.IMPORT_BAZ) + .SetExtension(Unittest.DefaultInt32Extension, 123) + .SetExtension(Unittest.DefaultInt64Extension, 123) + .SetExtension(Unittest.DefaultNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) + .SetExtension(Unittest.DefaultSfixed32Extension, 123) + .SetExtension(Unittest.DefaultSfixed64Extension, 123) + .SetExtension(Unittest.DefaultSint32Extension, 123) + .SetExtension(Unittest.DefaultSint64Extension, 123) + .SetExtension(Unittest.DefaultStringExtension, "123") + .SetExtension(Unittest.DefaultStringPieceExtension, "123") + .SetExtension(Unittest.DefaultUint32Extension, 123u) + .SetExtension(Unittest.DefaultUint64Extension, 123u) //Optional - .SetExtension(UnitTestProtoFile.OptionalBoolExtension, true) - .SetExtension(UnitTestProtoFile.OptionalBytesExtension, ByteString.CopyFromUtf8("123")) - .SetExtension(UnitTestProtoFile.OptionalCordExtension, "123") - .SetExtension(UnitTestProtoFile.OptionalDoubleExtension, 123) - .SetExtension(UnitTestProtoFile.OptionalFixed32Extension, 123u) - .SetExtension(UnitTestProtoFile.OptionalFixed64Extension, 123u) - .SetExtension(UnitTestProtoFile.OptionalFloatExtension, 123) - .SetExtension(UnitTestProtoFile.OptionalForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) - .SetExtension(UnitTestProtoFile.OptionalImportEnumExtension, ImportEnum.IMPORT_BAZ) - .SetExtension(UnitTestProtoFile.OptionalInt32Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalInt64Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) - .SetExtension(UnitTestProtoFile.OptionalSfixed32Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalSfixed64Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalSint32Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalSint64Extension, 123) - .SetExtension(UnitTestProtoFile.OptionalStringExtension, "123") - .SetExtension(UnitTestProtoFile.OptionalStringPieceExtension, "123") - .SetExtension(UnitTestProtoFile.OptionalUint32Extension, 123u) - .SetExtension(UnitTestProtoFile.OptionalUint64Extension, 123u) + .SetExtension(Unittest.OptionalBoolExtension, true) + .SetExtension(Unittest.OptionalBytesExtension, ByteString.CopyFromUtf8("123")) + .SetExtension(Unittest.OptionalCordExtension, "123") + .SetExtension(Unittest.OptionalDoubleExtension, 123) + .SetExtension(Unittest.OptionalFixed32Extension, 123u) + .SetExtension(Unittest.OptionalFixed64Extension, 123u) + .SetExtension(Unittest.OptionalFloatExtension, 123) + .SetExtension(Unittest.OptionalForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) + .SetExtension(Unittest.OptionalImportEnumExtension, ImportEnum.IMPORT_BAZ) + .SetExtension(Unittest.OptionalInt32Extension, 123) + .SetExtension(Unittest.OptionalInt64Extension, 123) + .SetExtension(Unittest.OptionalNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) + .SetExtension(Unittest.OptionalSfixed32Extension, 123) + .SetExtension(Unittest.OptionalSfixed64Extension, 123) + .SetExtension(Unittest.OptionalSint32Extension, 123) + .SetExtension(Unittest.OptionalSint64Extension, 123) + .SetExtension(Unittest.OptionalStringExtension, "123") + .SetExtension(Unittest.OptionalStringPieceExtension, "123") + .SetExtension(Unittest.OptionalUint32Extension, 123u) + .SetExtension(Unittest.OptionalUint64Extension, 123u) //Repeated - .AddExtension(UnitTestProtoFile.RepeatedBoolExtension, true) - .AddExtension(UnitTestProtoFile.RepeatedBytesExtension, ByteString.CopyFromUtf8("123")) - .AddExtension(UnitTestProtoFile.RepeatedCordExtension, "123") - .AddExtension(UnitTestProtoFile.RepeatedDoubleExtension, 123) - .AddExtension(UnitTestProtoFile.RepeatedFixed32Extension, 123u) - .AddExtension(UnitTestProtoFile.RepeatedFixed64Extension, 123u) - .AddExtension(UnitTestProtoFile.RepeatedFloatExtension, 123) - .AddExtension(UnitTestProtoFile.RepeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) - .AddExtension(UnitTestProtoFile.RepeatedImportEnumExtension, ImportEnum.IMPORT_BAZ) - .AddExtension(UnitTestProtoFile.RepeatedInt32Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedInt64Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) - .AddExtension(UnitTestProtoFile.RepeatedSfixed32Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedSfixed64Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedSint32Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedSint64Extension, 123) - .AddExtension(UnitTestProtoFile.RepeatedStringExtension, "123") - .AddExtension(UnitTestProtoFile.RepeatedStringPieceExtension, "123") - .AddExtension(UnitTestProtoFile.RepeatedUint32Extension, 123u) - .AddExtension(UnitTestProtoFile.RepeatedUint64Extension, 123u) + .AddExtension(Unittest.RepeatedBoolExtension, true) + .AddExtension(Unittest.RepeatedBytesExtension, ByteString.CopyFromUtf8("123")) + .AddExtension(Unittest.RepeatedCordExtension, "123") + .AddExtension(Unittest.RepeatedDoubleExtension, 123) + .AddExtension(Unittest.RepeatedFixed32Extension, 123u) + .AddExtension(Unittest.RepeatedFixed64Extension, 123u) + .AddExtension(Unittest.RepeatedFloatExtension, 123) + .AddExtension(Unittest.RepeatedForeignEnumExtension, ForeignEnum.FOREIGN_BAZ) + .AddExtension(Unittest.RepeatedImportEnumExtension, ImportEnum.IMPORT_BAZ) + .AddExtension(Unittest.RepeatedInt32Extension, 123) + .AddExtension(Unittest.RepeatedInt64Extension, 123) + .AddExtension(Unittest.RepeatedNestedEnumExtension, TestAllTypes.Types.NestedEnum.FOO) + .AddExtension(Unittest.RepeatedSfixed32Extension, 123) + .AddExtension(Unittest.RepeatedSfixed64Extension, 123) + .AddExtension(Unittest.RepeatedSint32Extension, 123) + .AddExtension(Unittest.RepeatedSint64Extension, 123) + .AddExtension(Unittest.RepeatedStringExtension, "123") + .AddExtension(Unittest.RepeatedStringPieceExtension, "123") + .AddExtension(Unittest.RepeatedUint32Extension, 123u) + .AddExtension(Unittest.RepeatedUint64Extension, 123u) ; TestAllExtensions msg = builder.Build(); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); - UnitTestProtoFile.RegisterAllExtensions(registry); + Unittest.RegisterAllExtensions(registry); TestAllExtensions.Builder copyBuilder = TestAllExtensions.CreateBuilder().MergeFrom(msg.ToByteArray(), registry); @@ -130,73 +130,73 @@ namespace Google.ProtocolBuffers TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual(true, copy.GetExtension(UnitTestProtoFile.DefaultBoolExtension)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnitTestProtoFile.DefaultBytesExtension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.DefaultCordExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultDoubleExtension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.DefaultFixed32Extension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.DefaultFixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultFloatExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(UnitTestProtoFile.DefaultForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(UnitTestProtoFile.DefaultImportEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultInt32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultInt64Extension)); + Assert.AreEqual(true, copy.GetExtension(Unittest.DefaultBoolExtension)); + Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.DefaultBytesExtension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultCordExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultFloatExtension)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultInt32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultInt64Extension)); Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, - copy.GetExtension(UnitTestProtoFile.DefaultNestedEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultSfixed32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultSfixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultSint32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.DefaultSint64Extension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.DefaultStringExtension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.DefaultStringPieceExtension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.DefaultUint32Extension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.DefaultUint64Extension)); + copy.GetExtension(Unittest.DefaultNestedEnumExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSint32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSint64Extension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultStringExtension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultUint32Extension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultUint64Extension)); - Assert.AreEqual(true, copy.GetExtension(UnitTestProtoFile.OptionalBoolExtension)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnitTestProtoFile.OptionalBytesExtension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.OptionalCordExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalDoubleExtension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.OptionalFixed32Extension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.OptionalFixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalFloatExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(UnitTestProtoFile.OptionalForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(UnitTestProtoFile.OptionalImportEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalInt32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalInt64Extension)); + Assert.AreEqual(true, copy.GetExtension(Unittest.OptionalBoolExtension)); + Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.OptionalBytesExtension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalCordExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalFloatExtension)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.OptionalForeignEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalInt64Extension)); Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, - copy.GetExtension(UnitTestProtoFile.OptionalNestedEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalSfixed32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalSfixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalSint32Extension)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.OptionalSint64Extension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.OptionalStringExtension)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.OptionalStringPieceExtension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.OptionalUint32Extension)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.OptionalUint64Extension)); + copy.GetExtension(Unittest.OptionalNestedEnumExtension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSint32Extension)); + Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSint64Extension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalStringExtension)); + Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalUint32Extension)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalUint64Extension)); - Assert.AreEqual(true, copy.GetExtension(UnitTestProtoFile.RepeatedBoolExtension, 0)); + Assert.AreEqual(true, copy.GetExtension(Unittest.RepeatedBoolExtension, 0)); Assert.AreEqual(ByteString.CopyFromUtf8("123"), - copy.GetExtension(UnitTestProtoFile.RepeatedBytesExtension, 0)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.RepeatedCordExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedDoubleExtension, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.RepeatedFixed32Extension, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.RepeatedFixed64Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedFloatExtension, 0)); + copy.GetExtension(Unittest.RepeatedBytesExtension, 0)); + Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedCordExtension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedFloatExtension, 0)); Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, - copy.GetExtension(UnitTestProtoFile.RepeatedForeignEnumExtension, 0)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(UnitTestProtoFile.RepeatedImportEnumExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedInt32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedInt64Extension, 0)); + copy.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedInt64Extension, 0)); Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, - copy.GetExtension(UnitTestProtoFile.RepeatedNestedEnumExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedSfixed32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedSfixed64Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedSint32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(UnitTestProtoFile.RepeatedSint64Extension, 0)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.RepeatedStringExtension, 0)); - Assert.AreEqual("123", copy.GetExtension(UnitTestProtoFile.RepeatedStringPieceExtension, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.RepeatedUint32Extension, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnitTestProtoFile.RepeatedUint64Extension, 0)); + copy.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedUint64Extension, 0)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs index b04fb399..0e8b9807 100644 --- a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs @@ -398,24 +398,24 @@ namespace Google.ProtocolBuffers { // ClearExtension() is not actually used in TestUtil, so try it manually. Assert.IsFalse(TestAllExtensions.CreateBuilder() - .SetExtension(UnitTestProtoFile.OptionalInt32Extension, 1) - .ClearExtension(UnitTestProtoFile.OptionalInt32Extension) - .HasExtension(UnitTestProtoFile.OptionalInt32Extension)); + .SetExtension(Unittest.OptionalInt32Extension, 1) + .ClearExtension(Unittest.OptionalInt32Extension) + .HasExtension(Unittest.OptionalInt32Extension)); Assert.AreEqual(0, TestAllExtensions.CreateBuilder() - .AddExtension(UnitTestProtoFile.RepeatedInt32Extension, 1) - .ClearExtension(UnitTestProtoFile.RepeatedInt32Extension) - .GetExtensionCount(UnitTestProtoFile.RepeatedInt32Extension)); + .AddExtension(Unittest.RepeatedInt32Extension, 1) + .ClearExtension(Unittest.RepeatedInt32Extension) + .GetExtensionCount(Unittest.RepeatedInt32Extension)); } [TestMethod] public void ExtensionMergeFrom() { TestAllExtensions original = TestAllExtensions.CreateBuilder() - .SetExtension(UnitTestProtoFile.OptionalInt32Extension, 1).Build(); + .SetExtension(Unittest.OptionalInt32Extension, 1).Build(); TestAllExtensions merged = TestAllExtensions.CreateBuilder().MergeFrom(original).Build(); - Assert.IsTrue((merged.HasExtension(UnitTestProtoFile.OptionalInt32Extension))); - Assert.AreEqual(1, (int) merged.GetExtension(UnitTestProtoFile.OptionalInt32Extension)); + Assert.IsTrue((merged.HasExtension(Unittest.OptionalInt32Extension))); + Assert.AreEqual(1, (int) merged.GetExtension(Unittest.OptionalInt32Extension)); } /* Removed multiple files option for the moment @@ -430,13 +430,13 @@ namespace Google.ProtocolBuffers .Build(); Assert.AreEqual(message, MessageWithNoOuter.ParseFrom(message.ToByteString())); - Assert.AreEqual(MultiFileProto.Descriptor, MessageWithNoOuter.Descriptor.File); + Assert.AreEqual(MultiFileProto.DescriptorProtoFile, MessageWithNoOuter.DescriptorProtoFile.File); - FieldDescriptor field = MessageWithNoOuter.Descriptor.FindDescriptor("foreign_enum"); - Assert.AreEqual(MultiFileProto.Descriptor.FindTypeByName("EnumWithNoOuter") + FieldDescriptor field = MessageWithNoOuter.DescriptorProtoFile.FindDescriptor("foreign_enum"); + Assert.AreEqual(MultiFileProto.DescriptorProtoFile.FindTypeByName("EnumWithNoOuter") .FindValueByNumber((int)EnumWithNoOuter.BAR), message[field]); - Assert.AreEqual(MultiFileProto.Descriptor, ServiceWithNoOuter.Descriptor.File); + Assert.AreEqual(MultiFileProto.DescriptorProtoFile, ServiceWithNoOuter.DescriptorProtoFile.File); Assert.IsFalse(TestAllExtensions.DefaultInstance.HasExtension(MultiFileProto.ExtensionWithOuter)); }*/ @@ -512,14 +512,14 @@ namespace Google.ProtocolBuffers { Assert.AreEqual(TestRequired.SingleFieldNumber, 1000); Assert.AreEqual(TestRequired.MultiFieldNumber, 1001); - Assert.AreEqual(UnitTestProtoFile.OptionalInt32ExtensionFieldNumber, 1); - Assert.AreEqual(UnitTestProtoFile.OptionalGroupExtensionFieldNumber, 16); - Assert.AreEqual(UnitTestProtoFile.OptionalNestedMessageExtensionFieldNumber, 18); - Assert.AreEqual(UnitTestProtoFile.OptionalNestedEnumExtensionFieldNumber, 21); - Assert.AreEqual(UnitTestProtoFile.RepeatedInt32ExtensionFieldNumber, 31); - Assert.AreEqual(UnitTestProtoFile.RepeatedGroupExtensionFieldNumber, 46); - Assert.AreEqual(UnitTestProtoFile.RepeatedNestedMessageExtensionFieldNumber, 48); - Assert.AreEqual(UnitTestProtoFile.RepeatedNestedEnumExtensionFieldNumber, 51); + Assert.AreEqual(Unittest.OptionalInt32ExtensionFieldNumber, 1); + Assert.AreEqual(Unittest.OptionalGroupExtensionFieldNumber, 16); + Assert.AreEqual(Unittest.OptionalNestedMessageExtensionFieldNumber, 18); + Assert.AreEqual(Unittest.OptionalNestedEnumExtensionFieldNumber, 21); + Assert.AreEqual(Unittest.RepeatedInt32ExtensionFieldNumber, 31); + Assert.AreEqual(Unittest.RepeatedGroupExtensionFieldNumber, 46); + Assert.AreEqual(Unittest.RepeatedNestedMessageExtensionFieldNumber, 48); + Assert.AreEqual(Unittest.RepeatedNestedEnumExtensionFieldNumber, 51); } [TestMethod] diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 0dcdd1e6..b11b1ad8 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -82,9 +82,20 @@ - + + + + + + + + + + + + + - @@ -102,26 +113,8 @@ - - - - - - - - - - - - - - - - - - @@ -160,6 +153,7 @@ + - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj deleted file mode 100644 index 0c6344ed..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.CF35.csproj +++ /dev/null @@ -1,191 +0,0 @@ - - - COMPACT_FRAMEWORK - CF35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Smartphone - f27da329-3269-4191-98e0-c87d3d7f1db9 - - - true - full - false - bin\CF35\Debug - obj\CF35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\CF35\Release - obj\CF35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj deleted file mode 100644 index f0453fa1..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET20.csproj +++ /dev/null @@ -1,178 +0,0 @@ - - - CLIENTPROFILE - NET20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET20\Debug - obj\NET20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET20\Release - obj\NET20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj deleted file mode 100644 index 33630b44..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET35.csproj +++ /dev/null @@ -1,179 +0,0 @@ - - - CLIENTPROFILE - NET35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET35\Debug - obj\NET35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET35\Release - obj\NET35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj deleted file mode 100644 index 74ea7211..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.NET40.csproj +++ /dev/null @@ -1,179 +0,0 @@ - - - CLIENTPROFILE - NET40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET40\Debug - obj\NET40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET40\Release - obj\NET40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj deleted file mode 100644 index 018cf9d6..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.PL40.csproj +++ /dev/null @@ -1,213 +0,0 @@ - - - PORTABLE_LIBRARY - PL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - 10.0 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - - false - false - true - true - true - Google.ProtocolBuffers.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v4.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\PL40\Debug - obj\PL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - pdbonly - true - bin\PL40\Release - obj\PL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj deleted file mode 100644 index e54fa25c..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL20.csproj +++ /dev/null @@ -1,214 +0,0 @@ - - - SILVERLIGHT - SL20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffers.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v2.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL20\Debug - obj\SL20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL20\Release - obj\SL20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj deleted file mode 100644 index 76f6b1a2..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL30.csproj +++ /dev/null @@ -1,215 +0,0 @@ - - - SILVERLIGHT - SL30 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffers.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v3.5 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL30\Debug - obj\SL30\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL30\Release - obj\SL30\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj deleted file mode 100644 index ade3dc35..00000000 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.SL40.csproj +++ /dev/null @@ -1,215 +0,0 @@ - - - SILVERLIGHT - SL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {DD01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffers.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - v4.0 - true - true - Google.ProtocolBuffers.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL40\Debug - obj\SL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL40\Release - obj\SL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {231391AF-449C-4a39-986C-AD7F270F4750} - ProtocolBuffers.Serialization - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 5702c011..8d900266 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -13,18 +13,19 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffers.Test - v3.5 + v4.0 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 + Client true full false - bin\NET35\Debug - obj\NET35\Debug\ + bin\Debug + obj\Debug\ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 @@ -35,8 +36,8 @@ pdbonly true - bin\NET35\Release - obj\NET35\Release\ + bin\Release + obj\Release\ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 diff --git a/csharp/src/ProtocolBuffers.sln b/csharp/src/ProtocolBuffers.sln index 5eb488cf..6d609dc9 100644 --- a/csharp/src/ProtocolBuffers.sln +++ b/csharp/src/ProtocolBuffers.sln @@ -22,6 +22,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoDump", "ProtoDump\Prot EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoMunge", "ProtoMunge\ProtoMunge.csproj", "{8F09AF72-3327-4FA7-BC09-070B80221AB9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProtoBench", "ProtoBench\ProtoBench.csproj", "{C7A4A435-2813-41C8-AA87-BD914BA5223D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -68,6 +70,10 @@ Global {8F09AF72-3327-4FA7-BC09-070B80221AB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F09AF72-3327-4FA7-BC09-070B80221AB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F09AF72-3327-4FA7-BC09-070B80221AB9}.Release|Any CPU.Build.0 = Release|Any CPU + {C7A4A435-2813-41C8-AA87-BD914BA5223D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C7A4A435-2813-41C8-AA87-BD914BA5223D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C7A4A435-2813-41C8-AA87-BD914BA5223D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C7A4A435-2813-41C8-AA87-BD914BA5223D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/csharp/src/ProtocolBuffers/FieldSet.cs b/csharp/src/ProtocolBuffers/FieldSet.cs index f3c08cf5..4177400f 100644 --- a/csharp/src/ProtocolBuffers/FieldSet.cs +++ b/csharp/src/ProtocolBuffers/FieldSet.cs @@ -88,7 +88,7 @@ namespace Google.ProtocolBuffers public static FieldSet CreateInstance() { // Use SortedList to keep fields in the canonical order - return new FieldSet(new SortedList()); + return new FieldSet(new SortedDictionary()); } /// @@ -111,7 +111,7 @@ namespace Google.ProtocolBuffers if (hasRepeats) { - var tmp = new SortedList(); + var tmp = new SortedDictionary(); foreach (KeyValuePair entry in fields) { IList list = entry.Value as IList; @@ -151,8 +151,8 @@ namespace Google.ProtocolBuffers { get { - SortedList copy = - new SortedList(); + SortedDictionary copy = + new SortedDictionary(); foreach (KeyValuePair fd in fields) { copy.Add((FieldDescriptor) fd.Key, fd.Value); diff --git a/csharp/src/ProtocolBuffers/GeneratedMessage.cs b/csharp/src/ProtocolBuffers/GeneratedMessage.cs index 6f4b6657..c17c15cf 100644 --- a/csharp/src/ProtocolBuffers/GeneratedMessage.cs +++ b/csharp/src/ProtocolBuffers/GeneratedMessage.cs @@ -75,8 +75,8 @@ namespace Google.ProtocolBuffers internal IDictionary GetMutableFieldMap() { - // Use a SortedList so we'll end up serializing fields in order - var ret = new SortedList(); + // Use a SortedDictionary so we'll end up serializing fields in order + var ret = new SortedDictionary(); MessageDescriptor descriptor = DescriptorForType; foreach (FieldDescriptor field in descriptor.Fields) { diff --git a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs index 063f6666..806bd5d5 100644 --- a/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs +++ b/csharp/src/ProtocolBuffers/Properties/AssemblyInfo.cs @@ -65,6 +65,3 @@ using System.Security; [assembly: AssemblyFileVersion("2.4.1.555")] #endif -#if CLIENTPROFILE // ROK - not defined in SL, CF, or PL -[assembly: AllowPartiallyTrustedCallers] -#endif diff --git a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj index 5f6404a2..32a343ad 100644 --- a/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj +++ b/csharp/src/ProtocolBuffers/ProtocolBuffers.csproj @@ -1,8 +1,6 @@  - CLIENTPROFILE - NET35 Debug AnyCPU 9.0.30729 @@ -12,18 +10,21 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffers - v3.5 + {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Profile92 + v4.0 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 + 10.0 true full false - bin\NET35\Debug - obj\NET35\Debug\ + bin\Debug + obj\Debug\ $(OutputPath)\$(AssemblyName).xml 1591, 1570, 1571, 1572, 1573, 1574 DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) @@ -35,8 +36,8 @@ pdbonly true - bin\NET35\Release - obj\NET35\Release\ + bin\Release + obj\Release\ $(OutputPath)\$(AssemblyName).xml 1591, 1570, 1571, 1572, 1573, 1574 TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) @@ -137,7 +138,7 @@ - + - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj deleted file mode 100644 index 74edad11..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.CF35.csproj +++ /dev/null @@ -1,134 +0,0 @@ - - - COMPACT_FRAMEWORK - CF35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Smartphone - f27da329-3269-4191-98e0-c87d3d7f1db9 - - - true - full - false - bin\CF35\Debug - obj\CF35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\CF35\Release - obj\CF35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj deleted file mode 100644 index 59f9375f..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET20.csproj +++ /dev/null @@ -1,121 +0,0 @@ - - - CLIENTPROFILE - NET20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET20\Debug - obj\NET20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET20\Release - obj\NET20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj deleted file mode 100644 index e4ebfe1b..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET35.csproj +++ /dev/null @@ -1,122 +0,0 @@ - - - CLIENTPROFILE - NET35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET35\Debug - obj\NET35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET35\Release - obj\NET35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj deleted file mode 100644 index d02ac774..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.NET40.csproj +++ /dev/null @@ -1,122 +0,0 @@ - - - CLIENTPROFILE - NET40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET40\Debug - obj\NET40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET40\Release - obj\NET40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj deleted file mode 100644 index b645a01e..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.PL40.csproj +++ /dev/null @@ -1,156 +0,0 @@ - - - PORTABLE_LIBRARY - PL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - 10.0 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - - false - false - true - true - true - Google.ProtocolBuffersLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v4.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\PL40\Debug - obj\PL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - pdbonly - true - bin\PL40\Release - obj\PL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj deleted file mode 100644 index b4ad946f..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL20.csproj +++ /dev/null @@ -1,157 +0,0 @@ - - - SILVERLIGHT - SL20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffersLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v2.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL20\Debug - obj\SL20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL20\Release - obj\SL20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj deleted file mode 100644 index b5870ede..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL30.csproj +++ /dev/null @@ -1,158 +0,0 @@ - - - SILVERLIGHT - SL30 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffersLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v3.5 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL30\Debug - obj\SL30\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL30\Release - obj\SL30\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj deleted file mode 100644 index ef1543ec..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.SL40.csproj +++ /dev/null @@ -1,158 +0,0 @@ - - - SILVERLIGHT - SL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EE01ED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - v4.0 - true - true - Google.ProtocolBuffersLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL40\Debug - obj\SL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL40\Release - obj\SL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - TestRpcForMimeTypes.cs - - - TestRpcGenerator.cs - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {E067A59D-9D0A-4A1F-92B1-38E4457241D1} - ProtocolBuffersLite.Serialization - - - {6969BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffersLite - True - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 7701543c..12315442 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -13,18 +13,19 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffersLite.Test - v3.5 + v4.0 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 + Client true full false - bin\NET35\Debug - obj\NET35\Debug\ + bin\Debug + obj\Debug\ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 @@ -35,8 +36,8 @@ pdbonly true - bin\NET35\Release - obj\NET35\Release\ + bin\Release + obj\Release\ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj deleted file mode 100644 index 0ed3b36d..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF20.csproj +++ /dev/null @@ -1,126 +0,0 @@ - - - COMPACT_FRAMEWORK - CF20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Smartphone - f27da329-3269-4191-98e0-c87d3d7f1db9 - - - true - full - false - bin\CF20\Debug - obj\CF20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\CF20\Release - obj\CF20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj deleted file mode 100644 index 50d4e643..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.CF35.csproj +++ /dev/null @@ -1,127 +0,0 @@ - - - COMPACT_FRAMEWORK - CF35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {4D628B5B-2FBC-4AA6-8C16-197242AEB884};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Smartphone - f27da329-3269-4191-98e0-c87d3d7f1db9 - - - true - full - false - bin\CF35\Debug - obj\CF35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\CF35\Release - obj\CF35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOFILEVERSION - prompt - 4 - true - true - Off - true - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj deleted file mode 100644 index 80593a4d..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET20.csproj +++ /dev/null @@ -1,114 +0,0 @@ - - - CLIENTPROFILE - NET20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET20\Debug - obj\NET20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET20\Release - obj\NET20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOEXTENSIONS - prompt - 4 - true - true - Off - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj deleted file mode 100644 index e8b6d095..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET35.csproj +++ /dev/null @@ -1,115 +0,0 @@ - - - CLIENTPROFILE - NET35 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET35\Debug - obj\NET35\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET35\Release - obj\NET35\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj deleted file mode 100644 index 16ffefd6..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.NET40.csproj +++ /dev/null @@ -1,115 +0,0 @@ - - - CLIENTPROFILE - NET40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - - - true - full - false - bin\NET40\Debug - obj\NET40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - pdbonly - true - bin\NET40\Release - obj\NET40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) - prompt - 4 - true - true - Off - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj deleted file mode 100644 index 3d1a77b5..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.PL40.csproj +++ /dev/null @@ -1,149 +0,0 @@ - - - PORTABLE_LIBRARY - PL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - 10.0 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - - false - false - true - true - true - Google.ProtocolBuffersMixedLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v4.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\PL40\Debug - obj\PL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - pdbonly - true - bin\PL40\Release - obj\PL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj deleted file mode 100644 index 22b2c272..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL20.csproj +++ /dev/null @@ -1,150 +0,0 @@ - - - SILVERLIGHT - SL20 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v2.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffersMixedLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v2.0 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL20\Debug - obj\SL20\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL20\Release - obj\SL20\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST;NOEXTENSIONS - prompt - 4 - true - true - Off - true - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj deleted file mode 100644 index 3627b765..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL30.csproj +++ /dev/null @@ -1,151 +0,0 @@ - - - SILVERLIGHT - SL30 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v3.5 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - true - true - Google.ProtocolBuffersMixedLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - v3.5 - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL30\Debug - obj\SL30\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL30\Release - obj\SL30\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj deleted file mode 100644 index a98c4d38..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.SL40.csproj +++ /dev/null @@ -1,151 +0,0 @@ - - - SILVERLIGHT - SL40 - TEST - Debug - AnyCPU - 9.0.30729 - 2.0 - {EEFFED24-3750-4567-9A23-1DB676A15610} - Library - Properties - Google.ProtocolBuffers - Google.ProtocolBuffersMixedLite.Test - v4.0 - 512 - true - ..\..\keys\Google.ProtocolBuffers.snk - 3.5 - {A1591282-1198-4647-A2B1-27E5FF5F6F3B};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - true - false - false - v4.0 - true - true - Google.ProtocolBuffersMixedLite.Test.xap - Properties\AppManifest.xml - Google.ProtocolBuffers.App - TestPage.html - true - Properties\OutOfBrowserSettings.xml - true - - - true - full - false - bin\SL40\Debug - obj\SL40\Debug\ - DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - pdbonly - true - bin\SL40\Release - obj\SL40\Release\ - TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate);NOSERIALIZABLE;NOSORTEDLIST - prompt - 4 - true - true - Off - true - - - - - - - - - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll - - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll - - - - - Microsoft.VisualStudio.TestTools.cs - - - Properties\AssemblyInfo.cs - - - SerializableAttribute.cs - - - - - - - - - - - - - - - - - - - App.xaml - - - - - MSBuild:Compile - Designer - - - - - {6908BDCE-D925-43F3-94AC-A531E6DF2591} - ProtocolBuffers - - - - - - - - OfflineApplication - - - - - - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index 44b9a290..f7772f39 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -13,18 +13,19 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffersMixedLite.Test - v3.5 + v4.0 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 + Client true full false - bin\NET35\Debug - obj\NET35\Debug\ + bin\Debug + obj\Debug\ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 @@ -35,8 +36,8 @@ pdbonly true - bin\NET35\Release - obj\NET35\Release\ + bin\Release + obj\Release\ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 -- cgit v1.2.3 From 4af18b87117ab463042f90e9d3c00c1bb776bcf7 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Wed, 29 Apr 2015 14:20:23 -0700 Subject: rename FieldPResenceTest.cs file --- .../src/ProtocolBuffers.Test/FieldPResenceTest.cs | 187 --------------------- .../src/ProtocolBuffers.Test/FieldPresenceTest.cs | 187 +++++++++++++++++++++ 2 files changed, 187 insertions(+), 187 deletions(-) delete mode 100644 csharp/src/ProtocolBuffers.Test/FieldPResenceTest.cs create mode 100644 csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/FieldPResenceTest.cs b/csharp/src/ProtocolBuffers.Test/FieldPResenceTest.cs deleted file mode 100644 index a4818b63..00000000 --- a/csharp/src/ProtocolBuffers.Test/FieldPResenceTest.cs +++ /dev/null @@ -1,187 +0,0 @@ -#region Copyright notice and license - -// Protocol Buffers - Google's data interchange format -// Copyright 2015 Google Inc. All rights reserved. -// Author: jieluo@google.com (Jie Luo) -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#endregion - -using System; -using System.Reflection; -using System.Collections.Generic; -using Google.ProtocolBuffers.Descriptors; -using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Google.ProtocolBuffers -{ - [TestClass] - class FieldPresenceTest - { - private void CheckHasMethodRemoved(Type proto2Type, Type proto3Type, string name) - { - Assert.NotNull(proto2Type.GetProperty(name)); - Assert.NotNull(proto2Type.GetProperty("Has" + name)); - Assert.NotNull(proto3Type.GetProperty(name)); - Assert.Null(proto3Type.GetProperty("Has" + name)); - } - - [TestMethod] - public void TestHasMethod() - { - // Optional non-message fields don't have HasFoo method generated - Type proto2Type = typeof(TestAllTypes); - Type proto3Type = typeof(FieldPresence.TestAllTypes); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalInt32"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalString"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalBytes"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalNestedEnum"); - - proto2Type = typeof(TestAllTypes.Builder); - proto3Type = typeof(FieldPresence.TestAllTypes.Builder); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalInt32"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalString"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalBytes"); - CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalNestedEnum"); - - // message fields still have the HasFoo method generated - Assert.False(FieldPresence.TestAllTypes.CreateBuilder().Build().HasOptionalNestedMessage); - Assert.False(FieldPresence.TestAllTypes.CreateBuilder().HasOptionalNestedMessage); - } - - [TestMethod] - public void TestFieldPresence() - { - // Optional non-message fields set to their default value are treated the same - // way as not set. - - // Serialization will ignore such fields. - FieldPresence.TestAllTypes.Builder builder = FieldPresence.TestAllTypes.CreateBuilder(); - builder.SetOptionalInt32(0); - builder.SetOptionalString(""); - builder.SetOptionalBytes(ByteString.Empty); - builder.SetOptionalNestedEnum(FieldPresence.TestAllTypes.Types.NestedEnum.FOO); - FieldPresence.TestAllTypes message = builder.Build(); - Assert.AreEqual(0, message.SerializedSize); - - // Test merge - FieldPresence.TestAllTypes.Builder a = FieldPresence.TestAllTypes.CreateBuilder(); - a.SetOptionalInt32(1); - a.SetOptionalString("x"); - a.SetOptionalBytes(ByteString.CopyFromUtf8("y")); - a.SetOptionalNestedEnum(FieldPresence.TestAllTypes.Types.NestedEnum.BAR); - a.MergeFrom(message); - FieldPresence.TestAllTypes messageA = a.Build(); - Assert.AreEqual(1, messageA.OptionalInt32); - Assert.AreEqual("x", messageA.OptionalString); - Assert.AreEqual(ByteString.CopyFromUtf8("y"), messageA.OptionalBytes); - Assert.AreEqual(FieldPresence.TestAllTypes.Types.NestedEnum.BAR, messageA.OptionalNestedEnum); - - // equals/hashCode should produce the same results - FieldPresence.TestAllTypes empty = FieldPresence.TestAllTypes.CreateBuilder().Build(); - Assert.True(empty.Equals(message)); - Assert.True(message.Equals(empty)); - Assert.AreEqual(empty.GetHashCode(), message.GetHashCode()); - } - - [TestMethod] - public void TestFieldPresenceReflection() - { - MessageDescriptor descriptor = FieldPresence.TestAllTypes.Descriptor; - FieldDescriptor optionalInt32Field = descriptor.FindFieldByName("optional_int32"); - FieldDescriptor optionalStringField = descriptor.FindFieldByName("optional_string"); - FieldDescriptor optionalBytesField = descriptor.FindFieldByName("optional_bytes"); - FieldDescriptor optionalNestedEnumField = descriptor.FindFieldByName("optional_nested_enum"); - - FieldPresence.TestAllTypes message = FieldPresence.TestAllTypes.CreateBuilder().Build(); - Assert.False(message.HasField(optionalInt32Field)); - Assert.False(message.HasField(optionalStringField)); - Assert.False(message.HasField(optionalBytesField)); - Assert.False(message.HasField(optionalNestedEnumField)); - - // Set to default value is seen as not present - message = FieldPresence.TestAllTypes.CreateBuilder() - .SetOptionalInt32(0) - .SetOptionalString("") - .SetOptionalBytes(ByteString.Empty) - .SetOptionalNestedEnum(FieldPresence.TestAllTypes.Types.NestedEnum.FOO) - .Build(); - Assert.False(message.HasField(optionalInt32Field)); - Assert.False(message.HasField(optionalStringField)); - Assert.False(message.HasField(optionalBytesField)); - Assert.False(message.HasField(optionalNestedEnumField)); - Assert.AreEqual(0, message.AllFields.Count); - - // Set t0 non-defalut value is seen as present - message = FieldPresence.TestAllTypes.CreateBuilder() - .SetOptionalInt32(1) - .SetOptionalString("x") - .SetOptionalBytes(ByteString.CopyFromUtf8("y")) - .SetOptionalNestedEnum(FieldPresence.TestAllTypes.Types.NestedEnum.BAR) - .Build(); - Assert.True(message.HasField(optionalInt32Field)); - Assert.True(message.HasField(optionalStringField)); - Assert.True(message.HasField(optionalBytesField)); - Assert.True(message.HasField(optionalNestedEnumField)); - Assert.AreEqual(4, message.AllFields.Count); - } - - [TestMethod] - public void TestMessageField() - { - FieldPresence.TestAllTypes.Builder builder = FieldPresence.TestAllTypes.CreateBuilder(); - Assert.False(builder.HasOptionalNestedMessage); - Assert.False(builder.Build().HasOptionalNestedMessage); - - // Unlike non-message fields, if we set default value to message field, the field - // shoule be seem as present. - builder.SetOptionalNestedMessage(FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance); - Assert.True(builder.HasOptionalNestedMessage); - Assert.True(builder.Build().HasOptionalNestedMessage); - - } - - [TestMethod] - public void TestSeralizeAndParese() - { - FieldPresence.TestAllTypes.Builder builder = FieldPresence.TestAllTypes.CreateBuilder(); - builder.SetOptionalInt32(1234); - builder.SetOptionalString("hello"); - builder.SetOptionalNestedMessage(FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance); - ByteString data = builder.Build().ToByteString(); - - FieldPresence.TestAllTypes message = FieldPresence.TestAllTypes.ParseFrom(data); - Assert.AreEqual(1234, message.OptionalInt32); - Assert.AreEqual("hello", message.OptionalString); - Assert.AreEqual(ByteString.Empty, message.OptionalBytes); - Assert.AreEqual(FieldPresence.TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); - Assert.True(message.HasOptionalNestedMessage); - Assert.AreEqual(0, message.OptionalNestedMessage.Value); - } - } -} diff --git a/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs b/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs new file mode 100644 index 00000000..c08b40b2 --- /dev/null +++ b/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs @@ -0,0 +1,187 @@ +#region Copyright notice and license + +// Protocol Buffers - Google's data interchange format +// Copyright 2015 Google Inc. All rights reserved. +// Author: jieluo@google.com (Jie Luo) +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#endregion + +using System; +using System.Reflection; +using System.Collections.Generic; +using Google.ProtocolBuffers.Descriptors; +using Google.ProtocolBuffers.TestProtos.FieldPresence; +using Microsoft.VisualStudio.TestTools.UnitTesting; + +namespace Google.ProtocolBuffers +{ + [TestClass] + class FieldPresenceTest + { + private void CheckHasMethodRemoved(Type proto2Type, Type proto3Type, string name) + { + Assert.NotNull(proto2Type.GetProperty(name)); + Assert.NotNull(proto2Type.GetProperty("Has" + name)); + Assert.NotNull(proto3Type.GetProperty(name)); + Assert.Null(proto3Type.GetProperty("Has" + name)); + } + + [TestMethod] + public void TestHasMethod() + { + // Optional non-message fields don't have HasFoo method generated + Type proto2Type = typeof(Google.ProtocolBuffers.TestProtos.TestAllTypes); + Type proto3Type = typeof(TestAllTypes); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalInt32"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalString"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalBytes"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalNestedEnum"); + + proto2Type = typeof(Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder); + proto3Type = typeof(TestAllTypes.Builder); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalInt32"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalString"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalBytes"); + CheckHasMethodRemoved(proto2Type, proto3Type, "OptionalNestedEnum"); + + // message fields still have the HasFoo method generated + Assert.False(TestAllTypes.CreateBuilder().Build().HasOptionalNestedMessage); + Assert.False(TestAllTypes.CreateBuilder().HasOptionalNestedMessage); + } + + [TestMethod] + public void TestFieldPresence() + { + // Optional non-message fields set to their default value are treated the same + // way as not set. + + // Serialization will ignore such fields. + TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); + builder.SetOptionalInt32(0); + builder.SetOptionalString(""); + builder.SetOptionalBytes(ByteString.Empty); + builder.SetOptionalNestedEnum(TestAllTypes.Types.NestedEnum.FOO); + TestAllTypes message = builder.Build(); + Assert.AreEqual(0, message.SerializedSize); + + // Test merge + TestAllTypes.Builder a = TestAllTypes.CreateBuilder(); + a.SetOptionalInt32(1); + a.SetOptionalString("x"); + a.SetOptionalBytes(ByteString.CopyFromUtf8("y")); + a.SetOptionalNestedEnum(TestAllTypes.Types.NestedEnum.BAR); + a.MergeFrom(message); + TestAllTypes messageA = a.Build(); + Assert.AreEqual(1, messageA.OptionalInt32); + Assert.AreEqual("x", messageA.OptionalString); + Assert.AreEqual(ByteString.CopyFromUtf8("y"), messageA.OptionalBytes); + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, messageA.OptionalNestedEnum); + + // equals/hashCode should produce the same results + TestAllTypes empty = TestAllTypes.CreateBuilder().Build(); + Assert.True(empty.Equals(message)); + Assert.True(message.Equals(empty)); + Assert.AreEqual(empty.GetHashCode(), message.GetHashCode()); + } + + [TestMethod] + public void TestFieldPresenceReflection() + { + MessageDescriptor descriptor = TestAllTypes.Descriptor; + FieldDescriptor optionalInt32Field = descriptor.FindFieldByName("optional_int32"); + FieldDescriptor optionalStringField = descriptor.FindFieldByName("optional_string"); + FieldDescriptor optionalBytesField = descriptor.FindFieldByName("optional_bytes"); + FieldDescriptor optionalNestedEnumField = descriptor.FindFieldByName("optional_nested_enum"); + + TestAllTypes message = TestAllTypes.CreateBuilder().Build(); + Assert.False(message.HasField(optionalInt32Field)); + Assert.False(message.HasField(optionalStringField)); + Assert.False(message.HasField(optionalBytesField)); + Assert.False(message.HasField(optionalNestedEnumField)); + + // Set to default value is seen as not present + message = TestAllTypes.CreateBuilder() + .SetOptionalInt32(0) + .SetOptionalString("") + .SetOptionalBytes(ByteString.Empty) + .SetOptionalNestedEnum(TestAllTypes.Types.NestedEnum.FOO) + .Build(); + Assert.False(message.HasField(optionalInt32Field)); + Assert.False(message.HasField(optionalStringField)); + Assert.False(message.HasField(optionalBytesField)); + Assert.False(message.HasField(optionalNestedEnumField)); + Assert.AreEqual(0, message.AllFields.Count); + + // Set t0 non-defalut value is seen as present + message = TestAllTypes.CreateBuilder() + .SetOptionalInt32(1) + .SetOptionalString("x") + .SetOptionalBytes(ByteString.CopyFromUtf8("y")) + .SetOptionalNestedEnum(TestAllTypes.Types.NestedEnum.BAR) + .Build(); + Assert.True(message.HasField(optionalInt32Field)); + Assert.True(message.HasField(optionalStringField)); + Assert.True(message.HasField(optionalBytesField)); + Assert.True(message.HasField(optionalNestedEnumField)); + Assert.AreEqual(4, message.AllFields.Count); + } + + [TestMethod] + public void TestMessageField() + { + TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); + Assert.False(builder.HasOptionalNestedMessage); + Assert.False(builder.Build().HasOptionalNestedMessage); + + // Unlike non-message fields, if we set default value to message field, the field + // shoule be seem as present. + builder.SetOptionalNestedMessage(TestAllTypes.Types.NestedMessage.DefaultInstance); + Assert.True(builder.HasOptionalNestedMessage); + Assert.True(builder.Build().HasOptionalNestedMessage); + + } + + [TestMethod] + public void TestSeralizeAndParese() + { + TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); + builder.SetOptionalInt32(1234); + builder.SetOptionalString("hello"); + builder.SetOptionalNestedMessage(TestAllTypes.Types.NestedMessage.DefaultInstance); + ByteString data = builder.Build().ToByteString(); + + TestAllTypes message = TestAllTypes.ParseFrom(data); + Assert.AreEqual(1234, message.OptionalInt32); + Assert.AreEqual("hello", message.OptionalString); + Assert.AreEqual(ByteString.Empty, message.OptionalBytes); + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); + Assert.True(message.HasOptionalNestedMessage); + Assert.AreEqual(0, message.OptionalNestedMessage.Value); + } + } +} -- cgit v1.2.3 From c56475088d2d36d29a2640f35b9a8621796c051c Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Thu, 30 Apr 2015 11:05:36 +0100 Subject: Change to using xUnit for all unit tests, and fetch that via NuGet. This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer. --- .gitignore | 3 + .../Microsoft.VisualStudio.TestTools.cs | 54 - csharp/lib/NUnit-config/nunit-console.v2.0.config | 18 - csharp/lib/NUnit-config/nunit-console.v3.5.config | 18 - csharp/lib/NUnit-config/nunit-console.v4.0.config | 18 - .../ProtocolBuffers.Test/AbstractMessageTest.cs | 81 +- csharp/src/ProtocolBuffers.Test/ByteStringTest.cs | 77 +- .../ProtocolBuffers.Test/CodedInputStreamTest.cs | 272 +-- .../ProtocolBuffers.Test/CodedOutputStreamTest.cs | 223 ++- .../Collections/PopsicleListTest.cs | 84 +- .../Compatibility/BinaryCompatibilityTests.cs | 2 - .../Compatibility/CompatibilityTests.cs | 58 +- .../Compatibility/DictionaryCompatibilityTests.cs | 7 +- .../Compatibility/JsonCompatibilityTests.cs | 4 - .../Compatibility/TestResources.cs | 16 +- .../Compatibility/TextCompatibilityTests.cs | 8 +- .../Compatibility/XmlCompatibilityTests.cs | 4 - .../ProtocolBuffers.Test/DeprecatedMemberTest.cs | 21 +- csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs | 264 ++- .../src/ProtocolBuffers.Test/DynamicMessageTest.cs | 62 +- .../ProtocolBuffers.Test/ExtendableMessageTest.cs | 136 +- .../ProtocolBuffers.Test/GeneratedBuilderTest.cs | 85 +- .../ProtocolBuffers.Test/GeneratedMessageTest.cs | 234 ++- csharp/src/ProtocolBuffers.Test/IssuesTest.cs | 13 +- .../MessageStreamIteratorTest.cs | 17 +- .../MessageStreamWriterTest.cs | 5 +- csharp/src/ProtocolBuffers.Test/MessageTest.cs | 219 +-- csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs | 31 +- csharp/src/ProtocolBuffers.Test/NameHelpersTest.cs | 49 +- .../ProtocolBuffers.Test.csproj | 72 +- .../src/ProtocolBuffers.Test/ReflectionTester.cs | 958 +++++----- .../ProtocolBuffers.Test/ReusableBuilderTest.cs | 101 +- csharp/src/ProtocolBuffers.Test/TestCornerCases.cs | 16 +- .../ProtocolBuffers.Test/TestMimeMessageFormats.cs | 120 +- .../TestReaderForUrlEncoded.cs | 55 +- csharp/src/ProtocolBuffers.Test/TestUtil.cs | 1960 ++++++++++---------- .../ProtocolBuffers.Test/TestWriterFormatJson.cs | 146 +- .../ProtocolBuffers.Test/TestWriterFormatXml.cs | 129 +- csharp/src/ProtocolBuffers.Test/TextFormatTest.cs | 240 ++- .../ProtocolBuffers.Test/UnknownFieldSetTest.cs | 130 +- csharp/src/ProtocolBuffers.Test/WireFormatTest.cs | 75 +- csharp/src/ProtocolBuffers.Test/packages.config | 9 + .../AbstractBuilderLiteTest.cs | 128 +- .../AbstractMessageLiteTest.cs | 45 +- .../ExtendableBuilderLiteTest.cs | 127 +- .../ExtendableMessageLiteTest.cs | 217 ++- .../ProtocolBuffersLite.Test/InteropLiteTest.cs | 41 +- csharp/src/ProtocolBuffersLite.Test/LiteTest.cs | 31 +- .../MissingFieldAndExtensionTest.cs | 139 +- .../ProtocolBuffersLite.Test.csproj | 52 +- .../ProtocolBuffersLiteMixed.Test.csproj | 52 +- .../src/ProtocolBuffersLite.Test/TestLiteByApi.cs | 51 +- csharp/src/ProtocolBuffersLite.Test/TestUtil.cs | 31 - .../src/ProtocolBuffersLite.Test/packages.config | 9 + csharp/src/packages/repositories.config | 5 + 55 files changed, 3278 insertions(+), 3744 deletions(-) delete mode 100644 csharp/lib/NUnit-config/Microsoft.VisualStudio.TestTools.cs delete mode 100644 csharp/lib/NUnit-config/nunit-console.v2.0.config delete mode 100644 csharp/lib/NUnit-config/nunit-console.v3.5.config delete mode 100644 csharp/lib/NUnit-config/nunit-console.v4.0.config create mode 100644 csharp/src/ProtocolBuffers.Test/packages.config delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestUtil.cs create mode 100644 csharp/src/ProtocolBuffersLite.Test/packages.config create mode 100644 csharp/src/packages/repositories.config (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/.gitignore b/.gitignore index 220e5c38..c21c20cf 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,6 @@ javanano/target vsprojects/Debug vsprojects/Release +# NuGet packages: we want the repository configuration, but not the +# packages themselves. +/csharp/src/packages/*/ diff --git a/csharp/lib/NUnit-config/Microsoft.VisualStudio.TestTools.cs b/csharp/lib/NUnit-config/Microsoft.VisualStudio.TestTools.cs deleted file mode 100644 index fd151dae..00000000 --- a/csharp/lib/NUnit-config/Microsoft.VisualStudio.TestTools.cs +++ /dev/null @@ -1,54 +0,0 @@ - -using System; -#if CLIENTPROFILE -namespace Microsoft.VisualStudio.TestTools.UnitTesting -{ - [AttributeUsage(AttributeTargets.Class, Inherited = true, AllowMultiple = false)] - public sealed class TestClassAttribute : NUnit.Framework.TestFixtureAttribute - { - } - - [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)] - public sealed class TestMethodAttribute : NUnit.Framework.TestAttribute - { - } - - [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)] - public sealed class TestInitializeAttribute : NUnit.Framework.SetUpAttribute - { - } - - [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)] - public sealed class IgnoreAttribute : NUnit.Framework.IgnoreAttribute - { - } - - [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)] - public sealed class ExpectedExceptionAttribute : NUnit.Framework.ExpectedExceptionAttribute - { - public ExpectedExceptionAttribute(Type type) : base(type) - { } - } - - public class Assert : NUnit.Framework.Assert - { - [Obsolete("Do not use AreEqual on Byte[], use TestUtil.AssertBytesEqual(,)")] - public static void AreEqual(byte[] b1, byte[] b2) - { - NUnit.Framework.Assert.AreEqual(b1, b2); - } - - [Obsolete("No not use assert with miss-matched types.")] - public static new void AreEqual(object b1, object b2) - { - NUnit.Framework.Assert.AreEqual(b1, b2); - } - - //Allowed if the types match - public static void AreEqual(T b1, T b2) - { - NUnit.Framework.Assert.AreEqual(b1, b2); - } - } -} -#endif \ No newline at end of file diff --git a/csharp/lib/NUnit-config/nunit-console.v2.0.config b/csharp/lib/NUnit-config/nunit-console.v2.0.config deleted file mode 100644 index 30453c9b..00000000 --- a/csharp/lib/NUnit-config/nunit-console.v2.0.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/csharp/lib/NUnit-config/nunit-console.v3.5.config b/csharp/lib/NUnit-config/nunit-console.v3.5.config deleted file mode 100644 index 30453c9b..00000000 --- a/csharp/lib/NUnit-config/nunit-console.v3.5.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/csharp/lib/NUnit-config/nunit-console.v4.0.config b/csharp/lib/NUnit-config/nunit-console.v4.0.config deleted file mode 100644 index 08ee9547..00000000 --- a/csharp/lib/NUnit-config/nunit-console.v4.0.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs index 54f400c3..51606a37 100644 --- a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs @@ -38,15 +38,14 @@ using System; using System.Collections.Generic; using System.IO; using Google.ProtocolBuffers.Descriptors; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Google.ProtocolBuffers.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class AbstractMessageTest { - [TestMethod] + [Fact] public void Clear() { AbstractMessageWrapper message = @@ -54,7 +53,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertClear((TestAllTypes) message.WrappedMessage); } - [TestMethod] + [Fact] public void Copy() { AbstractMessageWrapper message = @@ -62,31 +61,31 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet((TestAllTypes) message.WrappedMessage); } - [TestMethod] + [Fact] public void CreateAndBuild() { TestAllTypes.CreateBuilder() .Build(); } - [TestMethod] + [Fact] public void SerializedSize() { TestAllTypes message = TestUtil.GetAllSet(); IMessage abstractMessage = new AbstractMessageWrapper(TestUtil.GetAllSet()); - Assert.AreEqual(message.SerializedSize, abstractMessage.SerializedSize); + Assert.Equal(message.SerializedSize, abstractMessage.SerializedSize); } - [TestMethod] + [Fact] public void Serialization() { IMessage abstractMessage = new AbstractMessageWrapper(TestUtil.GetAllSet()); TestUtil.AssertAllFieldsSet(TestAllTypes.ParseFrom(abstractMessage.ToByteString())); - Assert.AreEqual(TestUtil.GetAllSet().ToByteString(), abstractMessage.ToByteString()); + Assert.Equal(TestUtil.GetAllSet().ToByteString(), abstractMessage.ToByteString()); } - [TestMethod] + [Fact] public void Parsing() { IBuilder builder = new AbstractMessageWrapper.Builder(TestAllTypes.CreateBuilder()); @@ -95,15 +94,15 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet((TestAllTypes) message.WrappedMessage); } - [TestMethod] + [Fact] public void PackedSerialization() { IMessage abstractMessage = new AbstractMessageWrapper(TestUtil.GetPackedSet()); TestUtil.AssertPackedFieldsSet(TestPackedTypes.ParseFrom(abstractMessage.ToByteString())); - Assert.AreEqual(TestUtil.GetPackedSet().ToByteString(), abstractMessage.ToByteString()); + Assert.Equal(TestUtil.GetPackedSet().ToByteString(), abstractMessage.ToByteString()); } - [TestMethod] + [Fact] public void PackedParsing() { AbstractMessageWrapper.Builder builder = new AbstractMessageWrapper.Builder(TestPackedTypes.CreateBuilder()); @@ -111,7 +110,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedFieldsSet((TestPackedTypes)message.WrappedMessage); } - [TestMethod] + [Fact] public void UnpackedParsingOfPackedInput() { byte[] bytes = TestUtil.GetPackedSet().ToByteArray(); @@ -119,7 +118,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertUnpackedFieldsSet(message); } - [TestMethod] + [Fact] public void PackedParsingOfUnpackedInput() { byte[] bytes = TestUnpackedTypes.ParseFrom(TestUtil.GetPackedSet().ToByteArray()).ToByteArray(); @@ -127,7 +126,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedFieldsSet(message); } - [TestMethod] + [Fact] public void UnpackedParsingOfPackedInputExtensions() { byte[] bytes = TestUtil.GetPackedSet().ToByteArray(); @@ -138,7 +137,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertUnpackedExtensionsSet(message); } - [TestMethod] + [Fact] public void PackedParsingOfUnpackedInputExtensions() { byte[] bytes = TestUnpackedTypes.ParseFrom(TestUtil.GetPackedSet().ToByteArray()).ToByteArray(); @@ -148,13 +147,13 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedExtensionsSet(message); } - [TestMethod] + [Fact] public void OptimizedForSize() { // We're mostly only Checking that this class was compiled successfully. TestOptimizedForSize message = TestOptimizedForSize.CreateBuilder().SetI(1).Build(); message = TestOptimizedForSize.ParseFrom(message.ToByteString()); - Assert.AreEqual(2, message.SerializedSize); + Assert.Equal(2, message.SerializedSize); } // ----------------------------------------------------------------- @@ -165,40 +164,40 @@ namespace Google.ProtocolBuffers private static readonly TestRequired TestRequiredInitialized = TestRequired.CreateBuilder().SetA(1).SetB(2).SetC(3).Build(); - [TestMethod] + [Fact] public void IsInitialized() { TestRequired.Builder builder = TestRequired.CreateBuilder(); AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder); - Assert.IsFalse(abstractBuilder.IsInitialized); + Assert.False(abstractBuilder.IsInitialized); builder.A = 1; - Assert.IsFalse(abstractBuilder.IsInitialized); + Assert.False(abstractBuilder.IsInitialized); builder.B = 1; - Assert.IsFalse(abstractBuilder.IsInitialized); + Assert.False(abstractBuilder.IsInitialized); builder.C = 1; - Assert.IsTrue(abstractBuilder.IsInitialized); + Assert.True(abstractBuilder.IsInitialized); } - [TestMethod] + [Fact] public void ForeignIsInitialized() { TestRequiredForeign.Builder builder = TestRequiredForeign.CreateBuilder(); AbstractMessageWrapper.Builder abstractBuilder = new AbstractMessageWrapper.Builder(builder); - Assert.IsTrue(abstractBuilder.IsInitialized); + Assert.True(abstractBuilder.IsInitialized); builder.SetOptionalMessage(TestRequiredUninitialized); - Assert.IsFalse(abstractBuilder.IsInitialized); + Assert.False(abstractBuilder.IsInitialized); builder.SetOptionalMessage(TestRequiredInitialized); - Assert.IsTrue(abstractBuilder.IsInitialized); + Assert.True(abstractBuilder.IsInitialized); builder.AddRepeatedMessage(TestRequiredUninitialized); - Assert.IsFalse(abstractBuilder.IsInitialized); + Assert.False(abstractBuilder.IsInitialized); builder.SetRepeatedMessage(0, TestRequiredInitialized); - Assert.IsTrue(abstractBuilder.IsInitialized); + Assert.True(abstractBuilder.IsInitialized); } // ----------------------------------------------------------------- @@ -227,7 +226,7 @@ namespace Google.ProtocolBuffers "repeated_string: \"qux\"\n" + "repeated_string: \"bar\"\n"; - [TestMethod] + [Fact] public void MergeFrom() { AbstractMessageWrapper result = (AbstractMessageWrapper) @@ -235,13 +234,13 @@ namespace Google.ProtocolBuffers .MergeFrom(MergeSource) .Build(); - Assert.AreEqual(MergeResultText, result.ToString()); + Assert.Equal(MergeResultText, result.ToString()); } // ----------------------------------------------------------------- // Tests for equals and hashCode - [TestMethod] + [Fact] public void EqualsAndHashCode() { TestAllTypes a = TestUtil.GetAllSet(); @@ -297,7 +296,7 @@ namespace Google.ProtocolBuffers private static void CheckEqualsIsConsistent(IMessage message) { // Object should be equal to itself. - Assert.AreEqual(message, message); + Assert.Equal(message, message); // Object should be equal to a dynamic copy of itself. DynamicMessage dynamic = DynamicMessage.CreateBuilder(message).Build(); @@ -309,9 +308,11 @@ namespace Google.ProtocolBuffers /// private static void CheckEqualsIsConsistent(IMessage message1, IMessage message2) { - Assert.AreEqual(message1, message2); - Assert.AreEqual(message2, message1); - Assert.AreEqual(message2.GetHashCode(), message1.GetHashCode()); + // Not using Assert.AreEqual as that checks for type equality, which isn't + // what we want bearing in mind the dynamic message checks. + Assert.True(message1.Equals(message2)); + Assert.True(message2.Equals(message1)); + Assert.Equal(message2.GetHashCode(), message1.GetHashCode()); } /// @@ -325,10 +326,10 @@ namespace Google.ProtocolBuffers private static void CheckNotEqual(IMessage m1, IMessage m2) { String equalsError = string.Format("{0} should not be equal to {1}", m1, m2); - Assert.IsFalse(m1.Equals(m2), equalsError); - Assert.IsFalse(m2.Equals(m1), equalsError); + Assert.False(m1.Equals(m2), equalsError); + Assert.False(m2.Equals(m1), equalsError); - Assert.IsFalse(m1.GetHashCode() == m2.GetHashCode(), + Assert.False(m1.GetHashCode() == m2.GetHashCode(), string.Format("{0} should have a different hash code from {1}", m1, m2)); } diff --git a/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs b/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs index 003307ae..92c4ef0b 100644 --- a/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs +++ b/csharp/src/ProtocolBuffers.Test/ByteStringTest.cs @@ -36,113 +36,112 @@ using System; using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class ByteStringTest { - [TestMethod] + [Fact] public void EmptyByteStringHasZeroSize() { - Assert.AreEqual(0, ByteString.Empty.Length); + Assert.Equal(0, ByteString.Empty.Length); } - [TestMethod] + [Fact] public void CopyFromStringWithExplicitEncoding() { ByteString bs = ByteString.CopyFrom("AB", Encoding.Unicode); - Assert.AreEqual(4, bs.Length); - Assert.AreEqual(65, bs[0]); - Assert.AreEqual(0, bs[1]); - Assert.AreEqual(66, bs[2]); - Assert.AreEqual(0, bs[3]); + Assert.Equal(4, bs.Length); + Assert.Equal(65, bs[0]); + Assert.Equal(0, bs[1]); + Assert.Equal(66, bs[2]); + Assert.Equal(0, bs[3]); } - [TestMethod] + [Fact] public void IsEmptyWhenEmpty() { - Assert.IsTrue(ByteString.CopyFromUtf8("").IsEmpty); + Assert.True(ByteString.CopyFromUtf8("").IsEmpty); } - [TestMethod] + [Fact] public void IsEmptyWhenNotEmpty() { - Assert.IsFalse(ByteString.CopyFromUtf8("X").IsEmpty); + Assert.False(ByteString.CopyFromUtf8("X").IsEmpty); } - [TestMethod] + [Fact] public void CopyFromByteArrayCopiesContents() { byte[] data = new byte[1]; data[0] = 10; ByteString bs = ByteString.CopyFrom(data); - Assert.AreEqual(10, bs[0]); + Assert.Equal(10, bs[0]); data[0] = 5; - Assert.AreEqual(10, bs[0]); + Assert.Equal(10, bs[0]); } - [TestMethod] + [Fact] public void ToByteArrayCopiesContents() { ByteString bs = ByteString.CopyFromUtf8("Hello"); byte[] data = bs.ToByteArray(); - Assert.AreEqual((byte)'H', data[0]); - Assert.AreEqual((byte)'H', bs[0]); + Assert.Equal((byte)'H', data[0]); + Assert.Equal((byte)'H', bs[0]); data[0] = 0; - Assert.AreEqual(0, data[0]); - Assert.AreEqual((byte)'H', bs[0]); + Assert.Equal(0, data[0]); + Assert.Equal((byte)'H', bs[0]); } - [TestMethod] + [Fact] public void CopyFromUtf8UsesUtf8() { ByteString bs = ByteString.CopyFromUtf8("\u20ac"); - Assert.AreEqual(3, bs.Length); - Assert.AreEqual(0xe2, bs[0]); - Assert.AreEqual(0x82, bs[1]); - Assert.AreEqual(0xac, bs[2]); + Assert.Equal(3, bs.Length); + Assert.Equal(0xe2, bs[0]); + Assert.Equal(0x82, bs[1]); + Assert.Equal(0xac, bs[2]); } - [TestMethod] + [Fact] public void CopyFromPortion() { byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6}; ByteString bs = ByteString.CopyFrom(data, 2, 3); - Assert.AreEqual(3, bs.Length); - Assert.AreEqual(2, bs[0]); - Assert.AreEqual(3, bs[1]); + Assert.Equal(3, bs.Length); + Assert.Equal(2, bs[0]); + Assert.Equal(3, bs[1]); } - [TestMethod] + [Fact] public void ToStringUtf8() { ByteString bs = ByteString.CopyFromUtf8("\u20ac"); - Assert.AreEqual("\u20ac", bs.ToStringUtf8()); + Assert.Equal("\u20ac", bs.ToStringUtf8()); } - [TestMethod] + [Fact] public void ToStringWithExplicitEncoding() { ByteString bs = ByteString.CopyFrom("\u20ac", Encoding.Unicode); - Assert.AreEqual("\u20ac", bs.ToString(Encoding.Unicode)); + Assert.Equal("\u20ac", bs.ToString(Encoding.Unicode)); } - [TestMethod] + [Fact] public void FromBase64_WithText() { byte[] data = new byte[] {0, 1, 2, 3, 4, 5, 6}; string base64 = Convert.ToBase64String(data); ByteString bs = ByteString.FromBase64(base64); - TestUtil.AssertBytesEqual(data, bs.ToByteArray()); + Assert.Equal(data, bs.ToByteArray()); } - [TestMethod] + [Fact] public void FromBase64_Empty() { // Optimization which also fixes issue 61. - Assert.AreSame(ByteString.Empty, ByteString.FromBase64("")); + Assert.Same(ByteString.Empty, ByteString.FromBase64("")); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs b/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs index b09d3340..20bfef9e 100644 --- a/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs +++ b/csharp/src/ProtocolBuffers.Test/CodedInputStreamTest.cs @@ -39,12 +39,10 @@ using System.Collections.Generic; using System.IO; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Diagnostics; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class CodedInputStreamTest { /// @@ -68,21 +66,21 @@ namespace Google.ProtocolBuffers private static void AssertReadVarint(byte[] data, ulong value) { CodedInputStream input = CodedInputStream.CreateInstance(data); - Assert.AreEqual((uint) value, input.ReadRawVarint32()); + Assert.Equal((uint) value, input.ReadRawVarint32()); input = CodedInputStream.CreateInstance(data); - Assert.AreEqual(value, input.ReadRawVarint64()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawVarint64()); + Assert.True(input.IsAtEnd); // Try different block sizes. for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2) { input = CodedInputStream.CreateInstance(new SmallBlockInputStream(data, bufferSize)); - Assert.AreEqual((uint) value, input.ReadRawVarint32()); + Assert.Equal((uint) value, input.ReadRawVarint32()); input = CodedInputStream.CreateInstance(new SmallBlockInputStream(data, bufferSize)); - Assert.AreEqual(value, input.ReadRawVarint64()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawVarint64()); + Assert.True(input.IsAtEnd); } // Try reading directly from a MemoryStream. We want to verify that it @@ -92,8 +90,8 @@ namespace Google.ProtocolBuffers memoryStream.Write(data, 0, data.Length); memoryStream.WriteByte(0); memoryStream.Position = 0; - Assert.AreEqual((uint) value, CodedInputStream.ReadRawVarint32(memoryStream)); - Assert.AreEqual(data.Length, memoryStream.Position); + Assert.Equal((uint) value, CodedInputStream.ReadRawVarint32(memoryStream)); + Assert.Equal(data.Length, memoryStream.Position); } /// @@ -104,40 +102,19 @@ namespace Google.ProtocolBuffers private static void AssertReadVarintFailure(InvalidProtocolBufferException expected, byte[] data) { CodedInputStream input = CodedInputStream.CreateInstance(data); - try - { - input.ReadRawVarint32(); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual(expected.Message, e.Message); - } + var exception = Assert.Throws(() => input.ReadRawVarint32()); + Assert.Equal(expected.Message, exception.Message); input = CodedInputStream.CreateInstance(data); - try - { - input.ReadRawVarint64(); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual(expected.Message, e.Message); - } + exception = Assert.Throws(() => input.ReadRawVarint64()); + Assert.Equal(expected.Message, exception.Message); // Make sure we get the same error when reading directly from a Stream. - try - { - CodedInputStream.ReadRawVarint32(new MemoryStream(data)); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual(expected.Message, e.Message); - } + exception = Assert.Throws(() => CodedInputStream.ReadRawVarint32(new MemoryStream(data))); + Assert.Equal(expected.Message, exception.Message); } - [TestMethod] + [Fact] public void ReadVarint() { AssertReadVarint(Bytes(0x00), 0); @@ -182,16 +159,16 @@ namespace Google.ProtocolBuffers private static void AssertReadLittleEndian32(byte[] data, uint value) { CodedInputStream input = CodedInputStream.CreateInstance(data); - Assert.AreEqual(value, input.ReadRawLittleEndian32()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawLittleEndian32()); + Assert.True(input.IsAtEnd); // Try different block sizes. for (int blockSize = 1; blockSize <= 16; blockSize *= 2) { input = CodedInputStream.CreateInstance( new SmallBlockInputStream(data, blockSize)); - Assert.AreEqual(value, input.ReadRawLittleEndian32()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawLittleEndian32()); + Assert.True(input.IsAtEnd); } } @@ -202,20 +179,20 @@ namespace Google.ProtocolBuffers private static void AssertReadLittleEndian64(byte[] data, ulong value) { CodedInputStream input = CodedInputStream.CreateInstance(data); - Assert.AreEqual(value, input.ReadRawLittleEndian64()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawLittleEndian64()); + Assert.True(input.IsAtEnd); // Try different block sizes. for (int blockSize = 1; blockSize <= 16; blockSize *= 2) { input = CodedInputStream.CreateInstance( new SmallBlockInputStream(data, blockSize)); - Assert.AreEqual(value, input.ReadRawLittleEndian64()); - Assert.IsTrue(input.IsAtEnd); + Assert.Equal(value, input.ReadRawLittleEndian64()); + Assert.True(input.IsAtEnd); } } - [TestMethod] + [Fact] public void ReadLittleEndian() { AssertReadLittleEndian32(Bytes(0x78, 0x56, 0x34, 0x12), 0x12345678); @@ -227,41 +204,41 @@ namespace Google.ProtocolBuffers Bytes(0x78, 0x56, 0x34, 0x12, 0xf0, 0xde, 0xbc, 0x9a), 0x9abcdef012345678UL); } - [TestMethod] + [Fact] public void DecodeZigZag32() { - Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(0)); - Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(1)); - Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(2)); - Assert.AreEqual(-2, CodedInputStream.DecodeZigZag32(3)); - Assert.AreEqual(0x3FFFFFFF, CodedInputStream.DecodeZigZag32(0x7FFFFFFE)); - Assert.AreEqual(unchecked((int) 0xC0000000), CodedInputStream.DecodeZigZag32(0x7FFFFFFF)); - Assert.AreEqual(0x7FFFFFFF, CodedInputStream.DecodeZigZag32(0xFFFFFFFE)); - Assert.AreEqual(unchecked((int) 0x80000000), CodedInputStream.DecodeZigZag32(0xFFFFFFFF)); + Assert.Equal(0, CodedInputStream.DecodeZigZag32(0)); + Assert.Equal(-1, CodedInputStream.DecodeZigZag32(1)); + Assert.Equal(1, CodedInputStream.DecodeZigZag32(2)); + Assert.Equal(-2, CodedInputStream.DecodeZigZag32(3)); + Assert.Equal(0x3FFFFFFF, CodedInputStream.DecodeZigZag32(0x7FFFFFFE)); + Assert.Equal(unchecked((int) 0xC0000000), CodedInputStream.DecodeZigZag32(0x7FFFFFFF)); + Assert.Equal(0x7FFFFFFF, CodedInputStream.DecodeZigZag32(0xFFFFFFFE)); + Assert.Equal(unchecked((int) 0x80000000), CodedInputStream.DecodeZigZag32(0xFFFFFFFF)); } - [TestMethod] + [Fact] public void DecodeZigZag64() { - Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(0)); - Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(1)); - Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(2)); - Assert.AreEqual(-2, CodedInputStream.DecodeZigZag64(3)); - Assert.AreEqual(0x000000003FFFFFFFL, CodedInputStream.DecodeZigZag64(0x000000007FFFFFFEL)); - Assert.AreEqual(unchecked((long) 0xFFFFFFFFC0000000L), CodedInputStream.DecodeZigZag64(0x000000007FFFFFFFL)); - Assert.AreEqual(0x000000007FFFFFFFL, CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFEL)); - Assert.AreEqual(unchecked((long) 0xFFFFFFFF80000000L), CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFFL)); - Assert.AreEqual(0x7FFFFFFFFFFFFFFFL, CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL)); - Assert.AreEqual(unchecked((long) 0x8000000000000000L), CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL)); + Assert.Equal(0, CodedInputStream.DecodeZigZag64(0)); + Assert.Equal(-1, CodedInputStream.DecodeZigZag64(1)); + Assert.Equal(1, CodedInputStream.DecodeZigZag64(2)); + Assert.Equal(-2, CodedInputStream.DecodeZigZag64(3)); + Assert.Equal(0x000000003FFFFFFFL, CodedInputStream.DecodeZigZag64(0x000000007FFFFFFEL)); + Assert.Equal(unchecked((long) 0xFFFFFFFFC0000000L), CodedInputStream.DecodeZigZag64(0x000000007FFFFFFFL)); + Assert.Equal(0x000000007FFFFFFFL, CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFEL)); + Assert.Equal(unchecked((long) 0xFFFFFFFF80000000L), CodedInputStream.DecodeZigZag64(0x00000000FFFFFFFFL)); + Assert.Equal(0x7FFFFFFFFFFFFFFFL, CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFEL)); + Assert.Equal(unchecked((long) 0x8000000000000000L), CodedInputStream.DecodeZigZag64(0xFFFFFFFFFFFFFFFFL)); } - [TestMethod] + [Fact] public void ReadWholeMessage() { TestAllTypes message = TestUtil.GetAllSet(); byte[] rawBytes = message.ToByteArray(); - Assert.AreEqual(rawBytes.Length, message.SerializedSize); + Assert.Equal(rawBytes.Length, message.SerializedSize); TestAllTypes message2 = TestAllTypes.ParseFrom(rawBytes); TestUtil.AssertAllFieldsSet(message2); @@ -273,7 +250,7 @@ namespace Google.ProtocolBuffers } } - [TestMethod] + [Fact] public void SkipWholeMessage() { TestAllTypes message = TestUtil.GetAllSet(); @@ -290,8 +267,8 @@ namespace Google.ProtocolBuffers while (input1.ReadTag(out tag, out name)) { uint tag2; - Assert.IsTrue(input2.ReadTag(out tag2, out name)); - Assert.AreEqual(tag, tag2); + Assert.True(input2.ReadTag(out tag2, out name)); + Assert.Equal(tag, tag2); unknownFields.MergeFieldFrom(tag, input1); input2.SkipField(); @@ -302,7 +279,7 @@ namespace Google.ProtocolBuffers /// Test that a bug in SkipRawBytes has been fixed: if the skip /// skips exactly up to a limit, this should bnot break things /// - [TestMethod] + [Fact] public void SkipRawBytesBug() { byte[] rawBytes = new byte[] {1, 2}; @@ -311,7 +288,7 @@ namespace Google.ProtocolBuffers int limit = input.PushLimit(1); input.SkipRawBytes(1); input.PopLimit(limit); - Assert.AreEqual(2, input.ReadRawByte()); + Assert.Equal(2, input.ReadRawByte()); } public void ReadHugeBlob() @@ -334,7 +311,7 @@ namespace Google.ProtocolBuffers // reading. TestAllTypes message2 = TestAllTypes.ParseFrom(message.ToByteString().CreateCodedInput()); - Assert.AreEqual(message.OptionalBytes, message2.OptionalBytes); + Assert.Equal(message.OptionalBytes, message2.OptionalBytes); // Make sure all the other fields were parsed correctly. TestAllTypes message3 = TestAllTypes.CreateBuilder(message2) @@ -343,7 +320,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(message3); } - [TestMethod] + [Fact] public void ReadMaliciouslyLargeBlob() { MemoryStream ms = new MemoryStream(); @@ -359,19 +336,12 @@ namespace Google.ProtocolBuffers CodedInputStream input = CodedInputStream.CreateInstance(ms); uint testtag; string ignore; - Assert.IsTrue(input.ReadTag(out testtag, out ignore)); - Assert.AreEqual(tag, testtag); + Assert.True(input.ReadTag(out testtag, out ignore)); + Assert.Equal(tag, testtag); - try - { - ByteString bytes = null; - input.ReadBytes(ref bytes); - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // success. - } + ByteString bytes = null; + // TODO(jonskeet): Should this be ArgumentNullException instead? + Assert.Throws(() => input.ReadBytes(ref bytes)); } private static TestRecursiveMessage MakeRecursiveMessage(int depth) @@ -391,17 +361,17 @@ namespace Google.ProtocolBuffers { if (depth == 0) { - Assert.IsFalse(message.HasA); - Assert.AreEqual(5, message.I); + Assert.False(message.HasA); + Assert.Equal(5, message.I); } else { - Assert.IsTrue(message.HasA); + Assert.True(message.HasA); AssertMessageDepth(message.A, depth - 1); } } - [TestMethod] + [Fact] public void MaliciousRecursion() { ByteString data64 = MakeRecursiveMessage(64).ToByteString(); @@ -409,30 +379,14 @@ namespace Google.ProtocolBuffers AssertMessageDepth(TestRecursiveMessage.ParseFrom(data64), 64); - try - { - TestRecursiveMessage.ParseFrom(data65); - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // success. - } + Assert.Throws(() => TestRecursiveMessage.ParseFrom(data65)); CodedInputStream input = data64.CreateCodedInput(); input.SetRecursionLimit(8); - try - { - TestRecursiveMessage.ParseFrom(input); - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // success. - } + Assert.Throws(() => TestRecursiveMessage.ParseFrom(input)); } - [TestMethod] + [Fact] public void SizeLimit() { // Have to use a Stream rather than ByteString.CreateCodedInput as SizeLimit doesn't @@ -441,18 +395,10 @@ namespace Google.ProtocolBuffers CodedInputStream input = CodedInputStream.CreateInstance(ms); input.SetSizeLimit(16); - try - { - TestAllTypes.ParseFrom(input); - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // success. - } + Assert.Throws(() => TestAllTypes.ParseFrom(input)); } - [TestMethod] + [Fact] public void ResetSizeCounter() { CodedInputStream input = CodedInputStream.CreateInstance( @@ -460,28 +406,12 @@ namespace Google.ProtocolBuffers input.SetSizeLimit(16); input.ReadRawBytes(16); - try - { - input.ReadRawByte(); - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // Success. - } + Assert.Throws(() => input.ReadRawByte()); input.ResetSizeCounter(); input.ReadRawByte(); // No exception thrown. - try - { - input.ReadRawBytes(16); // Hits limit again. - Assert.Fail("Should have thrown an exception!"); - } - catch (InvalidProtocolBufferException) - { - // Success. - } + Assert.Throws(() => input.ReadRawBytes(16)); } /// @@ -489,7 +419,7 @@ namespace Google.ProtocolBuffers /// is thrown. Instead, the invalid bytes are replaced with the Unicode /// "replacement character" U+FFFD. /// - [TestMethod] + [Fact] public void ReadInvalidUtf8() { MemoryStream ms = new MemoryStream(); @@ -507,11 +437,11 @@ namespace Google.ProtocolBuffers uint testtag; string ignored; - Assert.IsTrue(input.ReadTag(out testtag, out ignored)); - Assert.AreEqual(tag, testtag); + Assert.True(input.ReadTag(out testtag, out ignored)); + Assert.Equal(tag, testtag); string text = null; input.ReadString(ref text); - Assert.AreEqual('\ufffd', text[0]); + Assert.Equal('\ufffd', text[0]); } /// @@ -537,7 +467,7 @@ namespace Google.ProtocolBuffers enum TestNegEnum { None = 0, Value = -2 } - [TestMethod] + [Fact] public void TestNegativeEnum() { byte[] bytes = new byte[10] { 0xFE, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01 }; @@ -545,12 +475,12 @@ namespace Google.ProtocolBuffers object unk; TestNegEnum val = TestNegEnum.None; - Assert.IsTrue(input.ReadEnum(ref val, out unk)); - Assert.IsTrue(input.IsAtEnd); - Assert.AreEqual(TestNegEnum.Value, val); + Assert.True(input.ReadEnum(ref val, out unk)); + Assert.True(input.IsAtEnd); + Assert.Equal(TestNegEnum.Value, val); } - [TestMethod] + [Fact] public void TestNegativeEnumPackedArray() { int arraySize = 1 + (10 * 5); @@ -559,26 +489,26 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WritePackedInt32Array(8, "", arraySize, new int[] { 0, -1, -2, -3, -4, -5 }); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); CodedInputStream input = CodedInputStream.CreateInstance(bytes); uint tag; string name; - Assert.IsTrue(input.ReadTag(out tag, out name)); + Assert.True(input.ReadTag(out tag, out name)); List values = new List(); ICollection unk; input.ReadEnumArray(tag, name, values, out unk); - Assert.AreEqual(2, values.Count); - Assert.AreEqual(TestNegEnum.None, values[0]); - Assert.AreEqual(TestNegEnum.Value, values[1]); + Assert.Equal(2, values.Count); + Assert.Equal(TestNegEnum.None, values[0]); + Assert.Equal(TestNegEnum.Value, values[1]); - Assert.IsNotNull(unk); - Assert.AreEqual(4, unk.Count); + Assert.NotNull(unk); + Assert.Equal(4, unk.Count); } - [TestMethod] + [Fact] public void TestNegativeEnumArray() { int arraySize = 1 + 1 + (11 * 5); @@ -587,27 +517,27 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WriteInt32Array(8, "", new int[] { 0, -1, -2, -3, -4, -5 }); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); CodedInputStream input = CodedInputStream.CreateInstance(bytes); uint tag; string name; - Assert.IsTrue(input.ReadTag(out tag, out name)); + Assert.True(input.ReadTag(out tag, out name)); List values = new List(); ICollection unk; input.ReadEnumArray(tag, name, values, out unk); - Assert.AreEqual(2, values.Count); - Assert.AreEqual(TestNegEnum.None, values[0]); - Assert.AreEqual(TestNegEnum.Value, values[1]); + Assert.Equal(2, values.Count); + Assert.Equal(TestNegEnum.None, values[0]); + Assert.Equal(TestNegEnum.Value, values[1]); - Assert.IsNotNull(unk); - Assert.AreEqual(4, unk.Count); + Assert.NotNull(unk); + Assert.Equal(4, unk.Count); } //Issue 71: CodedInputStream.ReadBytes go to slow path unnecessarily - [TestMethod] + [Fact] public void TestSlowPathAvoidance() { using (var ms = new MemoryStream()) @@ -624,15 +554,15 @@ namespace Google.ProtocolBuffers string ignore; ByteString value; - Assert.IsTrue(input.ReadTag(out tag, out ignore)); - Assert.AreEqual(1, WireFormat.GetTagFieldNumber(tag)); + Assert.True(input.ReadTag(out tag, out ignore)); + Assert.Equal(1, WireFormat.GetTagFieldNumber(tag)); value = ByteString.Empty; - Assert.IsTrue(input.ReadBytes(ref value) && value.Length == 100); + Assert.True(input.ReadBytes(ref value) && value.Length == 100); - Assert.IsTrue(input.ReadTag(out tag, out ignore)); - Assert.AreEqual(2, WireFormat.GetTagFieldNumber(tag)); + Assert.True(input.ReadTag(out tag, out ignore)); + Assert.Equal(2, WireFormat.GetTagFieldNumber(tag)); value = ByteString.Empty; - Assert.IsTrue(input.ReadBytes(ref value) && value.Length == 100); + Assert.True(input.ReadBytes(ref value) && value.Length == 100); } } } diff --git a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs b/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs index 8e4e9090..d9f53d74 100644 --- a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs +++ b/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs @@ -38,11 +38,10 @@ using System; using System.Collections.Generic; using System.IO; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class CodedOutputStreamTest { /// @@ -58,9 +57,9 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput); output.WriteRawVarint32((uint) value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); // Also try computing size. - Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value)); + Assert.Equal(data.Length, CodedOutputStream.ComputeRawVarint32Size((uint) value)); } { @@ -68,10 +67,10 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput); output.WriteRawVarint64(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); // Also try computing size. - Assert.AreEqual(data.Length, CodedOutputStream.ComputeRawVarint64Size(value)); + Assert.Equal(data.Length, CodedOutputStream.ComputeRawVarint64Size(value)); } // Try different buffer sizes. @@ -85,7 +84,7 @@ namespace Google.ProtocolBuffers CodedOutputStream.CreateInstance(rawOutput, bufferSize); output.WriteRawVarint32((uint) value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); } { @@ -93,7 +92,7 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput, bufferSize); output.WriteRawVarint64(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); } } } @@ -101,7 +100,7 @@ namespace Google.ProtocolBuffers /// /// Tests WriteRawVarint32() and WriteRawVarint64() /// - [TestMethod] + [Fact] public void WriteVarint() { AssertWriteVarint(new byte[] {0x00}, 0); @@ -143,7 +142,7 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput); output.WriteRawLittleEndian32(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); // Try different buffer sizes. for (int bufferSize = 1; bufferSize <= 16; bufferSize *= 2) @@ -152,7 +151,7 @@ namespace Google.ProtocolBuffers output = CodedOutputStream.CreateInstance(rawOutput, bufferSize); output.WriteRawLittleEndian32(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); } } @@ -166,7 +165,7 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(rawOutput); output.WriteRawLittleEndian64(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); // Try different block sizes. for (int blockSize = 1; blockSize <= 16; blockSize *= 2) @@ -175,14 +174,14 @@ namespace Google.ProtocolBuffers output = CodedOutputStream.CreateInstance(rawOutput, blockSize); output.WriteRawLittleEndian64(value); output.Flush(); - TestUtil.AssertBytesEqual(data, rawOutput.ToArray()); + Assert.Equal(data, rawOutput.ToArray()); } } /// /// Tests writeRawLittleEndian32() and writeRawLittleEndian64(). /// - [TestMethod] + [Fact] public void WriteLittleEndian() { AssertWriteLittleEndian32(new byte[] {0x78, 0x56, 0x34, 0x12}, 0x12345678); @@ -196,7 +195,7 @@ namespace Google.ProtocolBuffers 0x9abcdef012345678UL); } - [TestMethod] + [Fact] public void WriteWholeMessage() { TestAllTypes message = TestUtil.GetAllSet(); @@ -220,7 +219,7 @@ namespace Google.ProtocolBuffers /// Tests writing a whole message with every packed field type. Ensures the /// wire format of packed fields is compatible with C++. /// - [TestMethod] + [Fact] public void WriteWholePackedFieldsMessage() { TestPackedTypes message = TestUtil.GetPackedSet(); @@ -230,97 +229,97 @@ namespace Google.ProtocolBuffers rawBytes); } - [TestMethod] + [Fact] public void EncodeZigZag32() { - Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag32(0)); - Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag32(-1)); - Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag32(1)); - Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag32(-2)); - Assert.AreEqual(0x7FFFFFFEu, CodedOutputStream.EncodeZigZag32(0x3FFFFFFF)); - Assert.AreEqual(0x7FFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0xC0000000))); - Assert.AreEqual(0xFFFFFFFEu, CodedOutputStream.EncodeZigZag32(0x7FFFFFFF)); - Assert.AreEqual(0xFFFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0x80000000))); + Assert.Equal(0u, CodedOutputStream.EncodeZigZag32(0)); + Assert.Equal(1u, CodedOutputStream.EncodeZigZag32(-1)); + Assert.Equal(2u, CodedOutputStream.EncodeZigZag32(1)); + Assert.Equal(3u, CodedOutputStream.EncodeZigZag32(-2)); + Assert.Equal(0x7FFFFFFEu, CodedOutputStream.EncodeZigZag32(0x3FFFFFFF)); + Assert.Equal(0x7FFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0xC0000000))); + Assert.Equal(0xFFFFFFFEu, CodedOutputStream.EncodeZigZag32(0x7FFFFFFF)); + Assert.Equal(0xFFFFFFFFu, CodedOutputStream.EncodeZigZag32(unchecked((int) 0x80000000))); } - [TestMethod] + [Fact] public void EncodeZigZag64() { - Assert.AreEqual(0u, CodedOutputStream.EncodeZigZag64(0)); - Assert.AreEqual(1u, CodedOutputStream.EncodeZigZag64(-1)); - Assert.AreEqual(2u, CodedOutputStream.EncodeZigZag64(1)); - Assert.AreEqual(3u, CodedOutputStream.EncodeZigZag64(-2)); - Assert.AreEqual(0x000000007FFFFFFEuL, + Assert.Equal(0u, CodedOutputStream.EncodeZigZag64(0)); + Assert.Equal(1u, CodedOutputStream.EncodeZigZag64(-1)); + Assert.Equal(2u, CodedOutputStream.EncodeZigZag64(1)); + Assert.Equal(3u, CodedOutputStream.EncodeZigZag64(-2)); + Assert.Equal(0x000000007FFFFFFEuL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000003FFFFFFFUL))); - Assert.AreEqual(0x000000007FFFFFFFuL, + Assert.Equal(0x000000007FFFFFFFuL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFFC0000000UL))); - Assert.AreEqual(0x00000000FFFFFFFEuL, + Assert.Equal(0x00000000FFFFFFFEuL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0x000000007FFFFFFFUL))); - Assert.AreEqual(0x00000000FFFFFFFFuL, + Assert.Equal(0x00000000FFFFFFFFuL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0xFFFFFFFF80000000UL))); - Assert.AreEqual(0xFFFFFFFFFFFFFFFEL, + Assert.Equal(0xFFFFFFFFFFFFFFFEL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0x7FFFFFFFFFFFFFFFUL))); - Assert.AreEqual(0xFFFFFFFFFFFFFFFFL, + Assert.Equal(0xFFFFFFFFFFFFFFFFL, CodedOutputStream.EncodeZigZag64(unchecked((long) 0x8000000000000000UL))); } - [TestMethod] + [Fact] public void RoundTripZigZag32() { // Some easier-to-verify round-trip tests. The inputs (other than 0, 1, -1) // were chosen semi-randomly via keyboard bashing. - Assert.AreEqual(0, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(0))); - Assert.AreEqual(1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(1))); - Assert.AreEqual(-1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-1))); - Assert.AreEqual(14927, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(14927))); - Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-3612))); + Assert.Equal(0, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(0))); + Assert.Equal(1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(1))); + Assert.Equal(-1, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-1))); + Assert.Equal(14927, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(14927))); + Assert.Equal(-3612, CodedInputStream.DecodeZigZag32(CodedOutputStream.EncodeZigZag32(-3612))); } - [TestMethod] + [Fact] public void RoundTripZigZag64() { - Assert.AreEqual(0, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(0))); - Assert.AreEqual(1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(1))); - Assert.AreEqual(-1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-1))); - Assert.AreEqual(14927, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(14927))); - Assert.AreEqual(-3612, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-3612))); + Assert.Equal(0, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(0))); + Assert.Equal(1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(1))); + Assert.Equal(-1, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-1))); + Assert.Equal(14927, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(14927))); + Assert.Equal(-3612, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-3612))); - Assert.AreEqual(856912304801416L, + Assert.Equal(856912304801416L, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(856912304801416L))); - Assert.AreEqual(-75123905439571256L, + Assert.Equal(-75123905439571256L, CodedInputStream.DecodeZigZag64(CodedOutputStream.EncodeZigZag64(-75123905439571256L))); } - [TestMethod] + [Fact] public void TestNegativeEnumNoTag() { - Assert.AreEqual(10, CodedOutputStream.ComputeInt32SizeNoTag(-2)); - Assert.AreEqual(10, CodedOutputStream.ComputeEnumSizeNoTag(-2)); + Assert.Equal(10, CodedOutputStream.ComputeInt32SizeNoTag(-2)); + Assert.Equal(10, CodedOutputStream.ComputeEnumSizeNoTag(-2)); byte[] bytes = new byte[10]; CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WriteEnumNoTag(-2); - Assert.AreEqual(0, output.SpaceLeft); - Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes)); + Assert.Equal(0, output.SpaceLeft); + Assert.Equal("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes)); } - [TestMethod] + [Fact] public void TestNegativeEnumWithTag() { - Assert.AreEqual(11, CodedOutputStream.ComputeInt32Size(8, -2)); - Assert.AreEqual(11, CodedOutputStream.ComputeEnumSize(8, -2)); + Assert.Equal(11, CodedOutputStream.ComputeInt32Size(8, -2)); + Assert.Equal(11, CodedOutputStream.ComputeEnumSize(8, -2)); byte[] bytes = new byte[11]; CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WriteEnum(8, "", -2, -2); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); //fyi, 0x40 == 0x08 << 3 + 0, field num + wire format shift - Assert.AreEqual("40-FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes)); + Assert.Equal("40-FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes)); } - [TestMethod] + [Fact] public void TestNegativeEnumArrayPacked() { int arraySize = 1 + (10 * 5); @@ -329,22 +328,22 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WritePackedEnumArray(8, "", arraySize, new int[] { 0, -1, -2, -3, -4, -5 }); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); CodedInputStream input = CodedInputStream.CreateInstance(bytes); uint tag; string name; - Assert.IsTrue(input.ReadTag(out tag, out name)); + Assert.True(input.ReadTag(out tag, out name)); List values = new List(); input.ReadInt32Array(tag, name, values); - Assert.AreEqual(6, values.Count); + Assert.Equal(6, values.Count); for (int i = 0; i > -6; i--) - Assert.AreEqual(i, values[Math.Abs(i)]); + Assert.Equal(i, values[Math.Abs(i)]); } - [TestMethod] + [Fact] public void TestNegativeEnumArray() { int arraySize = 1 + 1 + (11 * 5); @@ -353,22 +352,22 @@ namespace Google.ProtocolBuffers CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); output.WriteEnumArray(8, "", new int[] { 0, -1, -2, -3, -4, -5 }); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); CodedInputStream input = CodedInputStream.CreateInstance(bytes); uint tag; string name; - Assert.IsTrue(input.ReadTag(out tag, out name)); + Assert.True(input.ReadTag(out tag, out name)); List values = new List(); input.ReadInt32Array(tag, name, values); - Assert.AreEqual(6, values.Count); + Assert.Equal(6, values.Count); for (int i = 0; i > -6; i--) - Assert.AreEqual(i, values[Math.Abs(i)]); + Assert.Equal(i, values[Math.Abs(i)]); } - [TestMethod] + [Fact] public void TestCodedInputOutputPosition() { byte[] content = new byte[110]; @@ -381,19 +380,19 @@ namespace Google.ProtocolBuffers CodedOutputStream cout = CodedOutputStream.CreateInstance(ms, 20); // Field 11: numeric value: 500 cout.WriteTag(11, WireFormat.WireType.Varint); - Assert.AreEqual(1, cout.Position); + Assert.Equal(1, cout.Position); cout.WriteInt32NoTag(500); - Assert.AreEqual(3, cout.Position); + Assert.Equal(3, cout.Position); //Field 12: length delimited 120 bytes cout.WriteTag(12, WireFormat.WireType.LengthDelimited); - Assert.AreEqual(4, cout.Position); + Assert.Equal(4, cout.Position); cout.WriteBytesNoTag(ByteString.CopyFrom(content)); - Assert.AreEqual(115, cout.Position); + Assert.Equal(115, cout.Position); // Field 13: fixed numeric value: 501 cout.WriteTag(13, WireFormat.WireType.Fixed32); - Assert.AreEqual(116, cout.Position); + Assert.Equal(116, cout.Position); cout.WriteSFixed32NoTag(501); - Assert.AreEqual(120, cout.Position); + Assert.Equal(120, cout.Position); cout.Flush(); } @@ -402,19 +401,19 @@ namespace Google.ProtocolBuffers CodedOutputStream cout = CodedOutputStream.CreateInstance(bytes); // Field 1: numeric value: 500 cout.WriteTag(1, WireFormat.WireType.Varint); - Assert.AreEqual(1, cout.Position); + Assert.Equal(1, cout.Position); cout.WriteInt32NoTag(500); - Assert.AreEqual(3, cout.Position); + Assert.Equal(3, cout.Position); //Field 2: length delimited 120 bytes cout.WriteTag(2, WireFormat.WireType.LengthDelimited); - Assert.AreEqual(4, cout.Position); + Assert.Equal(4, cout.Position); cout.WriteBytesNoTag(ByteString.CopyFrom(child)); - Assert.AreEqual(125, cout.Position); + Assert.Equal(125, cout.Position); // Field 3: fixed numeric value: 500 cout.WriteTag(3, WireFormat.WireType.Fixed32); - Assert.AreEqual(126, cout.Position); + Assert.Equal(126, cout.Position); cout.WriteSFixed32NoTag(501); - Assert.AreEqual(130, cout.Position); + Assert.Equal(130, cout.Position); cout.Flush(); } //Now test Input stream: @@ -423,49 +422,49 @@ namespace Google.ProtocolBuffers uint tag; int intValue = 0; string ignore; - Assert.AreEqual(0, cin.Position); + Assert.Equal(0, cin.Position); // Field 1: - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 1); - Assert.AreEqual(1, cin.Position); - Assert.IsTrue(cin.ReadInt32(ref intValue) && intValue == 500); - Assert.AreEqual(3, cin.Position); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 1); + Assert.Equal(1, cin.Position); + Assert.True(cin.ReadInt32(ref intValue) && intValue == 500); + Assert.Equal(3, cin.Position); //Field 2: - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 2); - Assert.AreEqual(4, cin.Position); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 2); + Assert.Equal(4, cin.Position); uint childlen = cin.ReadRawVarint32(); - Assert.AreEqual(120u, childlen); - Assert.AreEqual(5, cin.Position); + Assert.Equal(120u, childlen); + Assert.Equal(5, cin.Position); int oldlimit = cin.PushLimit((int)childlen); - Assert.AreEqual(5, cin.Position); + Assert.Equal(5, cin.Position); // Now we are reading child message { // Field 11: numeric value: 500 - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 11); - Assert.AreEqual(6, cin.Position); - Assert.IsTrue(cin.ReadInt32(ref intValue) && intValue == 500); - Assert.AreEqual(8, cin.Position); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 11); + Assert.Equal(6, cin.Position); + Assert.True(cin.ReadInt32(ref intValue) && intValue == 500); + Assert.Equal(8, cin.Position); //Field 12: length delimited 120 bytes - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 12); - Assert.AreEqual(9, cin.Position); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 12); + Assert.Equal(9, cin.Position); ByteString bstr = null; - Assert.IsTrue(cin.ReadBytes(ref bstr) && bstr.Length == 110 && bstr.ToByteArray()[109] == 109); - Assert.AreEqual(120, cin.Position); + Assert.True(cin.ReadBytes(ref bstr) && bstr.Length == 110 && bstr.ToByteArray()[109] == 109); + Assert.Equal(120, cin.Position); // Field 13: fixed numeric value: 501 - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 13); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 13); // ROK - Previously broken here, this returned 126 failing to account for bufferSizeAfterLimit - Assert.AreEqual(121, cin.Position); - Assert.IsTrue(cin.ReadSFixed32(ref intValue) && intValue == 501); - Assert.AreEqual(125, cin.Position); - Assert.IsTrue(cin.IsAtEnd); + Assert.Equal(121, cin.Position); + Assert.True(cin.ReadSFixed32(ref intValue) && intValue == 501); + Assert.Equal(125, cin.Position); + Assert.True(cin.IsAtEnd); } cin.PopLimit(oldlimit); - Assert.AreEqual(125, cin.Position); + Assert.Equal(125, cin.Position); // Field 3: fixed numeric value: 501 - Assert.IsTrue(cin.ReadTag(out tag, out ignore) && tag >> 3 == 3); - Assert.AreEqual(126, cin.Position); - Assert.IsTrue(cin.ReadSFixed32(ref intValue) && intValue == 501); - Assert.AreEqual(130, cin.Position); - Assert.IsTrue(cin.IsAtEnd); + Assert.True(cin.ReadTag(out tag, out ignore) && tag >> 3 == 3); + Assert.Equal(126, cin.Position); + Assert.True(cin.ReadSFixed32(ref intValue) && intValue == 501); + Assert.Equal(130, cin.Position); + Assert.True(cin.IsAtEnd); } } } diff --git a/csharp/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs b/csharp/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs index 0bce60d9..29584705 100644 --- a/csharp/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs +++ b/csharp/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs @@ -36,40 +36,39 @@ using System; using System.Collections.Generic; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers.Collections { - [TestClass] public class PopsicleListTest { - [TestMethod] + [Fact] public void MutatingOperationsOnFrozenList() { PopsicleList list = new PopsicleList(); list.MakeReadOnly(); - TestUtil.AssertNotSupported(() => list.Add("")); - TestUtil.AssertNotSupported(() => list.Clear()); - TestUtil.AssertNotSupported(() => list.Insert(0, "")); - TestUtil.AssertNotSupported(() => list.Remove("")); - TestUtil.AssertNotSupported(() => list.RemoveAt(0)); - TestUtil.AssertNotSupported(() => list.Add(new[] { "", "" })); + Assert.Throws(() => list.Add("")); + Assert.Throws(() => list.Clear()); + Assert.Throws(() => list.Insert(0, "")); + Assert.Throws(() => list.Remove("")); + Assert.Throws(() => list.RemoveAt(0)); + Assert.Throws(() => list.Add(new[] { "", "" })); } - [TestMethod] + [Fact] public void NonMutatingOperationsOnFrozenList() { PopsicleList list = new PopsicleList(); list.MakeReadOnly(); - Assert.IsFalse(list.Contains("")); - Assert.AreEqual(0, list.Count); + Assert.False(list.Contains("")); + Assert.Equal(0, list.Count); list.CopyTo(new string[5], 0); list.GetEnumerator(); - Assert.AreEqual(-1, list.IndexOf("")); - Assert.IsTrue(list.IsReadOnly); + Assert.Equal(-1, list.IndexOf("")); + Assert.True(list.IsReadOnly); } - [TestMethod] + [Fact] public void MutatingOperationsOnFluidList() { PopsicleList list = new PopsicleList(); @@ -81,73 +80,46 @@ namespace Google.ProtocolBuffers.Collections list.RemoveAt(0); } - [TestMethod] + [Fact] public void NonMutatingOperationsOnFluidList() { PopsicleList list = new PopsicleList(); - Assert.IsFalse(list.Contains("")); - Assert.AreEqual(0, list.Count); + Assert.False(list.Contains("")); + Assert.Equal(0, list.Count); list.CopyTo(new string[5], 0); list.GetEnumerator(); - Assert.AreEqual(-1, list.IndexOf("")); - Assert.IsFalse(list.IsReadOnly); + Assert.Equal(-1, list.IndexOf("")); + Assert.False(list.IsReadOnly); } - [TestMethod] + [Fact] public void DoesNotAddNullEnumerable() { PopsicleList list = new PopsicleList(); - try - { - list.Add((IEnumerable)null); - } - catch (ArgumentNullException) - { return; } - - Assert.Fail("List should not allow nulls."); + Assert.Throws(() => list.Add((IEnumerable) null)); } - [TestMethod] + [Fact] public void DoesNotAddRangeWithNull() { PopsicleList list = new PopsicleList(); - try - { - list.Add(new[] { "a", "b", null }); - } - catch (ArgumentNullException) - { return; } - - Assert.Fail("List should not allow nulls."); + // TODO(jonskeet): Change to ArgumentException? The argument isn't null... + Assert.Throws(() => list.Add(new[] {"a", "b", null})); } - [TestMethod] + [Fact] public void DoesNotAddNull() { PopsicleList list = new PopsicleList(); - try - { - list.Add((string)null); - } - catch (ArgumentNullException) - { return; } - - Assert.Fail("List should not allow nulls."); + Assert.Throws(() => list.Add((string) null)); } - [TestMethod] + [Fact] public void DoesNotSetNull() { PopsicleList list = new PopsicleList(); list.Add("a"); - try - { - list[0] = null; - } - catch (ArgumentNullException) - { return; } - - Assert.Fail("List should not allow nulls."); + Assert.Throws(() => list[0] = null); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs index 9707f8e8..30d257ad 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/BinaryCompatibilityTests.cs @@ -1,9 +1,7 @@ using System; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Google.ProtocolBuffers.Compatibility { - [TestClass] public class BinaryCompatibilityTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs index 5befe96f..d918c926 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/CompatibilityTests.cs @@ -1,6 +1,6 @@ using System; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers.Compatibility @@ -22,10 +22,10 @@ namespace Google.ProtocolBuffers.Compatibility protected virtual void AssertOutputEquals(object lhs, object rhs) { - Assert.AreEqual(lhs, rhs); + Assert.Equal(lhs, rhs); } - [TestMethod] + [Fact] public virtual void RoundTripWithEmptyChildMessageSize() { SizeMessage1 msg = SizeMessage1.CreateBuilder() @@ -37,12 +37,12 @@ namespace Google.ProtocolBuffers.Compatibility SizeMessage1 copy = DeserializeMessage(content, SizeMessage1.CreateBuilder(), ExtensionRegistry.Empty).BuildPartial(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public virtual void RoundTripWithEmptyChildMessageSpeed() { SpeedMessage1 msg = SpeedMessage1.CreateBuilder() @@ -54,12 +54,12 @@ namespace Google.ProtocolBuffers.Compatibility SpeedMessage1 copy = DeserializeMessage(content, SpeedMessage1.CreateBuilder(), ExtensionRegistry.Empty).BuildPartial(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(contents), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public virtual void RoundTripMessage1OptimizeSize() { SizeMessage1 msg = SizeMessage1.CreateBuilder().MergeFrom(TestResources.google_message1).Build(); @@ -67,12 +67,12 @@ namespace Google.ProtocolBuffers.Compatibility SizeMessage1 copy = DeserializeMessage(content, SizeMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public virtual void RoundTripMessage2OptimizeSize() { SizeMessage2 msg = SizeMessage2.CreateBuilder().MergeFrom(TestResources.google_message2).Build(); @@ -80,12 +80,12 @@ namespace Google.ProtocolBuffers.Compatibility SizeMessage2 copy = DeserializeMessage(content, SizeMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public virtual void RoundTripMessage1OptimizeSpeed() { SpeedMessage1 msg = SpeedMessage1.CreateBuilder().MergeFrom(TestResources.google_message1).Build(); @@ -93,12 +93,12 @@ namespace Google.ProtocolBuffers.Compatibility SpeedMessage1 copy = DeserializeMessage(content, SpeedMessage1.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(TestResources.google_message1), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public virtual void RoundTripMessage2OptimizeSpeed() { SpeedMessage2 msg = SpeedMessage2.CreateBuilder().MergeFrom(TestResources.google_message2).Build(); @@ -106,9 +106,9 @@ namespace Google.ProtocolBuffers.Compatibility SpeedMessage2 copy = DeserializeMessage(content, SpeedMessage2.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(TestResources.google_message2), Convert.ToBase64String(copy.ToByteArray())); } #region Test message builders @@ -185,7 +185,7 @@ namespace Google.ProtocolBuffers.Compatibility #endregion - [TestMethod] + [Fact] public void TestRoundTripAllTypes() { TestAllTypes msg = AddAllTypes(new TestAllTypes.Builder()).Build(); @@ -193,12 +193,12 @@ namespace Google.ProtocolBuffers.Compatibility TestAllTypes copy = DeserializeMessage(content, TestAllTypes.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public void TestRoundTripRepeatedTypes() { TestAllTypes msg = AddRepeatedTypes(new TestAllTypes.Builder(), 5).Build(); @@ -206,12 +206,12 @@ namespace Google.ProtocolBuffers.Compatibility TestAllTypes copy = DeserializeMessage(content, TestAllTypes.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); } - [TestMethod] + [Fact] public void TestRoundTripPackedTypes() { TestPackedTypes msg = AddPackedTypes(new TestPackedTypes.Builder(), 5).Build(); @@ -219,9 +219,9 @@ namespace Google.ProtocolBuffers.Compatibility TestPackedTypes copy = DeserializeMessage(content, TestPackedTypes.CreateBuilder(), ExtensionRegistry.Empty).Build(); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); AssertOutputEquals(content, SerializeMessage(copy)); - Assert.AreEqual(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); + Assert.Equal(Convert.ToBase64String(msg.ToByteArray()), Convert.ToBase64String(copy.ToByteArray())); } } } diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs index 73037cce..f555b101 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/DictionaryCompatibilityTests.cs @@ -1,13 +1,10 @@ using System; using System.Collections.Generic; -using System.IO; -using System.Text; using Google.ProtocolBuffers.Serialization; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers.Compatibility { - [TestClass] public class DictionaryCompatibilityTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) @@ -28,7 +25,7 @@ namespace Google.ProtocolBuffers.Compatibility IDictionary left = (IDictionary)lhs; IDictionary right = (IDictionary)rhs; - Assert.AreEqual( + Assert.Equal( String.Join(",", new List(left.Keys).ToArray()), String.Join(",", new List(right.Keys).ToArray()) ); diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs index 74603108..3c943d33 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/JsonCompatibilityTests.cs @@ -1,11 +1,8 @@ using System.IO; -using System.Text; using Google.ProtocolBuffers.Serialization; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Google.ProtocolBuffers.Compatibility { - [TestClass] public class JsonCompatibilityTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) @@ -23,7 +20,6 @@ namespace Google.ProtocolBuffers.Compatibility } } - [TestClass] public class JsonCompatibilityFormattedTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs index c3ce5883..4d1187a4 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TestResources.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.IO; +using Xunit; namespace Google.ProtocolBuffers.Compatibility { @@ -15,11 +12,11 @@ namespace Google.ProtocolBuffers.Compatibility Stream resource = typeof(TestResources).Assembly.GetManifestResourceStream( typeof(TestResources).Namespace + ".google_message1.dat"); - Assert.IsNotNull(resource, "Unable to the locate resource: google_message1"); + Assert.NotNull(resource); byte[] bytes = new byte[resource.Length]; int amtRead = resource.Read(bytes, 0, bytes.Length); - Assert.AreEqual(bytes.Length, amtRead); + Assert.Equal(bytes.Length, amtRead); return bytes; } } @@ -30,11 +27,10 @@ namespace Google.ProtocolBuffers.Compatibility Stream resource = typeof(TestResources).Assembly.GetManifestResourceStream( typeof(TestResources).Namespace + ".google_message2.dat"); - Assert.IsNotNull(resource, "Unable to the locate resource: google_message2"); - + Assert.NotNull(resource); byte[] bytes = new byte[resource.Length]; int amtRead = resource.Read(bytes, 0, bytes.Length); - Assert.AreEqual(bytes.Length, amtRead); + Assert.Equal(bytes.Length, amtRead); return bytes; } } diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs index c2eaadf6..2d74cf9f 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/TextCompatibilityTests.cs @@ -1,10 +1,8 @@ -using System.ComponentModel; using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers.Compatibility { - [TestClass] public class TextCompatibilityTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) @@ -20,14 +18,14 @@ namespace Google.ProtocolBuffers.Compatibility return builder; } //This test can take a very long time to run. - [TestMethod] + [Fact] public override void RoundTripMessage2OptimizeSize() { //base.RoundTripMessage2OptimizeSize(); } //This test can take a very long time to run. - [TestMethod] + [Fact] public override void RoundTripMessage2OptimizeSpeed() { //base.RoundTripMessage2OptimizeSpeed(); diff --git a/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs b/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs index 70614744..313523eb 100644 --- a/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs +++ b/csharp/src/ProtocolBuffers.Test/Compatibility/XmlCompatibilityTests.cs @@ -1,12 +1,9 @@ using System.IO; using System.Xml; using Google.ProtocolBuffers.Serialization; -using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; namespace Google.ProtocolBuffers.Compatibility { - [TestClass] public class XmlCompatibilityTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) @@ -24,7 +21,6 @@ namespace Google.ProtocolBuffers.Compatibility } } - [TestClass] public class XmlCompatibilityFormattedTests : CompatibilityTests { protected override object SerializeMessage(TMessage message) diff --git a/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs b/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs index 0901f043..21d21928 100644 --- a/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs +++ b/csharp/src/ProtocolBuffers.Test/DeprecatedMemberTest.cs @@ -1,22 +1,19 @@ using System; -using System.Collections.Generic; using System.Reflection; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTest.Issues.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class DeprecatedMemberTest { private static void AssertIsDeprecated(MemberInfo member) { - Assert.IsNotNull(member); - Assert.IsTrue(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member); + Assert.NotNull(member); + Assert.True(member.IsDefined(typeof(ObsoleteAttribute), false), "Member not obsolete: " + member); } - [TestMethod] + [Fact] public void TestDepreatedPrimitiveValue() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasPrimitiveValue")); @@ -27,7 +24,7 @@ namespace Google.ProtocolBuffers AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearPrimitiveValue")); AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetPrimitiveValue")); } - [TestMethod] + [Fact] public void TestDepreatedPrimitiveArray() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("PrimitiveArrayList")); @@ -42,7 +39,7 @@ namespace Google.ProtocolBuffers AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddRangePrimitiveArray")); AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearPrimitiveArray")); } - [TestMethod] + [Fact] public void TestDepreatedMessageValue() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasMessageValue")); @@ -55,7 +52,7 @@ namespace Google.ProtocolBuffers AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageValue", new[] { typeof(DeprecatedChild) })); AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetMessageValue", new[] { typeof(DeprecatedChild.Builder) })); } - [TestMethod] + [Fact] public void TestDepreatedMessageArray() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("MessageArrayList")); @@ -72,7 +69,7 @@ namespace Google.ProtocolBuffers AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("AddRangeMessageArray")); AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearMessageArray")); } - [TestMethod] + [Fact] public void TestDepreatedEnumValue() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("HasEnumValue")); @@ -83,7 +80,7 @@ namespace Google.ProtocolBuffers AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("ClearEnumValue")); AssertIsDeprecated(typeof(DeprecatedFieldsMessage.Builder).GetMethod("SetEnumValue")); } - [TestMethod] + [Fact] public void TestDepreatedEnumArray() { AssertIsDeprecated(typeof(DeprecatedFieldsMessage).GetProperty("EnumArrayList")); diff --git a/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs b/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs index e74236fb..680887d3 100644 --- a/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs +++ b/csharp/src/ProtocolBuffers.Test/DescriptorsTest.cs @@ -34,10 +34,9 @@ #endregion -using System.Text; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { @@ -45,106 +44,105 @@ namespace Google.ProtocolBuffers /// Tests for descriptors. (Not in its own namespace or broken up into individual classes as the /// size doesn't warrant it. On the other hand, this makes me feel a bit dirty...) /// - [TestClass] public class DescriptorsTest { - [TestMethod] + [Fact] public void FileDescriptor() { FileDescriptor file = Unittest.Descriptor; - Assert.AreEqual("google/protobuf/unittest.proto", file.Name); - Assert.AreEqual("protobuf_unittest", file.Package); + Assert.Equal("google/protobuf/unittest.proto", file.Name); + Assert.Equal("protobuf_unittest", file.Package); - Assert.AreEqual("UnittestProto", file.Options.JavaOuterClassname); - Assert.AreEqual("google/protobuf/unittest.proto", file.Proto.Name); + Assert.Equal("UnittestProto", file.Options.JavaOuterClassname); + Assert.Equal("google/protobuf/unittest.proto", file.Proto.Name); // unittest.proto doesn't have any public imports, but unittest_import.proto does. - Assert.AreEqual(0, file.PublicDependencies.Count); - Assert.AreEqual(1, UnittestImport.Descriptor.PublicDependencies.Count); - Assert.AreEqual(UnittestImportPublic.Descriptor, UnittestImport.Descriptor.PublicDependencies[0]); + Assert.Equal(0, file.PublicDependencies.Count); + Assert.Equal(1, UnittestImport.Descriptor.PublicDependencies.Count); + Assert.Equal(UnittestImportPublic.Descriptor, UnittestImport.Descriptor.PublicDependencies[0]); - Assert.AreEqual(1, file.Dependencies.Count); - Assert.AreEqual(UnittestImport.Descriptor, file.Dependencies[0]); + Assert.Equal(1, file.Dependencies.Count); + Assert.Equal(UnittestImport.Descriptor, file.Dependencies[0]); MessageDescriptor messageType = TestAllTypes.Descriptor; - Assert.AreEqual(messageType, file.MessageTypes[0]); - Assert.AreEqual(messageType, file.FindTypeByName("TestAllTypes")); - Assert.IsNull(file.FindTypeByName("NoSuchType")); - Assert.IsNull(file.FindTypeByName("protobuf_unittest.TestAllTypes")); + Assert.Equal(messageType, file.MessageTypes[0]); + Assert.Equal(messageType, file.FindTypeByName("TestAllTypes")); + Assert.Null(file.FindTypeByName("NoSuchType")); + Assert.Null(file.FindTypeByName("protobuf_unittest.TestAllTypes")); for (int i = 0; i < file.MessageTypes.Count; i++) { - Assert.AreEqual(i, file.MessageTypes[i].Index); + Assert.Equal(i, file.MessageTypes[i].Index); } - Assert.AreEqual(file.EnumTypes[0], file.FindTypeByName("ForeignEnum")); - Assert.IsNull(file.FindTypeByName("NoSuchType")); - Assert.IsNull(file.FindTypeByName("protobuf_unittest.ForeignEnum")); - Assert.AreEqual(1, UnittestImport.Descriptor.EnumTypes.Count); - Assert.AreEqual("ImportEnum", UnittestImport.Descriptor.EnumTypes[0].Name); + Assert.Equal(file.EnumTypes[0], file.FindTypeByName("ForeignEnum")); + Assert.Null(file.FindTypeByName("NoSuchType")); + Assert.Null(file.FindTypeByName("protobuf_unittest.ForeignEnum")); + Assert.Equal(1, UnittestImport.Descriptor.EnumTypes.Count); + Assert.Equal("ImportEnum", UnittestImport.Descriptor.EnumTypes[0].Name); for (int i = 0; i < file.EnumTypes.Count; i++) { - Assert.AreEqual(i, file.EnumTypes[i].Index); + Assert.Equal(i, file.EnumTypes[i].Index); } FieldDescriptor extension = Unittest.OptionalInt32Extension.Descriptor; - Assert.AreEqual(extension, file.Extensions[0]); - Assert.AreEqual(extension, file.FindTypeByName("optional_int32_extension")); - Assert.IsNull(file.FindTypeByName("no_such_ext")); - Assert.IsNull(file.FindTypeByName("protobuf_unittest.optional_int32_extension")); - Assert.AreEqual(0, UnittestImport.Descriptor.Extensions.Count); + Assert.Equal(extension, file.Extensions[0]); + Assert.Equal(extension, file.FindTypeByName("optional_int32_extension")); + Assert.Null(file.FindTypeByName("no_such_ext")); + Assert.Null(file.FindTypeByName("protobuf_unittest.optional_int32_extension")); + Assert.Equal(0, UnittestImport.Descriptor.Extensions.Count); for (int i = 0; i < file.Extensions.Count; i++) { - Assert.AreEqual(i, file.Extensions[i].Index); + Assert.Equal(i, file.Extensions[i].Index); } } - [TestMethod] + [Fact] public void MessageDescriptor() { MessageDescriptor messageType = TestAllTypes.Descriptor; MessageDescriptor nestedType = TestAllTypes.Types.NestedMessage.Descriptor; - Assert.AreEqual("TestAllTypes", messageType.Name); - Assert.AreEqual("protobuf_unittest.TestAllTypes", messageType.FullName); - Assert.AreEqual(Unittest.Descriptor, messageType.File); - Assert.IsNull(messageType.ContainingType); - Assert.AreEqual(DescriptorProtos.MessageOptions.DefaultInstance, messageType.Options); - Assert.AreEqual("TestAllTypes", messageType.Proto.Name); + Assert.Equal("TestAllTypes", messageType.Name); + Assert.Equal("protobuf_unittest.TestAllTypes", messageType.FullName); + Assert.Equal(Unittest.Descriptor, messageType.File); + Assert.Null(messageType.ContainingType); + Assert.Equal(DescriptorProtos.MessageOptions.DefaultInstance, messageType.Options); + Assert.Equal("TestAllTypes", messageType.Proto.Name); - Assert.AreEqual("NestedMessage", nestedType.Name); - Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName); - Assert.AreEqual(Unittest.Descriptor, nestedType.File); - Assert.AreEqual(messageType, nestedType.ContainingType); + Assert.Equal("NestedMessage", nestedType.Name); + Assert.Equal("protobuf_unittest.TestAllTypes.NestedMessage", nestedType.FullName); + Assert.Equal(Unittest.Descriptor, nestedType.File); + Assert.Equal(messageType, nestedType.ContainingType); FieldDescriptor field = messageType.Fields[0]; - Assert.AreEqual("optional_int32", field.Name); - Assert.AreEqual(field, messageType.FindDescriptor("optional_int32")); - Assert.IsNull(messageType.FindDescriptor("no_such_field")); - Assert.AreEqual(field, messageType.FindFieldByNumber(1)); - Assert.IsNull(messageType.FindFieldByNumber(571283)); + Assert.Equal("optional_int32", field.Name); + Assert.Equal(field, messageType.FindDescriptor("optional_int32")); + Assert.Null(messageType.FindDescriptor("no_such_field")); + Assert.Equal(field, messageType.FindFieldByNumber(1)); + Assert.Null(messageType.FindFieldByNumber(571283)); for (int i = 0; i < messageType.Fields.Count; i++) { - Assert.AreEqual(i, messageType.Fields[i].Index); + Assert.Equal(i, messageType.Fields[i].Index); } - Assert.AreEqual(nestedType, messageType.NestedTypes[0]); - Assert.AreEqual(nestedType, messageType.FindDescriptor("NestedMessage")); - Assert.IsNull(messageType.FindDescriptor("NoSuchType")); + Assert.Equal(nestedType, messageType.NestedTypes[0]); + Assert.Equal(nestedType, messageType.FindDescriptor("NestedMessage")); + Assert.Null(messageType.FindDescriptor("NoSuchType")); for (int i = 0; i < messageType.NestedTypes.Count; i++) { - Assert.AreEqual(i, messageType.NestedTypes[i].Index); + Assert.Equal(i, messageType.NestedTypes[i].Index); } - Assert.AreEqual(messageType.EnumTypes[0], messageType.FindDescriptor("NestedEnum")); - Assert.IsNull(messageType.FindDescriptor("NoSuchType")); + Assert.Equal(messageType.EnumTypes[0], messageType.FindDescriptor("NestedEnum")); + Assert.Null(messageType.FindDescriptor("NoSuchType")); for (int i = 0; i < messageType.EnumTypes.Count; i++) { - Assert.AreEqual(i, messageType.EnumTypes[i].Index); + Assert.Equal(i, messageType.EnumTypes[i].Index); } } - [TestMethod] + [Fact] public void FieldDescriptor() { MessageDescriptor messageType = TestAllTypes.Descriptor; @@ -155,54 +153,54 @@ namespace Google.ProtocolBuffers FieldDescriptor extension = Unittest.OptionalInt32Extension.Descriptor; FieldDescriptor nestedExtension = TestRequired.Single.Descriptor; - Assert.AreEqual("optional_int32", primitiveField.Name); - Assert.AreEqual("protobuf_unittest.TestAllTypes.optional_int32", + Assert.Equal("optional_int32", primitiveField.Name); + Assert.Equal("protobuf_unittest.TestAllTypes.optional_int32", primitiveField.FullName); - Assert.AreEqual(1, primitiveField.FieldNumber); - Assert.AreEqual(messageType, primitiveField.ContainingType); - Assert.AreEqual(Unittest.Descriptor, primitiveField.File); - Assert.AreEqual(FieldType.Int32, primitiveField.FieldType); - Assert.AreEqual(MappedType.Int32, primitiveField.MappedType); - Assert.AreEqual(DescriptorProtos.FieldOptions.DefaultInstance, primitiveField.Options); - Assert.IsFalse(primitiveField.IsExtension); - Assert.AreEqual("optional_int32", primitiveField.Proto.Name); - - Assert.AreEqual("optional_nested_enum", enumField.Name); - Assert.AreEqual(FieldType.Enum, enumField.FieldType); - Assert.AreEqual(MappedType.Enum, enumField.MappedType); - // Assert.AreEqual(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType); - - Assert.AreEqual("optional_foreign_message", messageField.Name); - Assert.AreEqual(FieldType.Message, messageField.FieldType); - Assert.AreEqual(MappedType.Message, messageField.MappedType); - Assert.AreEqual(ForeignMessage.Descriptor, messageField.MessageType); - - Assert.AreEqual("optional_cord", cordField.Name); - Assert.AreEqual(FieldType.String, cordField.FieldType); - Assert.AreEqual(MappedType.String, cordField.MappedType); - Assert.AreEqual(DescriptorProtos.FieldOptions.Types.CType.CORD, cordField.Options.Ctype); - - Assert.AreEqual("optional_int32_extension", extension.Name); - Assert.AreEqual("protobuf_unittest.optional_int32_extension", extension.FullName); - Assert.AreEqual(1, extension.FieldNumber); - Assert.AreEqual(TestAllExtensions.Descriptor, extension.ContainingType); - Assert.AreEqual(Unittest.Descriptor, extension.File); - Assert.AreEqual(FieldType.Int32, extension.FieldType); - Assert.AreEqual(MappedType.Int32, extension.MappedType); - Assert.AreEqual(DescriptorProtos.FieldOptions.DefaultInstance, + Assert.Equal(1, primitiveField.FieldNumber); + Assert.Equal(messageType, primitiveField.ContainingType); + Assert.Equal(Unittest.Descriptor, primitiveField.File); + Assert.Equal(FieldType.Int32, primitiveField.FieldType); + Assert.Equal(MappedType.Int32, primitiveField.MappedType); + Assert.Equal(DescriptorProtos.FieldOptions.DefaultInstance, primitiveField.Options); + Assert.False(primitiveField.IsExtension); + Assert.Equal("optional_int32", primitiveField.Proto.Name); + + Assert.Equal("optional_nested_enum", enumField.Name); + Assert.Equal(FieldType.Enum, enumField.FieldType); + Assert.Equal(MappedType.Enum, enumField.MappedType); + // Assert.Equal(TestAllTypes.Types.NestedEnum.DescriptorProtoFile, enumField.EnumType); + + Assert.Equal("optional_foreign_message", messageField.Name); + Assert.Equal(FieldType.Message, messageField.FieldType); + Assert.Equal(MappedType.Message, messageField.MappedType); + Assert.Equal(ForeignMessage.Descriptor, messageField.MessageType); + + Assert.Equal("optional_cord", cordField.Name); + Assert.Equal(FieldType.String, cordField.FieldType); + Assert.Equal(MappedType.String, cordField.MappedType); + Assert.Equal(DescriptorProtos.FieldOptions.Types.CType.CORD, cordField.Options.Ctype); + + Assert.Equal("optional_int32_extension", extension.Name); + Assert.Equal("protobuf_unittest.optional_int32_extension", extension.FullName); + Assert.Equal(1, extension.FieldNumber); + Assert.Equal(TestAllExtensions.Descriptor, extension.ContainingType); + Assert.Equal(Unittest.Descriptor, extension.File); + Assert.Equal(FieldType.Int32, extension.FieldType); + Assert.Equal(MappedType.Int32, extension.MappedType); + Assert.Equal(DescriptorProtos.FieldOptions.DefaultInstance, extension.Options); - Assert.IsTrue(extension.IsExtension); - Assert.AreEqual(null, extension.ExtensionScope); - Assert.AreEqual("optional_int32_extension", extension.Proto.Name); + Assert.True(extension.IsExtension); + Assert.Equal(null, extension.ExtensionScope); + Assert.Equal("optional_int32_extension", extension.Proto.Name); - Assert.AreEqual("single", nestedExtension.Name); - Assert.AreEqual("protobuf_unittest.TestRequired.single", + Assert.Equal("single", nestedExtension.Name); + Assert.Equal("protobuf_unittest.TestRequired.single", nestedExtension.FullName); - Assert.AreEqual(TestRequired.Descriptor, + Assert.Equal(TestRequired.Descriptor, nestedExtension.ExtensionScope); } - [TestMethod] + [Fact] public void FieldDescriptorLabel() { FieldDescriptor requiredField = @@ -212,76 +210,76 @@ namespace Google.ProtocolBuffers FieldDescriptor repeatedField = TestAllTypes.Descriptor.FindDescriptor("repeated_int32"); - Assert.IsTrue(requiredField.IsRequired); - Assert.IsFalse(requiredField.IsRepeated); - Assert.IsFalse(optionalField.IsRequired); - Assert.IsFalse(optionalField.IsRepeated); - Assert.IsFalse(repeatedField.IsRequired); - Assert.IsTrue(repeatedField.IsRepeated); + Assert.True(requiredField.IsRequired); + Assert.False(requiredField.IsRepeated); + Assert.False(optionalField.IsRequired); + Assert.False(optionalField.IsRepeated); + Assert.False(repeatedField.IsRequired); + Assert.True(repeatedField.IsRepeated); } - [TestMethod] + [Fact] public void FieldDescriptorDefault() { MessageDescriptor d = TestAllTypes.Descriptor; - Assert.IsFalse(d.FindDescriptor("optional_int32").HasDefaultValue); - Assert.AreEqual(0, d.FindDescriptor("optional_int32").DefaultValue); - Assert.IsTrue(d.FindDescriptor("default_int32").HasDefaultValue); - Assert.AreEqual(41, d.FindDescriptor("default_int32").DefaultValue); + Assert.False(d.FindDescriptor("optional_int32").HasDefaultValue); + Assert.Equal(0, d.FindDescriptor("optional_int32").DefaultValue); + Assert.True(d.FindDescriptor("default_int32").HasDefaultValue); + Assert.Equal(41, d.FindDescriptor("default_int32").DefaultValue); d = TestExtremeDefaultValues.Descriptor; - Assert.AreEqual(TestExtremeDefaultValues.DefaultInstance.EscapedBytes, + Assert.Equal(TestExtremeDefaultValues.DefaultInstance.EscapedBytes, d.FindDescriptor("escaped_bytes").DefaultValue); - Assert.AreEqual(uint.MaxValue, d.FindDescriptor("large_uint32").DefaultValue); - Assert.AreEqual(ulong.MaxValue, d.FindDescriptor("large_uint64").DefaultValue); + Assert.Equal(uint.MaxValue, d.FindDescriptor("large_uint32").DefaultValue); + Assert.Equal(ulong.MaxValue, d.FindDescriptor("large_uint64").DefaultValue); } - [TestMethod] + [Fact] public void EnumDescriptor() { // Note: this test is a bit different to the Java version because there's no static way of getting to the descriptor EnumDescriptor enumType = Unittest.Descriptor.FindTypeByName("ForeignEnum"); EnumDescriptor nestedType = TestAllTypes.Descriptor.FindDescriptor("NestedEnum"); - Assert.AreEqual("ForeignEnum", enumType.Name); - Assert.AreEqual("protobuf_unittest.ForeignEnum", enumType.FullName); - Assert.AreEqual(Unittest.Descriptor, enumType.File); - Assert.IsNull(enumType.ContainingType); - Assert.AreEqual(DescriptorProtos.EnumOptions.DefaultInstance, + Assert.Equal("ForeignEnum", enumType.Name); + Assert.Equal("protobuf_unittest.ForeignEnum", enumType.FullName); + Assert.Equal(Unittest.Descriptor, enumType.File); + Assert.Null(enumType.ContainingType); + Assert.Equal(DescriptorProtos.EnumOptions.DefaultInstance, enumType.Options); - Assert.AreEqual("NestedEnum", nestedType.Name); - Assert.AreEqual("protobuf_unittest.TestAllTypes.NestedEnum", + Assert.Equal("NestedEnum", nestedType.Name); + Assert.Equal("protobuf_unittest.TestAllTypes.NestedEnum", nestedType.FullName); - Assert.AreEqual(Unittest.Descriptor, nestedType.File); - Assert.AreEqual(TestAllTypes.Descriptor, nestedType.ContainingType); + Assert.Equal(Unittest.Descriptor, nestedType.File); + Assert.Equal(TestAllTypes.Descriptor, nestedType.ContainingType); EnumValueDescriptor value = enumType.FindValueByName("FOREIGN_FOO"); - Assert.AreEqual(value, enumType.Values[0]); - Assert.AreEqual("FOREIGN_FOO", value.Name); - Assert.AreEqual(4, value.Number); - Assert.AreEqual((int) ForeignEnum.FOREIGN_FOO, value.Number); - Assert.AreEqual(value, enumType.FindValueByNumber(4)); - Assert.IsNull(enumType.FindValueByName("NO_SUCH_VALUE")); + Assert.Equal(value, enumType.Values[0]); + Assert.Equal("FOREIGN_FOO", value.Name); + Assert.Equal(4, value.Number); + Assert.Equal((int) ForeignEnum.FOREIGN_FOO, value.Number); + Assert.Equal(value, enumType.FindValueByNumber(4)); + Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE")); for (int i = 0; i < enumType.Values.Count; i++) { - Assert.AreEqual(i, enumType.Values[i].Index); + Assert.Equal(i, enumType.Values[i].Index); } } - [TestMethod] + [Fact] public void CustomOptions() { MessageDescriptor descriptor = TestMessageWithCustomOptions.Descriptor; - Assert.IsTrue(descriptor.Options.HasExtension(UnittestCustomOptions.MessageOpt1)); - Assert.AreEqual(-56, descriptor.Options.GetExtension(UnittestCustomOptions.MessageOpt1)); + Assert.True(descriptor.Options.HasExtension(UnittestCustomOptions.MessageOpt1)); + Assert.Equal(-56, descriptor.Options.GetExtension(UnittestCustomOptions.MessageOpt1)); FieldDescriptor field = descriptor.FindFieldByName("field1"); - Assert.IsNotNull(field); + Assert.NotNull(field); - Assert.IsTrue(field.Options.HasExtension(UnittestCustomOptions.FieldOpt1)); - Assert.AreEqual(8765432109uL, field.Options.GetExtension(UnittestCustomOptions.FieldOpt1)); + Assert.True(field.Options.HasExtension(UnittestCustomOptions.FieldOpt1)); + Assert.Equal(8765432109uL, field.Options.GetExtension(UnittestCustomOptions.FieldOpt1)); } } diff --git a/csharp/src/ProtocolBuffers.Test/DynamicMessageTest.cs b/csharp/src/ProtocolBuffers.Test/DynamicMessageTest.cs index 92515999..39f122aa 100644 --- a/csharp/src/ProtocolBuffers.Test/DynamicMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/DynamicMessageTest.cs @@ -37,26 +37,24 @@ using System; using System.Collections.Generic; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class DynamicMessageTest { private ReflectionTester reflectionTester; private ReflectionTester extensionsReflectionTester; private ReflectionTester packedReflectionTester; - [TestInitialize] - public void SetUp() + public DynamicMessageTest() { reflectionTester = ReflectionTester.CreateTestAllTypesInstance(); extensionsReflectionTester = ReflectionTester.CreateTestAllExtensionsInstance(); packedReflectionTester = ReflectionTester.CreateTestPackedTypesInstance(); } - [TestMethod] + [Fact] public void DynamicMessageAccessors() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); @@ -65,30 +63,22 @@ namespace Google.ProtocolBuffers reflectionTester.AssertAllFieldsSetViaReflection(message); } - [TestMethod] + [Fact] public void DoubleBuildError() { DynamicMessage.Builder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); builder.Build(); - try - { - builder.Build(); - Assert.Fail("Should have thrown exception."); - } - catch (InvalidOperationException) - { - // Success. - } - } - - [TestMethod] + Assert.Throws(() => builder.Build()); + } + + [Fact] public void DynamicMessageSettersRejectNull() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); reflectionTester.AssertReflectionSettersRejectNull(builder); } - [TestMethod] + [Fact] public void DynamicMessageExtensionAccessors() { // We don't need to extensively test DynamicMessage's handling of @@ -100,14 +90,14 @@ namespace Google.ProtocolBuffers extensionsReflectionTester.AssertAllFieldsSetViaReflection(message); } - [TestMethod] + [Fact] public void DynamicMessageExtensionSettersRejectNull() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllExtensions.Descriptor); extensionsReflectionTester.AssertReflectionSettersRejectNull(builder); } - [TestMethod] + [Fact] public void DynamicMessageRepeatedSetters() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); @@ -117,21 +107,21 @@ namespace Google.ProtocolBuffers reflectionTester.AssertRepeatedFieldsModifiedViaReflection(message); } - [TestMethod] + [Fact] public void DynamicMessageRepeatedSettersRejectNull() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); reflectionTester.AssertReflectionRepeatedSettersRejectNull(builder); } - [TestMethod] + [Fact] public void DynamicMessageDefaults() { reflectionTester.AssertClearViaReflection(DynamicMessage.GetDefaultInstance(TestAllTypes.Descriptor)); reflectionTester.AssertClearViaReflection(DynamicMessage.CreateBuilder(TestAllTypes.Descriptor).Build()); } - [TestMethod] + [Fact] public void DynamicMessageSerializedSize() { TestAllTypes message = TestUtil.GetAllSet(); @@ -140,10 +130,10 @@ namespace Google.ProtocolBuffers reflectionTester.SetAllFieldsViaReflection(dynamicBuilder); IMessage dynamicMessage = dynamicBuilder.WeakBuild(); - Assert.AreEqual(message.SerializedSize, dynamicMessage.SerializedSize); + Assert.Equal(message.SerializedSize, dynamicMessage.SerializedSize); } - [TestMethod] + [Fact] public void DynamicMessageSerialization() { IBuilder builder = DynamicMessage.CreateBuilder(TestAllTypes.Descriptor); @@ -156,10 +146,10 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(message2); // In fact, the serialized forms should be exactly the same, byte-for-byte. - Assert.AreEqual(TestUtil.GetAllSet().ToByteString(), rawBytes); + Assert.Equal(TestUtil.GetAllSet().ToByteString(), rawBytes); } - [TestMethod] + [Fact] public void DynamicMessageParsing() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -172,7 +162,7 @@ namespace Google.ProtocolBuffers reflectionTester.AssertAllFieldsSetViaReflection(message2); } - [TestMethod] + [Fact] public void DynamicMessagePackedSerialization() { IBuilder builder = DynamicMessage.CreateBuilder(TestPackedTypes.Descriptor); @@ -185,11 +175,11 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedFieldsSet(message2); // In fact, the serialized forms should be exactly the same, byte-for-byte. - Assert.AreEqual(TestUtil.GetPackedSet().ToByteString(), rawBytes); + Assert.Equal(TestUtil.GetPackedSet().ToByteString(), rawBytes); } - [TestMethod] - public void testDynamicMessagePackedParsing() + [Fact] + public void DynamicMessagePackedParsing() { TestPackedTypes.Builder builder = TestPackedTypes.CreateBuilder(); TestUtil.SetPackedFields(builder); @@ -201,7 +191,7 @@ namespace Google.ProtocolBuffers packedReflectionTester.AssertPackedFieldsSetViaReflection(message2); } - [TestMethod] + [Fact] public void DynamicMessageCopy() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -212,7 +202,7 @@ namespace Google.ProtocolBuffers reflectionTester.AssertAllFieldsSetViaReflection(copy); } - [TestMethod] + [Fact] public void ToBuilder() { DynamicMessage.Builder builder = @@ -230,8 +220,8 @@ namespace Google.ProtocolBuffers reflectionTester.AssertAllFieldsSetViaReflection(derived); IList values = derived.UnknownFields.FieldDictionary[unknownFieldNum].VarintList; - Assert.AreEqual(1, values.Count); - Assert.AreEqual(unknownFieldVal, values[0]); + Assert.Equal(1, values.Count); + Assert.Equal(unknownFieldVal, values[0]); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs b/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs index 4e0bf8e6..f329270b 100644 --- a/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/ExtendableMessageTest.cs @@ -35,24 +35,22 @@ #endregion using System; -using System.Collections.Generic; -using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class ExtendableMessageTest { - [TestMethod, ExpectedException(typeof(ArgumentException))] + [Fact] public void ExtensionWriterInvalidExtension() { - TestPackedExtensions.CreateBuilder()[Unittest.OptionalForeignMessageExtension.Descriptor] = - ForeignMessage.DefaultInstance; + Assert.Throws(() => + TestPackedExtensions.CreateBuilder()[Unittest.OptionalForeignMessageExtension.Descriptor] = + ForeignMessage.DefaultInstance); } - [TestMethod] + [Fact] public void ExtensionWriterTest() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder() @@ -128,75 +126,75 @@ namespace Google.ProtocolBuffers registry); TestAllExtensions copy = copyBuilder.Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual(true, copy.GetExtension(Unittest.DefaultBoolExtension)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.DefaultBytesExtension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultCordExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultDoubleExtension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultFixed32Extension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultFixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultFloatExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.DefaultForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.DefaultImportEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultInt32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultInt64Extension)); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.Equal(true, copy.GetExtension(Unittest.DefaultBoolExtension)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.DefaultBytesExtension)); + Assert.Equal("123", copy.GetExtension(Unittest.DefaultCordExtension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.Equal(123u, copy.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.Equal(123u, copy.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultFloatExtension)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultInt32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultInt64Extension)); + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, copy.GetExtension(Unittest.DefaultNestedEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSfixed32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSfixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSint32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.DefaultSint64Extension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultStringExtension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.DefaultStringPieceExtension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultUint32Extension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.DefaultUint64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultSint32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.DefaultSint64Extension)); + Assert.Equal("123", copy.GetExtension(Unittest.DefaultStringExtension)); + Assert.Equal("123", copy.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.Equal(123u, copy.GetExtension(Unittest.DefaultUint32Extension)); + Assert.Equal(123u, copy.GetExtension(Unittest.DefaultUint64Extension)); - Assert.AreEqual(true, copy.GetExtension(Unittest.OptionalBoolExtension)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.OptionalBytesExtension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalCordExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalDoubleExtension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalFixed32Extension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalFixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalFloatExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.OptionalForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.OptionalImportEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalInt64Extension)); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.Equal(true, copy.GetExtension(Unittest.OptionalBoolExtension)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.OptionalBytesExtension)); + Assert.Equal("123", copy.GetExtension(Unittest.OptionalCordExtension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.Equal(123u, copy.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.Equal(123u, copy.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalFloatExtension)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.OptionalForeignEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalInt64Extension)); + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, copy.GetExtension(Unittest.OptionalNestedEnumExtension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSfixed32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSfixed64Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSint32Extension)); - Assert.AreEqual(123, copy.GetExtension(Unittest.OptionalSint64Extension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalStringExtension)); - Assert.AreEqual("123", copy.GetExtension(Unittest.OptionalStringPieceExtension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalUint32Extension)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.OptionalUint64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalSint32Extension)); + Assert.Equal(123, copy.GetExtension(Unittest.OptionalSint64Extension)); + Assert.Equal("123", copy.GetExtension(Unittest.OptionalStringExtension)); + Assert.Equal("123", copy.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.Equal(123u, copy.GetExtension(Unittest.OptionalUint32Extension)); + Assert.Equal(123u, copy.GetExtension(Unittest.OptionalUint64Extension)); - Assert.AreEqual(true, copy.GetExtension(Unittest.RepeatedBoolExtension, 0)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), + Assert.Equal(true, copy.GetExtension(Unittest.RepeatedBoolExtension, 0)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(Unittest.RepeatedBytesExtension, 0)); - Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedCordExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedDoubleExtension, 0)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedFixed32Extension, 0)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedFixed64Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedFloatExtension, 0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, + Assert.Equal("123", copy.GetExtension(Unittest.RepeatedCordExtension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.Equal(123u, copy.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.Equal(123u, copy.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedFloatExtension, 0)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, copy.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedInt32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedInt64Extension, 0)); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.Equal(ImportEnum.IMPORT_BAZ, copy.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedInt64Extension, 0)); + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, copy.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSint32Extension, 0)); - Assert.AreEqual(123, copy.GetExtension(Unittest.RepeatedSint64Extension, 0)); - Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedStringExtension, 0)); - Assert.AreEqual("123", copy.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedUint32Extension, 0)); - Assert.AreEqual(123u, copy.GetExtension(Unittest.RepeatedUint64Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.Equal(123, copy.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.Equal("123", copy.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.Equal("123", copy.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.Equal(123u, copy.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.Equal(123u, copy.GetExtension(Unittest.RepeatedUint64Extension, 0)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs index 1dcb1c21..692bfd11 100644 --- a/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs +++ b/csharp/src/ProtocolBuffers.Test/GeneratedBuilderTest.cs @@ -1,12 +1,10 @@ using System; using System.Collections.Generic; -using System.Text; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class GeneratedBuilderTest { class OneTimeEnumerator : IEnumerable @@ -19,107 +17,86 @@ namespace Google.ProtocolBuffers } public IEnumerator GetEnumerator() { - Assert.IsFalse(_enumerated, "The collection {0} has already been enumerated", GetType()); + Assert.False(_enumerated); _enumerated = true; yield return _item; } System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() - { return GetEnumerator(); } + { + return GetEnumerator(); + } } - [TestMethod] + [Fact] public void DoesNotEnumerateTwiceForMessageList() { TestAllTypes.Builder b = new TestAllTypes.Builder(); - b.AddRangeRepeatedForeignMessage( - new OneTimeEnumerator( - ForeignMessage.DefaultInstance)); + b.AddRangeRepeatedForeignMessage(new OneTimeEnumerator(ForeignMessage.DefaultInstance)); } - [TestMethod] + + [Fact] public void DoesNotEnumerateTwiceForPrimitiveList() { TestAllTypes.Builder b = new TestAllTypes.Builder(); b.AddRangeRepeatedInt32(new OneTimeEnumerator(1)); } - [TestMethod] + + [Fact] public void DoesNotEnumerateTwiceForStringList() { TestAllTypes.Builder b = new TestAllTypes.Builder(); b.AddRangeRepeatedString(new OneTimeEnumerator("test")); } - [TestMethod] + + [Fact] public void DoesNotEnumerateTwiceForEnumList() { TestAllTypes.Builder b = new TestAllTypes.Builder(); b.AddRangeRepeatedForeignEnum(new OneTimeEnumerator(ForeignEnum.FOREIGN_BAR)); } - - private delegate void TestMethod(); - - private static void AssertThrows(TestMethod method) where T : Exception - { - try - { - method(); - } - catch (Exception error) - { - if (error is T) - return; - throw; - } - Assert.Fail("Expected exception of type " + typeof(T)); - } - - [TestMethod] + + [Fact] public void DoesNotAddNullToMessageListByAddRange() { TestAllTypes.Builder b = new TestAllTypes.Builder(); - AssertThrows( - () => b.AddRangeRepeatedForeignMessage(new ForeignMessage[] { null }) - ); + Assert.Throws(() => b.AddRangeRepeatedForeignMessage(new ForeignMessage[] { null })); } - [TestMethod] + + [Fact] public void DoesNotAddNullToMessageListByAdd() { TestAllTypes.Builder b = new TestAllTypes.Builder(); - AssertThrows( - () => b.AddRepeatedForeignMessage((ForeignMessage)null) - ); + Assert.Throws(() => b.AddRepeatedForeignMessage((ForeignMessage)null)); } - [TestMethod] + + [Fact] public void DoesNotAddNullToMessageListBySet() { TestAllTypes.Builder b = new TestAllTypes.Builder(); b.AddRepeatedForeignMessage(ForeignMessage.DefaultInstance); - AssertThrows( - () => b.SetRepeatedForeignMessage(0, (ForeignMessage)null) - ); + Assert.Throws(() => b.SetRepeatedForeignMessage(0, (ForeignMessage)null)); } - [TestMethod] + + [Fact] public void DoesNotAddNullToStringListByAddRange() { TestAllTypes.Builder b = new TestAllTypes.Builder(); - AssertThrows( - () => b.AddRangeRepeatedString(new String[] { null }) - ); + Assert.Throws(() => b.AddRangeRepeatedString(new String[] { null })); } - [TestMethod] + + [Fact] public void DoesNotAddNullToStringListByAdd() { TestAllTypes.Builder b = new TestAllTypes.Builder(); - AssertThrows( - () => b.AddRepeatedString(null) - ); + Assert.Throws(() => b.AddRepeatedString(null)); } - [TestMethod] + + [Fact] public void DoesNotAddNullToStringListBySet() { TestAllTypes.Builder b = new TestAllTypes.Builder(); b.AddRepeatedString("one"); - AssertThrows( - () => b.SetRepeatedString(0, null) - ); + Assert.Throws(() => b.SetRepeatedString(0, null)); } } } diff --git a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs index 0e8b9807..a9052954 100644 --- a/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/GeneratedMessageTest.cs @@ -38,31 +38,29 @@ using System; using System.Collections.Generic; using Google.ProtocolBuffers.Collections; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class GeneratedMessageTest { - private ReflectionTester reflectionTester; - private ReflectionTester extensionsReflectionTester; + private readonly ReflectionTester reflectionTester; + private readonly ReflectionTester extensionsReflectionTester; - [TestInitialize] - public void SetUp() + public GeneratedMessageTest() { reflectionTester = ReflectionTester.CreateTestAllTypesInstance(); extensionsReflectionTester = ReflectionTester.CreateTestAllExtensionsInstance(); } - [TestMethod] + [Fact] public void RepeatedAddPrimitiveBeforeBuild() { TestAllTypes message = new TestAllTypes.Builder {RepeatedInt32List = {1, 2, 3}}.Build(); TestUtil.AssertEqual(new int[] {1, 2, 3}, message.RepeatedInt32List); } - [TestMethod] + [Fact] public void AddPrimitiveFailsAfterBuild() { TestAllTypes.Builder builder = new TestAllTypes.Builder(); @@ -70,18 +68,10 @@ namespace Google.ProtocolBuffers list.Add(1); // Fine builder.Build(); - try - { - list.Add(2); - Assert.Fail("List should be frozen"); - } - catch (NotSupportedException) - { - // Expected - } + Assert.Throws(() => list.Add(2)); } - [TestMethod] + [Fact] public void RepeatedAddMessageBeforeBuild() { TestAllTypes message = new TestAllTypes.Builder @@ -89,36 +79,28 @@ namespace Google.ProtocolBuffers RepeatedNestedMessageList = {new TestAllTypes.Types.NestedMessage.Builder {Bb = 10}.Build()} }.Build(); - Assert.AreEqual(1, message.RepeatedNestedMessageCount); - Assert.AreEqual(10, message.RepeatedNestedMessageList[0].Bb); + Assert.Equal(1, message.RepeatedNestedMessageCount); + Assert.Equal(10, message.RepeatedNestedMessageList[0].Bb); } - [TestMethod] + [Fact] public void AddMessageFailsAfterBuild() { TestAllTypes.Builder builder = new TestAllTypes.Builder(); IList list = builder.RepeatedNestedMessageList; builder.Build(); - try - { - list.Add(new TestAllTypes.Types.NestedMessage.Builder {Bb = 10}.Build()); - Assert.Fail("List should be frozen"); - } - catch (NotSupportedException) - { - // Expected - } + Assert.Throws(() => list.Add(new TestAllTypes.Types.NestedMessage.Builder { Bb = 10 }.Build())); } - [TestMethod] + [Fact] public void DefaultInstance() { - Assert.AreSame(TestAllTypes.DefaultInstance, TestAllTypes.DefaultInstance.DefaultInstanceForType); - Assert.AreSame(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().DefaultInstanceForType); + Assert.Same(TestAllTypes.DefaultInstance, TestAllTypes.DefaultInstance.DefaultInstanceForType); + Assert.Same(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().DefaultInstanceForType); } - [TestMethod] + [Fact] public void Accessors() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -127,25 +109,25 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(message); } - [TestMethod] + [Fact] public void SettersRejectNull() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); - TestUtil.AssertArgumentNullException(() => builder.SetOptionalString(null)); - TestUtil.AssertArgumentNullException(() => builder.SetOptionalBytes(null)); - TestUtil.AssertArgumentNullException( + Assert.Throws(() => builder.SetOptionalString(null)); + Assert.Throws(() => builder.SetOptionalBytes(null)); + Assert.Throws( () => builder.SetOptionalNestedMessage((TestAllTypes.Types.NestedMessage) null)); - TestUtil.AssertArgumentNullException( + Assert.Throws( () => builder.SetOptionalNestedMessage((TestAllTypes.Types.NestedMessage.Builder) null)); - TestUtil.AssertArgumentNullException(() => builder.AddRepeatedString(null)); - TestUtil.AssertArgumentNullException(() => builder.AddRepeatedBytes(null)); - TestUtil.AssertArgumentNullException( + Assert.Throws(() => builder.AddRepeatedString(null)); + Assert.Throws(() => builder.AddRepeatedBytes(null)); + Assert.Throws( () => builder.AddRepeatedNestedMessage((TestAllTypes.Types.NestedMessage) null)); - TestUtil.AssertArgumentNullException( + Assert.Throws( () => builder.AddRepeatedNestedMessage((TestAllTypes.Types.NestedMessage.Builder) null)); } - [TestMethod] + [Fact] public void RepeatedSetters() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -155,7 +137,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertRepeatedFieldsModified(message); } - [TestMethod] + [Fact] public void RepeatedAppend() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -169,26 +151,26 @@ namespace Google.ProtocolBuffers TestAllTypes message = builder.Build(); TestUtil.AssertEqual(message.RepeatedInt32List, new int[] {1, 2, 3, 4}); TestUtil.AssertEqual(message.RepeatedForeignEnumList, new ForeignEnum[] {ForeignEnum.FOREIGN_BAZ}); - Assert.AreEqual(1, message.RepeatedForeignMessageCount); - Assert.AreEqual(12, message.GetRepeatedForeignMessage(0).C); + Assert.Equal(1, message.RepeatedForeignMessageCount); + Assert.Equal(12, message.GetRepeatedForeignMessage(0).C); } - [TestMethod] + [Fact] public void RepeatedAppendRejectsNull() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); ForeignMessage foreignMessage = ForeignMessage.CreateBuilder().SetC(12).Build(); - TestUtil.AssertArgumentNullException( + Assert.Throws( () => builder.AddRangeRepeatedForeignMessage(new[] {foreignMessage, null})); - TestUtil.AssertArgumentNullException(() => builder.AddRangeRepeatedForeignMessage(null)); - TestUtil.AssertArgumentNullException(() => builder.AddRangeRepeatedForeignEnum(null)); - TestUtil.AssertArgumentNullException(() => builder.AddRangeRepeatedString(new[] {"one", null})); - TestUtil.AssertArgumentNullException( + Assert.Throws(() => builder.AddRangeRepeatedForeignMessage(null)); + Assert.Throws(() => builder.AddRangeRepeatedForeignEnum(null)); + Assert.Throws(() => builder.AddRangeRepeatedString(new[] {"one", null})); + Assert.Throws( () => builder.AddRangeRepeatedBytes(new[] {TestUtil.ToBytes("one"), null})); } - [TestMethod] + [Fact] public void SettingForeignMessageUsingBuilder() { TestAllTypes message = TestAllTypes.CreateBuilder() @@ -199,10 +181,10 @@ namespace Google.ProtocolBuffers // Create expected version passing foreign message instance explicitly. .SetOptionalForeignMessage(ForeignMessage.CreateBuilder().SetC(123).Build()) .Build(); - Assert.AreEqual(expectedMessage, message); + Assert.Equal(expectedMessage, message); } - [TestMethod] + [Fact] public void SettingRepeatedForeignMessageUsingBuilder() { TestAllTypes message = TestAllTypes.CreateBuilder() @@ -213,10 +195,10 @@ namespace Google.ProtocolBuffers // Create expected version passing foreign message instance explicitly. .AddRepeatedForeignMessage(ForeignMessage.CreateBuilder().SetC(456).Build()) .Build(); - Assert.AreEqual(expectedMessage, message); + Assert.Equal(expectedMessage, message); } - [TestMethod] + [Fact] public void SettingRepeatedValuesUsingRangeInCollectionInitializer() { int[] values = {1, 2, 3}; @@ -224,29 +206,29 @@ namespace Google.ProtocolBuffers { RepeatedSint32List = {values} }.Build(); - Assert.IsTrue(Lists.Equals(values, message.RepeatedSint32List)); + Assert.True(Lists.Equals(values, message.RepeatedSint32List)); } - [TestMethod] + [Fact] public void SettingRepeatedValuesUsingIndividualValuesInCollectionInitializer() { TestAllTypes message = new TestAllTypes.Builder { RepeatedSint32List = {6, 7} }.Build(); - Assert.IsTrue(Lists.Equals(new int[] {6, 7}, message.RepeatedSint32List)); + Assert.True(Lists.Equals(new int[] {6, 7}, message.RepeatedSint32List)); } - [TestMethod] + [Fact] public void Defaults() { TestUtil.AssertClear(TestAllTypes.DefaultInstance); TestUtil.AssertClear(TestAllTypes.CreateBuilder().Build()); - Assert.AreEqual("\u1234", TestExtremeDefaultValues.DefaultInstance.Utf8String); + Assert.Equal("\u1234", TestExtremeDefaultValues.DefaultInstance.Utf8String); } - [TestMethod] + [Fact] public void ReflectionGetters() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -255,7 +237,7 @@ namespace Google.ProtocolBuffers reflectionTester.AssertAllFieldsSetViaReflection(message); } - [TestMethod] + [Fact] public void ReflectionSetters() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -264,7 +246,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(message); } - [TestMethod] + [Fact] public void ReflectionClear() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -274,14 +256,14 @@ namespace Google.ProtocolBuffers TestUtil.AssertClear(message); } - [TestMethod] + [Fact] public void ReflectionSettersRejectNull() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); reflectionTester.AssertReflectionSettersRejectNull(builder); } - [TestMethod] + [Fact] public void ReflectionRepeatedSetters() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -291,14 +273,14 @@ namespace Google.ProtocolBuffers TestUtil.AssertRepeatedFieldsModified(message); } - [TestMethod] + [Fact] public void TestReflectionRepeatedSettersRejectNull() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); reflectionTester.AssertReflectionRepeatedSettersRejectNull(builder); } - [TestMethod] + [Fact] public void ReflectionDefaults() { TestUtil.TestInMultipleCultures(() => @@ -313,7 +295,7 @@ namespace Google.ProtocolBuffers // ================================================================= // Extensions. - [TestMethod] + [Fact] public void ExtensionAccessors() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -322,7 +304,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(message); } - [TestMethod] + [Fact] public void ExtensionRepeatedSetters() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -332,14 +314,14 @@ namespace Google.ProtocolBuffers TestUtil.AssertRepeatedExtensionsModified(message); } - [TestMethod] + [Fact] public void ExtensionDefaults() { TestUtil.AssertExtensionsClear(TestAllExtensions.DefaultInstance); TestUtil.AssertExtensionsClear(TestAllExtensions.CreateBuilder().Build()); } - [TestMethod] + [Fact] public void ExtensionReflectionGetters() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -348,7 +330,7 @@ namespace Google.ProtocolBuffers extensionsReflectionTester.AssertAllFieldsSetViaReflection(message); } - [TestMethod] + [Fact] public void ExtensionReflectionSetters() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -357,14 +339,14 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(message); } - [TestMethod] + [Fact] public void ExtensionReflectionSettersRejectNull() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); extensionsReflectionTester.AssertReflectionSettersRejectNull(builder); } - [TestMethod] + [Fact] public void ExtensionReflectionRepeatedSetters() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -374,14 +356,14 @@ namespace Google.ProtocolBuffers TestUtil.AssertRepeatedExtensionsModified(message); } - [TestMethod] + [Fact] public void ExtensionReflectionRepeatedSettersRejectNull() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); extensionsReflectionTester.AssertReflectionRepeatedSettersRejectNull(builder); } - [TestMethod] + [Fact] public void ExtensionReflectionDefaults() { TestUtil.TestInMultipleCultures(() => @@ -393,33 +375,33 @@ namespace Google.ProtocolBuffers }); } - [TestMethod] + [Fact] public void ClearExtension() { // ClearExtension() is not actually used in TestUtil, so try it manually. - Assert.IsFalse(TestAllExtensions.CreateBuilder() + Assert.False(TestAllExtensions.CreateBuilder() .SetExtension(Unittest.OptionalInt32Extension, 1) .ClearExtension(Unittest.OptionalInt32Extension) .HasExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(0, TestAllExtensions.CreateBuilder() + Assert.Equal(0, TestAllExtensions.CreateBuilder() .AddExtension(Unittest.RepeatedInt32Extension, 1) .ClearExtension(Unittest.RepeatedInt32Extension) .GetExtensionCount(Unittest.RepeatedInt32Extension)); } - [TestMethod] + [Fact] public void ExtensionMergeFrom() { TestAllExtensions original = TestAllExtensions.CreateBuilder() .SetExtension(Unittest.OptionalInt32Extension, 1).Build(); TestAllExtensions merged = TestAllExtensions.CreateBuilder().MergeFrom(original).Build(); - Assert.IsTrue((merged.HasExtension(Unittest.OptionalInt32Extension))); - Assert.AreEqual(1, (int) merged.GetExtension(Unittest.OptionalInt32Extension)); + Assert.True((merged.HasExtension(Unittest.OptionalInt32Extension))); + Assert.Equal(1, (int) merged.GetExtension(Unittest.OptionalInt32Extension)); } /* Removed multiple files option for the moment - [TestMethod] + [Fact] public void MultipleFilesOption() { // We mostly just want to check that things compile. MessageWithNoOuter message = MessageWithNoOuter.CreateBuilder() @@ -428,63 +410,63 @@ namespace Google.ProtocolBuffers .SetNestedEnum(MessageWithNoOuter.Types.NestedEnum.BAZ) .SetForeignEnum(EnumWithNoOuter.BAR) .Build(); - Assert.AreEqual(message, MessageWithNoOuter.ParseFrom(message.ToByteString())); + Assert.Equal(message, MessageWithNoOuter.ParseFrom(message.ToByteString())); - Assert.AreEqual(MultiFileProto.DescriptorProtoFile, MessageWithNoOuter.DescriptorProtoFile.File); + Assert.Equal(MultiFileProto.DescriptorProtoFile, MessageWithNoOuter.DescriptorProtoFile.File); FieldDescriptor field = MessageWithNoOuter.DescriptorProtoFile.FindDescriptor("foreign_enum"); - Assert.AreEqual(MultiFileProto.DescriptorProtoFile.FindTypeByName("EnumWithNoOuter") + Assert.Equal(MultiFileProto.DescriptorProtoFile.FindTypeByName("EnumWithNoOuter") .FindValueByNumber((int)EnumWithNoOuter.BAR), message[field]); - Assert.AreEqual(MultiFileProto.DescriptorProtoFile, ServiceWithNoOuter.DescriptorProtoFile.File); + Assert.Equal(MultiFileProto.DescriptorProtoFile, ServiceWithNoOuter.DescriptorProtoFile.File); - Assert.IsFalse(TestAllExtensions.DefaultInstance.HasExtension(MultiFileProto.ExtensionWithOuter)); + Assert.False(TestAllExtensions.DefaultInstance.HasExtension(MultiFileProto.ExtensionWithOuter)); }*/ - [TestMethod] + [Fact] public void OptionalFieldWithRequiredSubfieldsOptimizedForSize() { TestOptionalOptimizedForSize message = TestOptionalOptimizedForSize.DefaultInstance; - Assert.IsTrue(message.IsInitialized); + Assert.True(message.IsInitialized); message = TestOptionalOptimizedForSize.CreateBuilder().SetO( TestRequiredOptimizedForSize.CreateBuilder().BuildPartial() ).BuildPartial(); - Assert.IsFalse(message.IsInitialized); + Assert.False(message.IsInitialized); message = TestOptionalOptimizedForSize.CreateBuilder().SetO( TestRequiredOptimizedForSize.CreateBuilder().SetX(5).BuildPartial() ).BuildPartial(); - Assert.IsTrue(message.IsInitialized); + Assert.True(message.IsInitialized); } - [TestMethod] + [Fact] public void OptimizedForSizeMergeUsesAllFieldsFromTarget() { TestOptimizedForSize withFieldSet = new TestOptimizedForSize.Builder {I = 10}.Build(); TestOptimizedForSize.Builder builder = new TestOptimizedForSize.Builder(); builder.MergeFrom(withFieldSet); TestOptimizedForSize built = builder.Build(); - Assert.AreEqual(10, built.I); + Assert.Equal(10, built.I); } - [TestMethod] + [Fact] public void UninitializedExtensionInOptimizedForSizeMakesMessageUninitialized() { TestOptimizedForSize.Builder builder = new TestOptimizedForSize.Builder(); builder.SetExtension(TestOptimizedForSize.TestExtension2, new TestRequiredOptimizedForSize.Builder().BuildPartial()); - Assert.IsFalse(builder.IsInitialized); - Assert.IsFalse(builder.BuildPartial().IsInitialized); + Assert.False(builder.IsInitialized); + Assert.False(builder.BuildPartial().IsInitialized); builder = new TestOptimizedForSize.Builder(); builder.SetExtension(TestOptimizedForSize.TestExtension2, new TestRequiredOptimizedForSize.Builder {X = 10}.BuildPartial()); - Assert.IsTrue(builder.IsInitialized); - Assert.IsTrue(builder.BuildPartial().IsInitialized); + Assert.True(builder.IsInitialized); + Assert.True(builder.BuildPartial().IsInitialized); } - [TestMethod] + [Fact] public void ToBuilder() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -493,40 +475,40 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(message.ToBuilder().Build()); } - [TestMethod] + [Fact] public void FieldConstantValues() { - Assert.AreEqual(TestAllTypes.Types.NestedMessage.BbFieldNumber, 1); - Assert.AreEqual(TestAllTypes.OptionalInt32FieldNumber, 1); - Assert.AreEqual(TestAllTypes.OptionalGroupFieldNumber, 16); - Assert.AreEqual(TestAllTypes.OptionalNestedMessageFieldNumber, 18); - Assert.AreEqual(TestAllTypes.OptionalNestedEnumFieldNumber, 21); - Assert.AreEqual(TestAllTypes.RepeatedInt32FieldNumber, 31); - Assert.AreEqual(TestAllTypes.RepeatedGroupFieldNumber, 46); - Assert.AreEqual(TestAllTypes.RepeatedNestedMessageFieldNumber, 48); - Assert.AreEqual(TestAllTypes.RepeatedNestedEnumFieldNumber, 51); + Assert.Equal(TestAllTypes.Types.NestedMessage.BbFieldNumber, 1); + Assert.Equal(TestAllTypes.OptionalInt32FieldNumber, 1); + Assert.Equal(TestAllTypes.OptionalGroupFieldNumber, 16); + Assert.Equal(TestAllTypes.OptionalNestedMessageFieldNumber, 18); + Assert.Equal(TestAllTypes.OptionalNestedEnumFieldNumber, 21); + Assert.Equal(TestAllTypes.RepeatedInt32FieldNumber, 31); + Assert.Equal(TestAllTypes.RepeatedGroupFieldNumber, 46); + Assert.Equal(TestAllTypes.RepeatedNestedMessageFieldNumber, 48); + Assert.Equal(TestAllTypes.RepeatedNestedEnumFieldNumber, 51); } - [TestMethod] + [Fact] public void ExtensionConstantValues() { - Assert.AreEqual(TestRequired.SingleFieldNumber, 1000); - Assert.AreEqual(TestRequired.MultiFieldNumber, 1001); - Assert.AreEqual(Unittest.OptionalInt32ExtensionFieldNumber, 1); - Assert.AreEqual(Unittest.OptionalGroupExtensionFieldNumber, 16); - Assert.AreEqual(Unittest.OptionalNestedMessageExtensionFieldNumber, 18); - Assert.AreEqual(Unittest.OptionalNestedEnumExtensionFieldNumber, 21); - Assert.AreEqual(Unittest.RepeatedInt32ExtensionFieldNumber, 31); - Assert.AreEqual(Unittest.RepeatedGroupExtensionFieldNumber, 46); - Assert.AreEqual(Unittest.RepeatedNestedMessageExtensionFieldNumber, 48); - Assert.AreEqual(Unittest.RepeatedNestedEnumExtensionFieldNumber, 51); + Assert.Equal(TestRequired.SingleFieldNumber, 1000); + Assert.Equal(TestRequired.MultiFieldNumber, 1001); + Assert.Equal(Unittest.OptionalInt32ExtensionFieldNumber, 1); + Assert.Equal(Unittest.OptionalGroupExtensionFieldNumber, 16); + Assert.Equal(Unittest.OptionalNestedMessageExtensionFieldNumber, 18); + Assert.Equal(Unittest.OptionalNestedEnumExtensionFieldNumber, 21); + Assert.Equal(Unittest.RepeatedInt32ExtensionFieldNumber, 31); + Assert.Equal(Unittest.RepeatedGroupExtensionFieldNumber, 46); + Assert.Equal(Unittest.RepeatedNestedMessageExtensionFieldNumber, 48); + Assert.Equal(Unittest.RepeatedNestedEnumExtensionFieldNumber, 51); } - [TestMethod] + [Fact] public void EmptyPackedValue() { TestPackedTypes empty = new TestPackedTypes.Builder().Build(); - Assert.AreEqual(0, empty.SerializedSize); + Assert.Equal(0, empty.SerializedSize); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/IssuesTest.cs b/csharp/src/ProtocolBuffers.Test/IssuesTest.cs index a80021c5..afd93f86 100644 --- a/csharp/src/ProtocolBuffers.Test/IssuesTest.cs +++ b/csharp/src/ProtocolBuffers.Test/IssuesTest.cs @@ -35,13 +35,9 @@ #endregion -using System; -using System.Collections.Generic; -using Google.ProtocolBuffers.Collections; using Google.ProtocolBuffers.Descriptors; -using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; using UnitTest.Issues.TestProtos; +using Xunit; namespace Google.ProtocolBuffers @@ -49,17 +45,16 @@ namespace Google.ProtocolBuffers /// /// Tests for issues which aren't easily compartmentalized into other unit tests. /// - [TestClass] public class IssuesTest { // Issue 45 - [TestMethod] + [Fact] public void FieldCalledItem() { ItemField message = new ItemField.Builder { Item = 3 }.Build(); FieldDescriptor field = ItemField.Descriptor.FindFieldByName("item"); - Assert.IsNotNull(field); - Assert.AreEqual(3, (int)message[field]); + Assert.NotNull(field); + Assert.Equal(3, (int)message[field]); } } } diff --git a/csharp/src/ProtocolBuffers.Test/MessageStreamIteratorTest.cs b/csharp/src/ProtocolBuffers.Test/MessageStreamIteratorTest.cs index 78f059f7..7304861a 100644 --- a/csharp/src/ProtocolBuffers.Test/MessageStreamIteratorTest.cs +++ b/csharp/src/ProtocolBuffers.Test/MessageStreamIteratorTest.cs @@ -37,28 +37,27 @@ using System.Collections.Generic; using System.IO; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; using NestedMessage = Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage; namespace Google.ProtocolBuffers { - [TestClass] public class MessageStreamIteratorTest { - [TestMethod] + [Fact] public void ThreeMessagesInMemory() { MemoryStream stream = new MemoryStream(MessageStreamWriterTest.ThreeMessageData); IEnumerable iterator = MessageStreamIterator.FromStreamProvider(() => stream); List messages = new List(iterator); - Assert.AreEqual(3, messages.Count); - Assert.AreEqual(5, messages[0].Bb); - Assert.AreEqual(1500, messages[1].Bb); - Assert.IsFalse(messages[2].HasBb); + Assert.Equal(3, messages.Count); + Assert.Equal(5, messages[0].Bb); + Assert.Equal(1500, messages[1].Bb); + Assert.False(messages[2].HasBb); } - [TestMethod] + [Fact] public void ManyMessagesShouldNotTriggerSizeAlert() { int messageSize = TestUtil.GetAllSet().SerializedSize; @@ -84,7 +83,7 @@ namespace Google.ProtocolBuffers count++; TestUtil.AssertAllFieldsSet(message); } - Assert.AreEqual(correctCount, count); + Assert.Equal(correctCount, count); } } } diff --git a/csharp/src/ProtocolBuffers.Test/MessageStreamWriterTest.cs b/csharp/src/ProtocolBuffers.Test/MessageStreamWriterTest.cs index 53772523..3bcc5ff6 100644 --- a/csharp/src/ProtocolBuffers.Test/MessageStreamWriterTest.cs +++ b/csharp/src/ProtocolBuffers.Test/MessageStreamWriterTest.cs @@ -35,12 +35,11 @@ #endregion using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; using NestedMessage = Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage; namespace Google.ProtocolBuffers { - [TestClass] public class MessageStreamWriterTest { internal static readonly byte[] ThreeMessageData = new byte[] @@ -55,7 +54,7 @@ namespace Google.ProtocolBuffers (1 << 3) | 2, 0, // Field 1, no data (third message) }; - [TestMethod] + [Fact] public void ThreeMessages() { NestedMessage message1 = new NestedMessage.Builder {Bb = 5}.Build(); diff --git a/csharp/src/ProtocolBuffers.Test/MessageTest.cs b/csharp/src/ProtocolBuffers.Test/MessageTest.cs index 8bb0fac7..8c8e6445 100644 --- a/csharp/src/ProtocolBuffers.Test/MessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/MessageTest.cs @@ -37,7 +37,7 @@ using System.IO; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { @@ -45,7 +45,6 @@ namespace Google.ProtocolBuffers /// Miscellaneous tests for message operations that apply to both /// generated and dynamic messages. /// - [TestClass] public class MessageTest { // ================================================================= @@ -77,12 +76,12 @@ namespace Google.ProtocolBuffers "repeated_string: \"qux\"\n" + "repeated_string: \"bar\"\n"; - [TestMethod] + [Fact] public void MergeFrom() { TestAllTypes result = TestAllTypes.CreateBuilder(MergeDest).MergeFrom(MergeSource).Build(); - Assert.AreEqual(MergeResultText, result.ToString()); + Assert.Equal(MergeResultText, result.ToString()); } /// @@ -90,20 +89,20 @@ namespace Google.ProtocolBuffers /// As long as they have the same descriptor, this should work, but it is an /// entirely different code path. /// - [TestMethod] + [Fact] public void MergeFromDynamic() { TestAllTypes result = (TestAllTypes) TestAllTypes.CreateBuilder(MergeDest) .MergeFrom(DynamicMessage.CreateBuilder(MergeSource).Build()) .Build(); - Assert.AreEqual(MergeResultText, result.ToString()); + Assert.Equal(MergeResultText, result.ToString()); } /// /// Test merging two DynamicMessages. /// - [TestMethod] + [Fact] public void DynamicMergeFrom() { DynamicMessage result = (DynamicMessage) DynamicMessage.CreateBuilder(MergeDest) @@ -112,7 +111,7 @@ namespace Google.ProtocolBuffers DynamicMessage.CreateBuilder(MergeSource).Build()) .Build(); - Assert.AreEqual(MergeResultText, result.ToString()); + Assert.Equal(MergeResultText, result.ToString()); } // ================================================================= @@ -127,157 +126,143 @@ namespace Google.ProtocolBuffers C = 3 }.Build(); - [TestMethod] + [Fact] public void Initialization() { TestRequired.Builder builder = TestRequired.CreateBuilder(); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.A = 1; - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.B = 1; - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.C = 1; - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); } - [TestMethod] + [Fact] public void UninitializedBuilderToString() { TestRequired.Builder builder = TestRequired.CreateBuilder().SetA(1); - Assert.AreEqual("a: 1\n", builder.ToString()); + Assert.Equal("a: 1\n", builder.ToString()); } - [TestMethod] + [Fact] public void RequiredForeign() { TestRequiredForeign.Builder builder = TestRequiredForeign.CreateBuilder(); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.SetOptionalMessage(TestRequiredUninitialized); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.SetOptionalMessage(TestRequiredInitialized); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.AddRepeatedMessage(TestRequiredUninitialized); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.SetRepeatedMessage(0, TestRequiredInitialized); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); } - [TestMethod] + [Fact] public void RequiredExtension() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.SetExtension(TestRequired.Single, TestRequiredUninitialized); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.SetExtension(TestRequired.Single, TestRequiredInitialized); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.AddExtension(TestRequired.Multi, TestRequiredUninitialized); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.SetExtension(TestRequired.Multi, 0, TestRequiredInitialized); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); } - [TestMethod] + [Fact] public void RequiredDynamic() { MessageDescriptor descriptor = TestRequired.Descriptor; DynamicMessage.Builder builder = DynamicMessage.CreateBuilder(descriptor); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder[descriptor.FindDescriptor("a")] = 1; - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder[descriptor.FindDescriptor("b")] = 1; - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder[descriptor.FindDescriptor("c")] = 1; - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); } - [TestMethod] + [Fact] public void RequiredDynamicForeign() { MessageDescriptor descriptor = TestRequiredForeign.Descriptor; DynamicMessage.Builder builder = DynamicMessage.CreateBuilder(descriptor); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder[descriptor.FindDescriptor("optional_message")] = TestRequiredUninitialized; - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder[descriptor.FindDescriptor("optional_message")] = TestRequiredInitialized; - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.AddRepeatedField(descriptor.FindDescriptor("repeated_message"), TestRequiredUninitialized); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); builder.SetRepeatedField(descriptor.FindDescriptor("repeated_message"), 0, TestRequiredInitialized); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); } - [TestMethod] + [Fact] public void UninitializedException() { - try - { - TestRequired.CreateBuilder().Build(); - Assert.Fail("Should have thrown an exception."); - } - catch (UninitializedMessageException e) - { - Assert.AreEqual("Message missing required fields: a, b, c", e.Message); - } + var e = Assert.Throws(() => TestRequired.CreateBuilder().Build()); + Assert.Equal("Message missing required fields: a, b, c", e.Message); } - [TestMethod] + [Fact] public void BuildPartial() { // We're mostly testing that no exception is thrown. TestRequired message = TestRequired.CreateBuilder().BuildPartial(); - Assert.IsFalse(message.IsInitialized); + Assert.False(message.IsInitialized); } - [TestMethod] + [Fact] public void NestedUninitializedException() { - try - { - TestRequiredForeign.CreateBuilder() + var e = Assert.Throws(() => TestRequiredForeign.CreateBuilder() .SetOptionalMessage(TestRequiredUninitialized) .AddRepeatedMessage(TestRequiredUninitialized) .AddRepeatedMessage(TestRequiredUninitialized) - .Build(); - Assert.Fail("Should have thrown an exception."); - } - catch (UninitializedMessageException e) - { - Assert.AreEqual( - "Message missing required fields: " + - "optional_message.a, " + - "optional_message.b, " + - "optional_message.c, " + - "repeated_message[0].a, " + - "repeated_message[0].b, " + - "repeated_message[0].c, " + - "repeated_message[1].a, " + - "repeated_message[1].b, " + - "repeated_message[1].c", - e.Message); - } + .Build()); + Assert.Equal( + "Message missing required fields: " + + "optional_message.a, " + + "optional_message.b, " + + "optional_message.c, " + + "repeated_message[0].a, " + + "repeated_message[0].b, " + + "repeated_message[0].c, " + + "repeated_message[1].a, " + + "repeated_message[1].b, " + + "repeated_message[1].c", + e.Message); } - [TestMethod] + [Fact] public void BuildNestedPartial() { // We're mostly testing that no exception is thrown. @@ -287,24 +272,17 @@ namespace Google.ProtocolBuffers .AddRepeatedMessage(TestRequiredUninitialized) .AddRepeatedMessage(TestRequiredUninitialized) .BuildPartial(); - Assert.IsFalse(message.IsInitialized); + Assert.False(message.IsInitialized); } - [TestMethod] - public void ParseUnititialized() + [Fact] + public void ParseUninitialized() { - try - { - TestRequired.ParseFrom(ByteString.Empty); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual("Message missing required fields: a, b, c", e.Message); - } + var e = Assert.Throws(() => TestRequired.ParseFrom(ByteString.Empty)); + Assert.Equal("Message missing required fields: a, b, c", e.Message); } - [TestMethod] + [Fact] public void ParseNestedUnititialized() { ByteString data = @@ -314,66 +292,45 @@ namespace Google.ProtocolBuffers .AddRepeatedMessage(TestRequiredUninitialized) .BuildPartial().ToByteString(); - try - { - TestRequiredForeign.ParseFrom(data); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual( - "Message missing required fields: " + - "optional_message.a, " + - "optional_message.b, " + - "optional_message.c, " + - "repeated_message[0].a, " + - "repeated_message[0].b, " + - "repeated_message[0].c, " + - "repeated_message[1].a, " + - "repeated_message[1].b, " + - "repeated_message[1].c", - e.Message); - } + var e = Assert.Throws(() => TestRequiredForeign.ParseFrom(data)); + Assert.Equal( + "Message missing required fields: " + + "optional_message.a, " + + "optional_message.b, " + + "optional_message.c, " + + "repeated_message[0].a, " + + "repeated_message[0].b, " + + "repeated_message[0].c, " + + "repeated_message[1].a, " + + "repeated_message[1].b, " + + "repeated_message[1].c", + e.Message); } - [TestMethod] + [Fact] public void DynamicUninitializedException() { - try - { - DynamicMessage.CreateBuilder(TestRequired.Descriptor).Build(); - Assert.Fail("Should have thrown an exception."); - } - catch (UninitializedMessageException e) - { - Assert.AreEqual("Message missing required fields: a, b, c", e.Message); - } + var e = Assert.Throws(() => DynamicMessage.CreateBuilder(TestRequired.Descriptor).Build()); + Assert.Equal("Message missing required fields: a, b, c", e.Message); } - [TestMethod] + [Fact] public void DynamicBuildPartial() { // We're mostly testing that no exception is thrown. DynamicMessage message = DynamicMessage.CreateBuilder(TestRequired.Descriptor).BuildPartial(); - Assert.IsFalse(message.Initialized); + Assert.False(message.Initialized); } - [TestMethod] + [Fact] public void DynamicParseUnititialized() { - try - { - MessageDescriptor descriptor = TestRequired.Descriptor; - DynamicMessage.ParseFrom(descriptor, ByteString.Empty); - Assert.Fail("Should have thrown an exception."); - } - catch (InvalidProtocolBufferException e) - { - Assert.AreEqual("Message missing required fields: a, b, c", e.Message); - } + MessageDescriptor descriptor = TestRequired.Descriptor; + var e = Assert.Throws(() => DynamicMessage.ParseFrom(descriptor, ByteString.Empty)); + Assert.Equal("Message missing required fields: a, b, c", e.Message); } - [TestMethod] + [Fact] public void PackedTypesWrittenDirectlyToStream() { TestPackedTypes message = new TestPackedTypes.Builder {PackedInt32List = {0, 1, 2}}.Build(); @@ -381,7 +338,7 @@ namespace Google.ProtocolBuffers message.WriteTo(stream); stream.Position = 0; TestPackedTypes readMessage = TestPackedTypes.ParseFrom(stream); - Assert.AreEqual(message, readMessage); + Assert.Equal(message, readMessage); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs b/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs index 4c33dbbd..186d9399 100644 --- a/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs +++ b/csharp/src/ProtocolBuffers.Test/MessageUtilTest.cs @@ -36,52 +36,47 @@ using System; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class MessageUtilTest { - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] + [Fact] public void NullTypeName() { - MessageUtil.GetDefaultMessage((string) null); + Assert.Throws(() => MessageUtil.GetDefaultMessage((string) null)); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] + [Fact] public void InvalidTypeName() { - MessageUtil.GetDefaultMessage("invalidtypename"); + Assert.Throws(() => MessageUtil.GetDefaultMessage("invalidtypename")); } - [TestMethod] + [Fact] public void ValidTypeName() { - Assert.AreSame(TestAllTypes.DefaultInstance, + Assert.Same(TestAllTypes.DefaultInstance, MessageUtil.GetDefaultMessage(typeof(TestAllTypes).AssemblyQualifiedName)); } - [TestMethod] - [ExpectedException(typeof(ArgumentNullException))] + [Fact] public void NullType() { - MessageUtil.GetDefaultMessage((Type) null); + Assert.Throws(() => MessageUtil.GetDefaultMessage((Type)null)); } - [TestMethod] - [ExpectedException(typeof(ArgumentException))] + [Fact] public void NonMessageType() { - MessageUtil.GetDefaultMessage(typeof(string)); + Assert.Throws(() => MessageUtil.GetDefaultMessage(typeof(string))); } - [TestMethod] + [Fact] public void ValidType() { - Assert.AreSame(TestAllTypes.DefaultInstance, MessageUtil.GetDefaultMessage(typeof(TestAllTypes))); + Assert.Same(TestAllTypes.DefaultInstance, MessageUtil.GetDefaultMessage(typeof(TestAllTypes))); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/NameHelpersTest.cs b/csharp/src/ProtocolBuffers.Test/NameHelpersTest.cs index 50ab373d..034bbf1c 100644 --- a/csharp/src/ProtocolBuffers.Test/NameHelpersTest.cs +++ b/csharp/src/ProtocolBuffers.Test/NameHelpersTest.cs @@ -34,49 +34,48 @@ #endregion -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class NameHelpersTest { - [TestMethod] + [Fact] public void UnderscoresToPascalCase() { - Assert.AreEqual("FooBar", NameHelpers.UnderscoresToPascalCase("Foo_bar")); - Assert.AreEqual("FooBar", NameHelpers.UnderscoresToPascalCase("foo_bar")); - Assert.AreEqual("Foo0Bar", NameHelpers.UnderscoresToPascalCase("Foo0bar")); - Assert.AreEqual("FooBar", NameHelpers.UnderscoresToPascalCase("Foo_+_Bar")); + Assert.Equal("FooBar", NameHelpers.UnderscoresToPascalCase("Foo_bar")); + Assert.Equal("FooBar", NameHelpers.UnderscoresToPascalCase("foo_bar")); + Assert.Equal("Foo0Bar", NameHelpers.UnderscoresToPascalCase("Foo0bar")); + Assert.Equal("FooBar", NameHelpers.UnderscoresToPascalCase("Foo_+_Bar")); - Assert.AreEqual("Bar", NameHelpers.UnderscoresToPascalCase("__+bar")); - Assert.AreEqual("Bar", NameHelpers.UnderscoresToPascalCase("bar_")); - Assert.AreEqual("_0Bar", NameHelpers.UnderscoresToPascalCase("_0bar")); - Assert.AreEqual("_1Bar", NameHelpers.UnderscoresToPascalCase("_1_bar")); + Assert.Equal("Bar", NameHelpers.UnderscoresToPascalCase("__+bar")); + Assert.Equal("Bar", NameHelpers.UnderscoresToPascalCase("bar_")); + Assert.Equal("_0Bar", NameHelpers.UnderscoresToPascalCase("_0bar")); + Assert.Equal("_1Bar", NameHelpers.UnderscoresToPascalCase("_1_bar")); } - [TestMethod] + [Fact] public void UnderscoresToCamelCase() { - Assert.AreEqual("fooBar", NameHelpers.UnderscoresToCamelCase("Foo_bar")); - Assert.AreEqual("fooBar", NameHelpers.UnderscoresToCamelCase("foo_bar")); - Assert.AreEqual("foo0Bar", NameHelpers.UnderscoresToCamelCase("Foo0bar")); - Assert.AreEqual("fooBar", NameHelpers.UnderscoresToCamelCase("Foo_+_Bar")); + Assert.Equal("fooBar", NameHelpers.UnderscoresToCamelCase("Foo_bar")); + Assert.Equal("fooBar", NameHelpers.UnderscoresToCamelCase("foo_bar")); + Assert.Equal("foo0Bar", NameHelpers.UnderscoresToCamelCase("Foo0bar")); + Assert.Equal("fooBar", NameHelpers.UnderscoresToCamelCase("Foo_+_Bar")); - Assert.AreEqual("bar", NameHelpers.UnderscoresToCamelCase("__+bar")); - Assert.AreEqual("bar", NameHelpers.UnderscoresToCamelCase("bar_")); - Assert.AreEqual("_0Bar", NameHelpers.UnderscoresToCamelCase("_0bar")); - Assert.AreEqual("_1Bar", NameHelpers.UnderscoresToCamelCase("_1_bar")); + Assert.Equal("bar", NameHelpers.UnderscoresToCamelCase("__+bar")); + Assert.Equal("bar", NameHelpers.UnderscoresToCamelCase("bar_")); + Assert.Equal("_0Bar", NameHelpers.UnderscoresToCamelCase("_0bar")); + Assert.Equal("_1Bar", NameHelpers.UnderscoresToCamelCase("_1_bar")); } - [TestMethod] + [Fact] public void StripSuffix() { string text = "FooBar"; - Assert.IsFalse(NameHelpers.StripSuffix(ref text, "Foo")); - Assert.AreEqual("FooBar", text); - Assert.IsTrue(NameHelpers.StripSuffix(ref text, "Bar")); - Assert.AreEqual("Foo", text); + Assert.False(NameHelpers.StripSuffix(ref text, "Foo")); + Assert.Equal("FooBar", text); + Assert.True(NameHelpers.StripSuffix(ref text, "Bar")); + Assert.Equal("Foo", text); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 8d900266..50c0b63e 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -1,9 +1,8 @@  + + - CLIENTPROFILE - NET35 - TEST Debug AnyCPU 9.0.30729 @@ -13,12 +12,14 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffers.Test - v4.0 + v4.5 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 - Client + + + d37384c8 true @@ -32,6 +33,7 @@ true true Off + false pdbonly @@ -44,32 +46,23 @@ true true Off + false - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - - Microsoft.VisualStudio.TestTools.cs - @@ -131,28 +124,16 @@ ProtocolBuffers - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - + + + + + + - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs b/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs index 5385d316..5fa22fef 100644 --- a/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs +++ b/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs @@ -37,7 +37,7 @@ using System; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; #pragma warning disable 618 // Disable warning about obsolete use miss-matched assert arguments @@ -97,7 +97,7 @@ namespace Google.ProtocolBuffers this.extensionRegistry = extensionRegistry; this.file = baseDescriptor.File; - Assert.AreEqual(1, file.Dependencies.Count); + Assert.Equal(1, file.Dependencies.Count); this.importFile = file.Dependencies[0]; MessageDescriptor testAllTypes; @@ -108,7 +108,7 @@ namespace Google.ProtocolBuffers else { testAllTypes = file.FindTypeByName("TestAllTypes"); - Assert.IsNotNull(testAllTypes); + Assert.NotNull(testAllTypes); } if (extensionRegistry == null) @@ -136,14 +136,14 @@ namespace Google.ProtocolBuffers this.foreignEnum = file.FindTypeByName("ForeignEnum"); this.importEnum = importFile.FindTypeByName("ImportEnum"); - Assert.IsNotNull(optionalGroup); - Assert.IsNotNull(repeatedGroup); - Assert.IsNotNull(nestedMessage); - Assert.IsNotNull(foreignMessage); - Assert.IsNotNull(importMessage); - Assert.IsNotNull(nestedEnum); - Assert.IsNotNull(foreignEnum); - Assert.IsNotNull(importEnum); + Assert.NotNull(optionalGroup); + Assert.NotNull(repeatedGroup); + Assert.NotNull(nestedMessage); + Assert.NotNull(foreignMessage); + Assert.NotNull(importMessage); + Assert.NotNull(nestedEnum); + Assert.NotNull(foreignEnum); + Assert.NotNull(importEnum); this.nestedB = nestedMessage.FindDescriptor("bb"); this.foreignC = foreignMessage.FindDescriptor("c"); @@ -161,20 +161,20 @@ namespace Google.ProtocolBuffers this.groupA = optionalGroup.FindDescriptor("a"); this.repeatedGroupA = repeatedGroup.FindDescriptor("a"); - Assert.IsNotNull(groupA); - Assert.IsNotNull(repeatedGroupA); - Assert.IsNotNull(nestedB); - Assert.IsNotNull(foreignC); - Assert.IsNotNull(importD); - Assert.IsNotNull(nestedFoo); - Assert.IsNotNull(nestedBar); - Assert.IsNotNull(nestedBaz); - Assert.IsNotNull(foreignFoo); - Assert.IsNotNull(foreignBar); - Assert.IsNotNull(foreignBaz); - Assert.IsNotNull(importFoo); - Assert.IsNotNull(importBar); - Assert.IsNotNull(importBaz); + Assert.NotNull(groupA); + Assert.NotNull(repeatedGroupA); + Assert.NotNull(nestedB); + Assert.NotNull(foreignC); + Assert.NotNull(importD); + Assert.NotNull(nestedFoo); + Assert.NotNull(nestedBar); + Assert.NotNull(nestedBaz); + Assert.NotNull(foreignFoo); + Assert.NotNull(foreignBar); + Assert.NotNull(foreignBaz); + Assert.NotNull(importFoo); + Assert.NotNull(importBar); + Assert.NotNull(importBaz); } /// @@ -216,7 +216,7 @@ namespace Google.ProtocolBuffers { result = file.FindTypeByName(name + "_extension"); } - Assert.IsNotNull(result); + Assert.NotNull(result); return result; } @@ -233,8 +233,8 @@ namespace Google.ProtocolBuffers else { ExtensionInfo extension = extensionRegistry[field.ContainingType, field.FieldNumber]; - Assert.IsNotNull(extension); - Assert.IsNotNull(extension.DefaultInstance); + Assert.NotNull(extension); + Assert.NotNull(extension.DefaultInstance); return (IBuilder) extension.DefaultInstance.WeakCreateBuilderForType(); } } @@ -449,199 +449,199 @@ namespace Google.ProtocolBuffers /// public void AssertAllFieldsSetViaReflection(IMessage message) { - Assert.IsTrue(message.HasField(f("optional_int32"))); - Assert.IsTrue(message.HasField(f("optional_int64"))); - Assert.IsTrue(message.HasField(f("optional_uint32"))); - Assert.IsTrue(message.HasField(f("optional_uint64"))); - Assert.IsTrue(message.HasField(f("optional_sint32"))); - Assert.IsTrue(message.HasField(f("optional_sint64"))); - Assert.IsTrue(message.HasField(f("optional_fixed32"))); - Assert.IsTrue(message.HasField(f("optional_fixed64"))); - Assert.IsTrue(message.HasField(f("optional_sfixed32"))); - Assert.IsTrue(message.HasField(f("optional_sfixed64"))); - Assert.IsTrue(message.HasField(f("optional_float"))); - Assert.IsTrue(message.HasField(f("optional_double"))); - Assert.IsTrue(message.HasField(f("optional_bool"))); - Assert.IsTrue(message.HasField(f("optional_string"))); - Assert.IsTrue(message.HasField(f("optional_bytes"))); - - Assert.IsTrue(message.HasField(f("optionalgroup"))); - Assert.IsTrue(message.HasField(f("optional_nested_message"))); - Assert.IsTrue(message.HasField(f("optional_foreign_message"))); - Assert.IsTrue(message.HasField(f("optional_import_message"))); - - Assert.IsTrue(((IMessage) message[f("optionalgroup")]).HasField(groupA)); - Assert.IsTrue(((IMessage) message[f("optional_nested_message")]).HasField(nestedB)); - Assert.IsTrue(((IMessage) message[f("optional_foreign_message")]).HasField(foreignC)); - Assert.IsTrue(((IMessage) message[f("optional_import_message")]).HasField(importD)); - - Assert.IsTrue(message.HasField(f("optional_nested_enum"))); - Assert.IsTrue(message.HasField(f("optional_foreign_enum"))); - Assert.IsTrue(message.HasField(f("optional_import_enum"))); - - Assert.IsTrue(message.HasField(f("optional_string_piece"))); - Assert.IsTrue(message.HasField(f("optional_cord"))); - - Assert.AreEqual(101, message[f("optional_int32")]); - Assert.AreEqual(102L, message[f("optional_int64")]); - Assert.AreEqual(103u, message[f("optional_uint32")]); - Assert.AreEqual(104UL, message[f("optional_uint64")]); - Assert.AreEqual(105, message[f("optional_sint32")]); - Assert.AreEqual(106L, message[f("optional_sint64")]); - Assert.AreEqual(107U, message[f("optional_fixed32")]); - Assert.AreEqual(108UL, message[f("optional_fixed64")]); - Assert.AreEqual(109, message[f("optional_sfixed32")]); - Assert.AreEqual(110L, message[f("optional_sfixed64")]); - Assert.AreEqual(111F, message[f("optional_float")]); - Assert.AreEqual(112D, message[f("optional_double")]); - Assert.AreEqual(true, message[f("optional_bool")]); - Assert.AreEqual("115", message[f("optional_string")]); - Assert.AreEqual(TestUtil.ToBytes("116"), message[f("optional_bytes")]); - - Assert.AreEqual(117, ((IMessage) message[f("optionalgroup")])[groupA]); - Assert.AreEqual(118, ((IMessage) message[f("optional_nested_message")])[nestedB]); - Assert.AreEqual(119, ((IMessage) message[f("optional_foreign_message")])[foreignC]); - Assert.AreEqual(120, ((IMessage) message[f("optional_import_message")])[importD]); - - Assert.AreEqual(nestedBaz, message[f("optional_nested_enum")]); - Assert.AreEqual(foreignBaz, message[f("optional_foreign_enum")]); - Assert.AreEqual(importBaz, message[f("optional_import_enum")]); - - Assert.AreEqual("124", message[f("optional_string_piece")]); - Assert.AreEqual("125", message[f("optional_cord")]); + Assert.True(message.HasField(f("optional_int32"))); + Assert.True(message.HasField(f("optional_int64"))); + Assert.True(message.HasField(f("optional_uint32"))); + Assert.True(message.HasField(f("optional_uint64"))); + Assert.True(message.HasField(f("optional_sint32"))); + Assert.True(message.HasField(f("optional_sint64"))); + Assert.True(message.HasField(f("optional_fixed32"))); + Assert.True(message.HasField(f("optional_fixed64"))); + Assert.True(message.HasField(f("optional_sfixed32"))); + Assert.True(message.HasField(f("optional_sfixed64"))); + Assert.True(message.HasField(f("optional_float"))); + Assert.True(message.HasField(f("optional_double"))); + Assert.True(message.HasField(f("optional_bool"))); + Assert.True(message.HasField(f("optional_string"))); + Assert.True(message.HasField(f("optional_bytes"))); + + Assert.True(message.HasField(f("optionalgroup"))); + Assert.True(message.HasField(f("optional_nested_message"))); + Assert.True(message.HasField(f("optional_foreign_message"))); + Assert.True(message.HasField(f("optional_import_message"))); + + Assert.True(((IMessage) message[f("optionalgroup")]).HasField(groupA)); + Assert.True(((IMessage) message[f("optional_nested_message")]).HasField(nestedB)); + Assert.True(((IMessage) message[f("optional_foreign_message")]).HasField(foreignC)); + Assert.True(((IMessage) message[f("optional_import_message")]).HasField(importD)); + + Assert.True(message.HasField(f("optional_nested_enum"))); + Assert.True(message.HasField(f("optional_foreign_enum"))); + Assert.True(message.HasField(f("optional_import_enum"))); + + Assert.True(message.HasField(f("optional_string_piece"))); + Assert.True(message.HasField(f("optional_cord"))); + + Assert.Equal(101, message[f("optional_int32")]); + Assert.Equal(102L, message[f("optional_int64")]); + Assert.Equal(103u, message[f("optional_uint32")]); + Assert.Equal(104UL, message[f("optional_uint64")]); + Assert.Equal(105, message[f("optional_sint32")]); + Assert.Equal(106L, message[f("optional_sint64")]); + Assert.Equal(107U, message[f("optional_fixed32")]); + Assert.Equal(108UL, message[f("optional_fixed64")]); + Assert.Equal(109, message[f("optional_sfixed32")]); + Assert.Equal(110L, message[f("optional_sfixed64")]); + Assert.Equal(111F, message[f("optional_float")]); + Assert.Equal(112D, message[f("optional_double")]); + Assert.Equal(true, message[f("optional_bool")]); + Assert.Equal("115", message[f("optional_string")]); + Assert.Equal(TestUtil.ToBytes("116"), message[f("optional_bytes")]); + + Assert.Equal(117, ((IMessage) message[f("optionalgroup")])[groupA]); + Assert.Equal(118, ((IMessage) message[f("optional_nested_message")])[nestedB]); + Assert.Equal(119, ((IMessage) message[f("optional_foreign_message")])[foreignC]); + Assert.Equal(120, ((IMessage) message[f("optional_import_message")])[importD]); + + Assert.Equal(nestedBaz, message[f("optional_nested_enum")]); + Assert.Equal(foreignBaz, message[f("optional_foreign_enum")]); + Assert.Equal(importBaz, message[f("optional_import_enum")]); + + Assert.Equal("124", message[f("optional_string_piece")]); + Assert.Equal("125", message[f("optional_cord")]); // ----------------------------------------------------------------- - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_cord"))); - - Assert.AreEqual(201, message[f("repeated_int32"), 0]); - Assert.AreEqual(202L, message[f("repeated_int64"), 0]); - Assert.AreEqual(203U, message[f("repeated_uint32"), 0]); - Assert.AreEqual(204UL, message[f("repeated_uint64"), 0]); - Assert.AreEqual(205, message[f("repeated_sint32"), 0]); - Assert.AreEqual(206L, message[f("repeated_sint64"), 0]); - Assert.AreEqual(207U, message[f("repeated_fixed32"), 0]); - Assert.AreEqual(208UL, message[f("repeated_fixed64"), 0]); - Assert.AreEqual(209, message[f("repeated_sfixed32"), 0]); - Assert.AreEqual(210L, message[f("repeated_sfixed64"), 0]); - Assert.AreEqual(211F, message[f("repeated_float"), 0]); - Assert.AreEqual(212D, message[f("repeated_double"), 0]); - Assert.AreEqual(true, message[f("repeated_bool"), 0]); - Assert.AreEqual("215", message[f("repeated_string"), 0]); - Assert.AreEqual(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); - - Assert.AreEqual(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); - Assert.AreEqual(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); - Assert.AreEqual(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); - Assert.AreEqual(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); - - Assert.AreEqual(nestedBar, message[f("repeated_nested_enum"), 0]); - Assert.AreEqual(foreignBar, message[f("repeated_foreign_enum"), 0]); - Assert.AreEqual(importBar, message[f("repeated_import_enum"), 0]); - - Assert.AreEqual("224", message[f("repeated_string_piece"), 0]); - Assert.AreEqual("225", message[f("repeated_cord"), 0]); - - Assert.AreEqual(301, message[f("repeated_int32"), 1]); - Assert.AreEqual(302L, message[f("repeated_int64"), 1]); - Assert.AreEqual(303U, message[f("repeated_uint32"), 1]); - Assert.AreEqual(304UL, message[f("repeated_uint64"), 1]); - Assert.AreEqual(305, message[f("repeated_sint32"), 1]); - Assert.AreEqual(306L, message[f("repeated_sint64"), 1]); - Assert.AreEqual(307U, message[f("repeated_fixed32"), 1]); - Assert.AreEqual(308UL, message[f("repeated_fixed64"), 1]); - Assert.AreEqual(309, message[f("repeated_sfixed32"), 1]); - Assert.AreEqual(310L, message[f("repeated_sfixed64"), 1]); - Assert.AreEqual(311F, message[f("repeated_float"), 1]); - Assert.AreEqual(312D, message[f("repeated_double"), 1]); - Assert.AreEqual(false, message[f("repeated_bool"), 1]); - Assert.AreEqual("315", message[f("repeated_string"), 1]); - Assert.AreEqual(TestUtil.ToBytes("316"), message[f("repeated_bytes"), 1]); - - Assert.AreEqual(317, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); - Assert.AreEqual(318, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); - Assert.AreEqual(319, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); - Assert.AreEqual(320, ((IMessage) message[f("repeated_import_message"), 1])[importD]); - - Assert.AreEqual(nestedBaz, message[f("repeated_nested_enum"), 1]); - Assert.AreEqual(foreignBaz, message[f("repeated_foreign_enum"), 1]); - Assert.AreEqual(importBaz, message[f("repeated_import_enum"), 1]); - - Assert.AreEqual("324", message[f("repeated_string_piece"), 1]); - Assert.AreEqual("325", message[f("repeated_cord"), 1]); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_cord"))); + + Assert.Equal(201, message[f("repeated_int32"), 0]); + Assert.Equal(202L, message[f("repeated_int64"), 0]); + Assert.Equal(203U, message[f("repeated_uint32"), 0]); + Assert.Equal(204UL, message[f("repeated_uint64"), 0]); + Assert.Equal(205, message[f("repeated_sint32"), 0]); + Assert.Equal(206L, message[f("repeated_sint64"), 0]); + Assert.Equal(207U, message[f("repeated_fixed32"), 0]); + Assert.Equal(208UL, message[f("repeated_fixed64"), 0]); + Assert.Equal(209, message[f("repeated_sfixed32"), 0]); + Assert.Equal(210L, message[f("repeated_sfixed64"), 0]); + Assert.Equal(211F, message[f("repeated_float"), 0]); + Assert.Equal(212D, message[f("repeated_double"), 0]); + Assert.Equal(true, message[f("repeated_bool"), 0]); + Assert.Equal("215", message[f("repeated_string"), 0]); + Assert.Equal(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); + + Assert.Equal(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); + Assert.Equal(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); + Assert.Equal(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); + Assert.Equal(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); + + Assert.Equal(nestedBar, message[f("repeated_nested_enum"), 0]); + Assert.Equal(foreignBar, message[f("repeated_foreign_enum"), 0]); + Assert.Equal(importBar, message[f("repeated_import_enum"), 0]); + + Assert.Equal("224", message[f("repeated_string_piece"), 0]); + Assert.Equal("225", message[f("repeated_cord"), 0]); + + Assert.Equal(301, message[f("repeated_int32"), 1]); + Assert.Equal(302L, message[f("repeated_int64"), 1]); + Assert.Equal(303U, message[f("repeated_uint32"), 1]); + Assert.Equal(304UL, message[f("repeated_uint64"), 1]); + Assert.Equal(305, message[f("repeated_sint32"), 1]); + Assert.Equal(306L, message[f("repeated_sint64"), 1]); + Assert.Equal(307U, message[f("repeated_fixed32"), 1]); + Assert.Equal(308UL, message[f("repeated_fixed64"), 1]); + Assert.Equal(309, message[f("repeated_sfixed32"), 1]); + Assert.Equal(310L, message[f("repeated_sfixed64"), 1]); + Assert.Equal(311F, message[f("repeated_float"), 1]); + Assert.Equal(312D, message[f("repeated_double"), 1]); + Assert.Equal(false, message[f("repeated_bool"), 1]); + Assert.Equal("315", message[f("repeated_string"), 1]); + Assert.Equal(TestUtil.ToBytes("316"), message[f("repeated_bytes"), 1]); + + Assert.Equal(317, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); + Assert.Equal(318, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); + Assert.Equal(319, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); + Assert.Equal(320, ((IMessage) message[f("repeated_import_message"), 1])[importD]); + + Assert.Equal(nestedBaz, message[f("repeated_nested_enum"), 1]); + Assert.Equal(foreignBaz, message[f("repeated_foreign_enum"), 1]); + Assert.Equal(importBaz, message[f("repeated_import_enum"), 1]); + + Assert.Equal("324", message[f("repeated_string_piece"), 1]); + Assert.Equal("325", message[f("repeated_cord"), 1]); // ----------------------------------------------------------------- - Assert.IsTrue(message.HasField(f("default_int32"))); - Assert.IsTrue(message.HasField(f("default_int64"))); - Assert.IsTrue(message.HasField(f("default_uint32"))); - Assert.IsTrue(message.HasField(f("default_uint64"))); - Assert.IsTrue(message.HasField(f("default_sint32"))); - Assert.IsTrue(message.HasField(f("default_sint64"))); - Assert.IsTrue(message.HasField(f("default_fixed32"))); - Assert.IsTrue(message.HasField(f("default_fixed64"))); - Assert.IsTrue(message.HasField(f("default_sfixed32"))); - Assert.IsTrue(message.HasField(f("default_sfixed64"))); - Assert.IsTrue(message.HasField(f("default_float"))); - Assert.IsTrue(message.HasField(f("default_double"))); - Assert.IsTrue(message.HasField(f("default_bool"))); - Assert.IsTrue(message.HasField(f("default_string"))); - Assert.IsTrue(message.HasField(f("default_bytes"))); - - Assert.IsTrue(message.HasField(f("default_nested_enum"))); - Assert.IsTrue(message.HasField(f("default_foreign_enum"))); - Assert.IsTrue(message.HasField(f("default_import_enum"))); - - Assert.IsTrue(message.HasField(f("default_string_piece"))); - Assert.IsTrue(message.HasField(f("default_cord"))); - - Assert.AreEqual(401, message[f("default_int32")]); - Assert.AreEqual(402L, message[f("default_int64")]); - Assert.AreEqual(403U, message[f("default_uint32")]); - Assert.AreEqual(404UL, message[f("default_uint64")]); - Assert.AreEqual(405, message[f("default_sint32")]); - Assert.AreEqual(406L, message[f("default_sint64")]); - Assert.AreEqual(407U, message[f("default_fixed32")]); - Assert.AreEqual(408UL, message[f("default_fixed64")]); - Assert.AreEqual(409, message[f("default_sfixed32")]); - Assert.AreEqual(410L, message[f("default_sfixed64")]); - Assert.AreEqual(411F, message[f("default_float")]); - Assert.AreEqual(412D, message[f("default_double")]); - Assert.AreEqual(false, message[f("default_bool")]); - Assert.AreEqual("415", message[f("default_string")]); - Assert.AreEqual(TestUtil.ToBytes("416"), message[f("default_bytes")]); - - Assert.AreEqual(nestedFoo, message[f("default_nested_enum")]); - Assert.AreEqual(foreignFoo, message[f("default_foreign_enum")]); - Assert.AreEqual(importFoo, message[f("default_import_enum")]); - - Assert.AreEqual("424", message[f("default_string_piece")]); - Assert.AreEqual("425", message[f("default_cord")]); + Assert.True(message.HasField(f("default_int32"))); + Assert.True(message.HasField(f("default_int64"))); + Assert.True(message.HasField(f("default_uint32"))); + Assert.True(message.HasField(f("default_uint64"))); + Assert.True(message.HasField(f("default_sint32"))); + Assert.True(message.HasField(f("default_sint64"))); + Assert.True(message.HasField(f("default_fixed32"))); + Assert.True(message.HasField(f("default_fixed64"))); + Assert.True(message.HasField(f("default_sfixed32"))); + Assert.True(message.HasField(f("default_sfixed64"))); + Assert.True(message.HasField(f("default_float"))); + Assert.True(message.HasField(f("default_double"))); + Assert.True(message.HasField(f("default_bool"))); + Assert.True(message.HasField(f("default_string"))); + Assert.True(message.HasField(f("default_bytes"))); + + Assert.True(message.HasField(f("default_nested_enum"))); + Assert.True(message.HasField(f("default_foreign_enum"))); + Assert.True(message.HasField(f("default_import_enum"))); + + Assert.True(message.HasField(f("default_string_piece"))); + Assert.True(message.HasField(f("default_cord"))); + + Assert.Equal(401, message[f("default_int32")]); + Assert.Equal(402L, message[f("default_int64")]); + Assert.Equal(403U, message[f("default_uint32")]); + Assert.Equal(404UL, message[f("default_uint64")]); + Assert.Equal(405, message[f("default_sint32")]); + Assert.Equal(406L, message[f("default_sint64")]); + Assert.Equal(407U, message[f("default_fixed32")]); + Assert.Equal(408UL, message[f("default_fixed64")]); + Assert.Equal(409, message[f("default_sfixed32")]); + Assert.Equal(410L, message[f("default_sfixed64")]); + Assert.Equal(411F, message[f("default_float")]); + Assert.Equal(412D, message[f("default_double")]); + Assert.Equal(false, message[f("default_bool")]); + Assert.Equal("415", message[f("default_string")]); + Assert.Equal(TestUtil.ToBytes("416"), message[f("default_bytes")]); + + Assert.Equal(nestedFoo, message[f("default_nested_enum")]); + Assert.Equal(foreignFoo, message[f("default_foreign_enum")]); + Assert.Equal(importFoo, message[f("default_import_enum")]); + + Assert.Equal("424", message[f("default_string_piece")]); + Assert.Equal("425", message[f("default_cord")]); } /// @@ -651,148 +651,148 @@ namespace Google.ProtocolBuffers public void AssertClearViaReflection(IMessage message) { // has_blah() should initially be false for all optional fields. - Assert.IsFalse(message.HasField(f("optional_int32"))); - Assert.IsFalse(message.HasField(f("optional_int64"))); - Assert.IsFalse(message.HasField(f("optional_uint32"))); - Assert.IsFalse(message.HasField(f("optional_uint64"))); - Assert.IsFalse(message.HasField(f("optional_sint32"))); - Assert.IsFalse(message.HasField(f("optional_sint64"))); - Assert.IsFalse(message.HasField(f("optional_fixed32"))); - Assert.IsFalse(message.HasField(f("optional_fixed64"))); - Assert.IsFalse(message.HasField(f("optional_sfixed32"))); - Assert.IsFalse(message.HasField(f("optional_sfixed64"))); - Assert.IsFalse(message.HasField(f("optional_float"))); - Assert.IsFalse(message.HasField(f("optional_double"))); - Assert.IsFalse(message.HasField(f("optional_bool"))); - Assert.IsFalse(message.HasField(f("optional_string"))); - Assert.IsFalse(message.HasField(f("optional_bytes"))); - - Assert.IsFalse(message.HasField(f("optionalgroup"))); - Assert.IsFalse(message.HasField(f("optional_nested_message"))); - Assert.IsFalse(message.HasField(f("optional_foreign_message"))); - Assert.IsFalse(message.HasField(f("optional_import_message"))); - - Assert.IsFalse(message.HasField(f("optional_nested_enum"))); - Assert.IsFalse(message.HasField(f("optional_foreign_enum"))); - Assert.IsFalse(message.HasField(f("optional_import_enum"))); - - Assert.IsFalse(message.HasField(f("optional_string_piece"))); - Assert.IsFalse(message.HasField(f("optional_cord"))); + Assert.False(message.HasField(f("optional_int32"))); + Assert.False(message.HasField(f("optional_int64"))); + Assert.False(message.HasField(f("optional_uint32"))); + Assert.False(message.HasField(f("optional_uint64"))); + Assert.False(message.HasField(f("optional_sint32"))); + Assert.False(message.HasField(f("optional_sint64"))); + Assert.False(message.HasField(f("optional_fixed32"))); + Assert.False(message.HasField(f("optional_fixed64"))); + Assert.False(message.HasField(f("optional_sfixed32"))); + Assert.False(message.HasField(f("optional_sfixed64"))); + Assert.False(message.HasField(f("optional_float"))); + Assert.False(message.HasField(f("optional_double"))); + Assert.False(message.HasField(f("optional_bool"))); + Assert.False(message.HasField(f("optional_string"))); + Assert.False(message.HasField(f("optional_bytes"))); + + Assert.False(message.HasField(f("optionalgroup"))); + Assert.False(message.HasField(f("optional_nested_message"))); + Assert.False(message.HasField(f("optional_foreign_message"))); + Assert.False(message.HasField(f("optional_import_message"))); + + Assert.False(message.HasField(f("optional_nested_enum"))); + Assert.False(message.HasField(f("optional_foreign_enum"))); + Assert.False(message.HasField(f("optional_import_enum"))); + + Assert.False(message.HasField(f("optional_string_piece"))); + Assert.False(message.HasField(f("optional_cord"))); // Optional fields without defaults are set to zero or something like it. - Assert.AreEqual(0, message[f("optional_int32")]); - Assert.AreEqual(0L, message[f("optional_int64")]); - Assert.AreEqual(0U, message[f("optional_uint32")]); - Assert.AreEqual(0UL, message[f("optional_uint64")]); - Assert.AreEqual(0, message[f("optional_sint32")]); - Assert.AreEqual(0L, message[f("optional_sint64")]); - Assert.AreEqual(0U, message[f("optional_fixed32")]); - Assert.AreEqual(0UL, message[f("optional_fixed64")]); - Assert.AreEqual(0, message[f("optional_sfixed32")]); - Assert.AreEqual(0L, message[f("optional_sfixed64")]); - Assert.AreEqual(0F, message[f("optional_float")]); - Assert.AreEqual(0D, message[f("optional_double")]); - Assert.AreEqual(false, message[f("optional_bool")]); - Assert.AreEqual("", message[f("optional_string")]); - Assert.AreEqual(ByteString.Empty, message[f("optional_bytes")]); + Assert.Equal(0, message[f("optional_int32")]); + Assert.Equal(0L, message[f("optional_int64")]); + Assert.Equal(0U, message[f("optional_uint32")]); + Assert.Equal(0UL, message[f("optional_uint64")]); + Assert.Equal(0, message[f("optional_sint32")]); + Assert.Equal(0L, message[f("optional_sint64")]); + Assert.Equal(0U, message[f("optional_fixed32")]); + Assert.Equal(0UL, message[f("optional_fixed64")]); + Assert.Equal(0, message[f("optional_sfixed32")]); + Assert.Equal(0L, message[f("optional_sfixed64")]); + Assert.Equal(0F, message[f("optional_float")]); + Assert.Equal(0D, message[f("optional_double")]); + Assert.Equal(false, message[f("optional_bool")]); + Assert.Equal("", message[f("optional_string")]); + Assert.Equal(ByteString.Empty, message[f("optional_bytes")]); // Embedded messages should also be clear. - Assert.IsFalse(((IMessage) message[f("optionalgroup")]).HasField(groupA)); - Assert.IsFalse(((IMessage) message[f("optional_nested_message")]) + Assert.False(((IMessage) message[f("optionalgroup")]).HasField(groupA)); + Assert.False(((IMessage) message[f("optional_nested_message")]) .HasField(nestedB)); - Assert.IsFalse(((IMessage) message[f("optional_foreign_message")]) + Assert.False(((IMessage) message[f("optional_foreign_message")]) .HasField(foreignC)); - Assert.IsFalse(((IMessage) message[f("optional_import_message")]) + Assert.False(((IMessage) message[f("optional_import_message")]) .HasField(importD)); - Assert.AreEqual(0, ((IMessage) message[f("optionalgroup")])[groupA]); - Assert.AreEqual(0, ((IMessage) message[f("optional_nested_message")])[nestedB]); - Assert.AreEqual(0, ((IMessage) message[f("optional_foreign_message")])[foreignC]); - Assert.AreEqual(0, ((IMessage) message[f("optional_import_message")])[importD]); + Assert.Equal(0, ((IMessage) message[f("optionalgroup")])[groupA]); + Assert.Equal(0, ((IMessage) message[f("optional_nested_message")])[nestedB]); + Assert.Equal(0, ((IMessage) message[f("optional_foreign_message")])[foreignC]); + Assert.Equal(0, ((IMessage) message[f("optional_import_message")])[importD]); // Enums without defaults are set to the first value in the enum. - Assert.AreEqual(nestedFoo, message[f("optional_nested_enum")]); - Assert.AreEqual(foreignFoo, message[f("optional_foreign_enum")]); - Assert.AreEqual(importFoo, message[f("optional_import_enum")]); + Assert.Equal(nestedFoo, message[f("optional_nested_enum")]); + Assert.Equal(foreignFoo, message[f("optional_foreign_enum")]); + Assert.Equal(importFoo, message[f("optional_import_enum")]); - Assert.AreEqual("", message[f("optional_string_piece")]); - Assert.AreEqual("", message[f("optional_cord")]); + Assert.Equal("", message[f("optional_string_piece")]); + Assert.Equal("", message[f("optional_cord")]); // Repeated fields are empty. - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_cord"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_cord"))); // has_blah() should also be false for all default fields. - Assert.IsFalse(message.HasField(f("default_int32"))); - Assert.IsFalse(message.HasField(f("default_int64"))); - Assert.IsFalse(message.HasField(f("default_uint32"))); - Assert.IsFalse(message.HasField(f("default_uint64"))); - Assert.IsFalse(message.HasField(f("default_sint32"))); - Assert.IsFalse(message.HasField(f("default_sint64"))); - Assert.IsFalse(message.HasField(f("default_fixed32"))); - Assert.IsFalse(message.HasField(f("default_fixed64"))); - Assert.IsFalse(message.HasField(f("default_sfixed32"))); - Assert.IsFalse(message.HasField(f("default_sfixed64"))); - Assert.IsFalse(message.HasField(f("default_float"))); - Assert.IsFalse(message.HasField(f("default_double"))); - Assert.IsFalse(message.HasField(f("default_bool"))); - Assert.IsFalse(message.HasField(f("default_string"))); - Assert.IsFalse(message.HasField(f("default_bytes"))); - - Assert.IsFalse(message.HasField(f("default_nested_enum"))); - Assert.IsFalse(message.HasField(f("default_foreign_enum"))); - Assert.IsFalse(message.HasField(f("default_import_enum"))); - - Assert.IsFalse(message.HasField(f("default_string_piece"))); - Assert.IsFalse(message.HasField(f("default_cord"))); + Assert.False(message.HasField(f("default_int32"))); + Assert.False(message.HasField(f("default_int64"))); + Assert.False(message.HasField(f("default_uint32"))); + Assert.False(message.HasField(f("default_uint64"))); + Assert.False(message.HasField(f("default_sint32"))); + Assert.False(message.HasField(f("default_sint64"))); + Assert.False(message.HasField(f("default_fixed32"))); + Assert.False(message.HasField(f("default_fixed64"))); + Assert.False(message.HasField(f("default_sfixed32"))); + Assert.False(message.HasField(f("default_sfixed64"))); + Assert.False(message.HasField(f("default_float"))); + Assert.False(message.HasField(f("default_double"))); + Assert.False(message.HasField(f("default_bool"))); + Assert.False(message.HasField(f("default_string"))); + Assert.False(message.HasField(f("default_bytes"))); + + Assert.False(message.HasField(f("default_nested_enum"))); + Assert.False(message.HasField(f("default_foreign_enum"))); + Assert.False(message.HasField(f("default_import_enum"))); + + Assert.False(message.HasField(f("default_string_piece"))); + Assert.False(message.HasField(f("default_cord"))); // Fields with defaults have their default values (duh). - Assert.AreEqual(41, message[f("default_int32")]); - Assert.AreEqual(42L, message[f("default_int64")]); - Assert.AreEqual(43U, message[f("default_uint32")]); - Assert.AreEqual(44UL, message[f("default_uint64")]); - Assert.AreEqual(-45, message[f("default_sint32")]); - Assert.AreEqual(46L, message[f("default_sint64")]); - Assert.AreEqual(47U, message[f("default_fixed32")]); - Assert.AreEqual(48UL, message[f("default_fixed64")]); - Assert.AreEqual(49, message[f("default_sfixed32")]); - Assert.AreEqual(-50L, message[f("default_sfixed64")]); - Assert.AreEqual(51.5F, message[f("default_float")]); - Assert.AreEqual(52e3D, message[f("default_double")]); - Assert.AreEqual(true, message[f("default_bool")]); - Assert.AreEqual("hello", message[f("default_string")]); - Assert.AreEqual(TestUtil.ToBytes("world"), message[f("default_bytes")]); - - Assert.AreEqual(nestedBar, message[f("default_nested_enum")]); - Assert.AreEqual(foreignBar, message[f("default_foreign_enum")]); - Assert.AreEqual(importBar, message[f("default_import_enum")]); - - Assert.AreEqual("abc", message[f("default_string_piece")]); - Assert.AreEqual("123", message[f("default_cord")]); + Assert.Equal(41, message[f("default_int32")]); + Assert.Equal(42L, message[f("default_int64")]); + Assert.Equal(43U, message[f("default_uint32")]); + Assert.Equal(44UL, message[f("default_uint64")]); + Assert.Equal(-45, message[f("default_sint32")]); + Assert.Equal(46L, message[f("default_sint64")]); + Assert.Equal(47U, message[f("default_fixed32")]); + Assert.Equal(48UL, message[f("default_fixed64")]); + Assert.Equal(49, message[f("default_sfixed32")]); + Assert.Equal(-50L, message[f("default_sfixed64")]); + Assert.Equal(51.5F, message[f("default_float")]); + Assert.Equal(52e3D, message[f("default_double")]); + Assert.Equal(true, message[f("default_bool")]); + Assert.Equal("hello", message[f("default_string")]); + Assert.Equal(TestUtil.ToBytes("world"), message[f("default_bytes")]); + + Assert.Equal(nestedBar, message[f("default_nested_enum")]); + Assert.Equal(foreignBar, message[f("default_foreign_enum")]); + Assert.Equal(importBar, message[f("default_import_enum")]); + + Assert.Equal("abc", message[f("default_string_piece")]); + Assert.Equal("123", message[f("default_cord")]); } // --------------------------------------------------------------- @@ -802,88 +802,88 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_cord"))); - - Assert.AreEqual(201, message[f("repeated_int32"), 0]); - Assert.AreEqual(202L, message[f("repeated_int64"), 0]); - Assert.AreEqual(203U, message[f("repeated_uint32"), 0]); - Assert.AreEqual(204UL, message[f("repeated_uint64"), 0]); - Assert.AreEqual(205, message[f("repeated_sint32"), 0]); - Assert.AreEqual(206L, message[f("repeated_sint64"), 0]); - Assert.AreEqual(207U, message[f("repeated_fixed32"), 0]); - Assert.AreEqual(208UL, message[f("repeated_fixed64"), 0]); - Assert.AreEqual(209, message[f("repeated_sfixed32"), 0]); - Assert.AreEqual(210L, message[f("repeated_sfixed64"), 0]); - Assert.AreEqual(211F, message[f("repeated_float"), 0]); - Assert.AreEqual(212D, message[f("repeated_double"), 0]); - Assert.AreEqual(true, message[f("repeated_bool"), 0]); - Assert.AreEqual("215", message[f("repeated_string"), 0]); - Assert.AreEqual(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); - - Assert.AreEqual(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); - Assert.AreEqual(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); - Assert.AreEqual(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); - Assert.AreEqual(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); - - Assert.AreEqual(nestedBar, message[f("repeated_nested_enum"), 0]); - Assert.AreEqual(foreignBar, message[f("repeated_foreign_enum"), 0]); - Assert.AreEqual(importBar, message[f("repeated_import_enum"), 0]); - - Assert.AreEqual("224", message[f("repeated_string_piece"), 0]); - Assert.AreEqual("225", message[f("repeated_cord"), 0]); - - Assert.AreEqual(501, message[f("repeated_int32"), 1]); - Assert.AreEqual(502L, message[f("repeated_int64"), 1]); - Assert.AreEqual(503U, message[f("repeated_uint32"), 1]); - Assert.AreEqual(504UL, message[f("repeated_uint64"), 1]); - Assert.AreEqual(505, message[f("repeated_sint32"), 1]); - Assert.AreEqual(506L, message[f("repeated_sint64"), 1]); - Assert.AreEqual(507U, message[f("repeated_fixed32"), 1]); - Assert.AreEqual(508UL, message[f("repeated_fixed64"), 1]); - Assert.AreEqual(509, message[f("repeated_sfixed32"), 1]); - Assert.AreEqual(510L, message[f("repeated_sfixed64"), 1]); - Assert.AreEqual(511F, message[f("repeated_float"), 1]); - Assert.AreEqual(512D, message[f("repeated_double"), 1]); - Assert.AreEqual(true, message[f("repeated_bool"), 1]); - Assert.AreEqual("515", message[f("repeated_string"), 1]); - Assert.AreEqual(TestUtil.ToBytes("516"), message[f("repeated_bytes"), 1]); - - Assert.AreEqual(517, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); - Assert.AreEqual(518, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); - Assert.AreEqual(519, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); - Assert.AreEqual(520, ((IMessage) message[f("repeated_import_message"), 1])[importD]); - - Assert.AreEqual(nestedFoo, message[f("repeated_nested_enum"), 1]); - Assert.AreEqual(foreignFoo, message[f("repeated_foreign_enum"), 1]); - Assert.AreEqual(importFoo, message[f("repeated_import_enum"), 1]); - - Assert.AreEqual("524", message[f("repeated_string_piece"), 1]); - Assert.AreEqual("525", message[f("repeated_cord"), 1]); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_cord"))); + + Assert.Equal(201, message[f("repeated_int32"), 0]); + Assert.Equal(202L, message[f("repeated_int64"), 0]); + Assert.Equal(203U, message[f("repeated_uint32"), 0]); + Assert.Equal(204UL, message[f("repeated_uint64"), 0]); + Assert.Equal(205, message[f("repeated_sint32"), 0]); + Assert.Equal(206L, message[f("repeated_sint64"), 0]); + Assert.Equal(207U, message[f("repeated_fixed32"), 0]); + Assert.Equal(208UL, message[f("repeated_fixed64"), 0]); + Assert.Equal(209, message[f("repeated_sfixed32"), 0]); + Assert.Equal(210L, message[f("repeated_sfixed64"), 0]); + Assert.Equal(211F, message[f("repeated_float"), 0]); + Assert.Equal(212D, message[f("repeated_double"), 0]); + Assert.Equal(true, message[f("repeated_bool"), 0]); + Assert.Equal("215", message[f("repeated_string"), 0]); + Assert.Equal(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); + + Assert.Equal(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); + Assert.Equal(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); + Assert.Equal(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); + Assert.Equal(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); + + Assert.Equal(nestedBar, message[f("repeated_nested_enum"), 0]); + Assert.Equal(foreignBar, message[f("repeated_foreign_enum"), 0]); + Assert.Equal(importBar, message[f("repeated_import_enum"), 0]); + + Assert.Equal("224", message[f("repeated_string_piece"), 0]); + Assert.Equal("225", message[f("repeated_cord"), 0]); + + Assert.Equal(501, message[f("repeated_int32"), 1]); + Assert.Equal(502L, message[f("repeated_int64"), 1]); + Assert.Equal(503U, message[f("repeated_uint32"), 1]); + Assert.Equal(504UL, message[f("repeated_uint64"), 1]); + Assert.Equal(505, message[f("repeated_sint32"), 1]); + Assert.Equal(506L, message[f("repeated_sint64"), 1]); + Assert.Equal(507U, message[f("repeated_fixed32"), 1]); + Assert.Equal(508UL, message[f("repeated_fixed64"), 1]); + Assert.Equal(509, message[f("repeated_sfixed32"), 1]); + Assert.Equal(510L, message[f("repeated_sfixed64"), 1]); + Assert.Equal(511F, message[f("repeated_float"), 1]); + Assert.Equal(512D, message[f("repeated_double"), 1]); + Assert.Equal(true, message[f("repeated_bool"), 1]); + Assert.Equal("515", message[f("repeated_string"), 1]); + Assert.Equal(TestUtil.ToBytes("516"), message[f("repeated_bytes"), 1]); + + Assert.Equal(517, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); + Assert.Equal(518, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); + Assert.Equal(519, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); + Assert.Equal(520, ((IMessage) message[f("repeated_import_message"), 1])[importD]); + + Assert.Equal(nestedFoo, message[f("repeated_nested_enum"), 1]); + Assert.Equal(foreignFoo, message[f("repeated_foreign_enum"), 1]); + Assert.Equal(importFoo, message[f("repeated_import_enum"), 1]); + + Assert.Equal("524", message[f("repeated_string_piece"), 1]); + Assert.Equal("525", message[f("repeated_cord"), 1]); } /// @@ -892,15 +892,15 @@ namespace Google.ProtocolBuffers /// public void AssertReflectionSettersRejectNull(IBuilder builder) { - TestUtil.AssertArgumentNullException(() => builder[f("optional_string")] = null); - TestUtil.AssertArgumentNullException(() => builder[f("optional_bytes")] = null); - TestUtil.AssertArgumentNullException(() => builder[f("optional_nested_enum")] = null); - TestUtil.AssertArgumentNullException(() => builder[f("optional_nested_message")] = null); - TestUtil.AssertArgumentNullException(() => builder[f("optional_nested_message")] = null); - TestUtil.AssertArgumentNullException(() => builder.WeakAddRepeatedField(f("repeated_string"), null)); - TestUtil.AssertArgumentNullException(() => builder.WeakAddRepeatedField(f("repeated_bytes"), null)); - TestUtil.AssertArgumentNullException(() => builder.WeakAddRepeatedField(f("repeated_nested_enum"), null)); - TestUtil.AssertArgumentNullException(() => builder.WeakAddRepeatedField(f("repeated_nested_message"), null)); + Assert.Throws(() => builder[f("optional_string")] = null); + Assert.Throws(() => builder[f("optional_bytes")] = null); + Assert.Throws(() => builder[f("optional_nested_enum")] = null); + Assert.Throws(() => builder[f("optional_nested_message")] = null); + Assert.Throws(() => builder[f("optional_nested_message")] = null); + Assert.Throws(() => builder.WeakAddRepeatedField(f("repeated_string"), null)); + Assert.Throws(() => builder.WeakAddRepeatedField(f("repeated_bytes"), null)); + Assert.Throws(() => builder.WeakAddRepeatedField(f("repeated_nested_enum"), null)); + Assert.Throws(() => builder.WeakAddRepeatedField(f("repeated_nested_message"), null)); } /// @@ -910,14 +910,14 @@ namespace Google.ProtocolBuffers public void AssertReflectionRepeatedSettersRejectNull(IBuilder builder) { builder.WeakAddRepeatedField(f("repeated_string"), "one"); - TestUtil.AssertArgumentNullException(() => builder.SetRepeatedField(f("repeated_string"), 0, null)); + Assert.Throws(() => builder.SetRepeatedField(f("repeated_string"), 0, null)); builder.WeakAddRepeatedField(f("repeated_bytes"), TestUtil.ToBytes("one")); - TestUtil.AssertArgumentNullException(() => builder.SetRepeatedField(f("repeated_bytes"), 0, null)); + Assert.Throws(() => builder.SetRepeatedField(f("repeated_bytes"), 0, null)); builder.WeakAddRepeatedField(f("repeated_nested_enum"), nestedBaz); - TestUtil.AssertArgumentNullException(() => builder.SetRepeatedField(f("repeated_nested_enum"), 0, null)); + Assert.Throws(() => builder.SetRepeatedField(f("repeated_nested_enum"), 0, null)); builder.WeakAddRepeatedField(f("repeated_nested_message"), new TestAllTypes.Types.NestedMessage.Builder {Bb = 218}.Build()); - TestUtil.AssertArgumentNullException(() => builder.SetRepeatedField(f("repeated_nested_message"), 0, null)); + Assert.Throws(() => builder.SetRepeatedField(f("repeated_nested_message"), 0, null)); } public void SetPackedFieldsViaReflection(IBuilder message) @@ -955,50 +955,50 @@ namespace Google.ProtocolBuffers public void AssertPackedFieldsSetViaReflection(IMessage message) { - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_int32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_int64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_uint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_uint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sint32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sint64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_fixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_fixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sfixed32"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sfixed64"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_float"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_double"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_bool"))); - Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_enum"))); - - Assert.AreEqual(601, message[f("packed_int32"), 0]); - Assert.AreEqual(602L, message[f("packed_int64"), 0]); - Assert.AreEqual(603u, message[f("packed_uint32"), 0]); - Assert.AreEqual(604uL, message[f("packed_uint64"), 0]); - Assert.AreEqual(605, message[f("packed_sint32"), 0]); - Assert.AreEqual(606L, message[f("packed_sint64"), 0]); - Assert.AreEqual(607u, message[f("packed_fixed32"), 0]); - Assert.AreEqual(608uL, message[f("packed_fixed64"), 0]); - Assert.AreEqual(609, message[f("packed_sfixed32"), 0]); - Assert.AreEqual(610L, message[f("packed_sfixed64"), 0]); - Assert.AreEqual(611F, message[f("packed_float"), 0]); - Assert.AreEqual(612D, message[f("packed_double"), 0]); - Assert.AreEqual(true, message[f("packed_bool"), 0]); - Assert.AreEqual(foreignBar, message[f("packed_enum"), 0]); - - Assert.AreEqual(701, message[f("packed_int32"), 1]); - Assert.AreEqual(702L, message[f("packed_int64"), 1]); - Assert.AreEqual(703u, message[f("packed_uint32"), 1]); - Assert.AreEqual(704uL, message[f("packed_uint64"), 1]); - Assert.AreEqual(705, message[f("packed_sint32"), 1]); - Assert.AreEqual(706L, message[f("packed_sint64"), 1]); - Assert.AreEqual(707u, message[f("packed_fixed32"), 1]); - Assert.AreEqual(708uL, message[f("packed_fixed64"), 1]); - Assert.AreEqual(709, message[f("packed_sfixed32"), 1]); - Assert.AreEqual(710L, message[f("packed_sfixed64"), 1]); - Assert.AreEqual(711F, message[f("packed_float"), 1]); - Assert.AreEqual(712D, message[f("packed_double"), 1]); - Assert.AreEqual(false, message[f("packed_bool"), 1]); - Assert.AreEqual(foreignBaz, message[f("packed_enum"), 1]); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_int32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_int64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_uint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_uint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sint32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sint64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_fixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_fixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sfixed32"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sfixed64"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_float"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_double"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_bool"))); + Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_enum"))); + + Assert.Equal(601, message[f("packed_int32"), 0]); + Assert.Equal(602L, message[f("packed_int64"), 0]); + Assert.Equal(603u, message[f("packed_uint32"), 0]); + Assert.Equal(604uL, message[f("packed_uint64"), 0]); + Assert.Equal(605, message[f("packed_sint32"), 0]); + Assert.Equal(606L, message[f("packed_sint64"), 0]); + Assert.Equal(607u, message[f("packed_fixed32"), 0]); + Assert.Equal(608uL, message[f("packed_fixed64"), 0]); + Assert.Equal(609, message[f("packed_sfixed32"), 0]); + Assert.Equal(610L, message[f("packed_sfixed64"), 0]); + Assert.Equal(611F, message[f("packed_float"), 0]); + Assert.Equal(612D, message[f("packed_double"), 0]); + Assert.Equal(true, message[f("packed_bool"), 0]); + Assert.Equal(foreignBar, message[f("packed_enum"), 0]); + + Assert.Equal(701, message[f("packed_int32"), 1]); + Assert.Equal(702L, message[f("packed_int64"), 1]); + Assert.Equal(703u, message[f("packed_uint32"), 1]); + Assert.Equal(704uL, message[f("packed_uint64"), 1]); + Assert.Equal(705, message[f("packed_sint32"), 1]); + Assert.Equal(706L, message[f("packed_sint64"), 1]); + Assert.Equal(707u, message[f("packed_fixed32"), 1]); + Assert.Equal(708uL, message[f("packed_fixed64"), 1]); + Assert.Equal(709, message[f("packed_sfixed32"), 1]); + Assert.Equal(710L, message[f("packed_sfixed64"), 1]); + Assert.Equal(711F, message[f("packed_float"), 1]); + Assert.Equal(712D, message[f("packed_double"), 1]); + Assert.Equal(false, message[f("packed_bool"), 1]); + Assert.Equal(foreignBaz, message[f("packed_enum"), 1]); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs b/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs index a63f6575..e6b6a1b3 100644 --- a/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs +++ b/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs @@ -1,48 +1,43 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Text; using Google.ProtocolBuffers.Collections; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Google.ProtocolBuffers.TestProtos; -using Google.ProtocolBuffers.Serialization; using UnitTest.Issues.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class ReusableBuilderTest { //Issue 28: Circular message dependencies result in null defaults for DefaultInstance - [TestMethod] + [Fact] public void EnsureStaticCicularReference() { MyMessageAReferenceB ab = MyMessageAReferenceB.DefaultInstance; - Assert.IsNotNull(ab); - Assert.IsNotNull(ab.Value); + Assert.NotNull(ab); + Assert.NotNull(ab.Value); MyMessageBReferenceA ba = MyMessageBReferenceA.DefaultInstance; - Assert.IsNotNull(ba); - Assert.IsNotNull(ba.Value); + Assert.NotNull(ba); + Assert.NotNull(ba.Value); } - [TestMethod] + [Fact] public void TestModifyDefaultInstance() { //verify that the default instance has correctly been marked as read-only - Assert.AreEqual(typeof(PopsicleList), TestAllTypes.DefaultInstance.RepeatedBoolList.GetType()); + Assert.Equal(typeof(PopsicleList), TestAllTypes.DefaultInstance.RepeatedBoolList.GetType()); PopsicleList list = (PopsicleList)TestAllTypes.DefaultInstance.RepeatedBoolList; - Assert.IsTrue(list.IsReadOnly); + Assert.True(list.IsReadOnly); } - [TestMethod] + [Fact] public void TestUnmodifiedDefaultInstance() { //Simply calling ToBuilder().Build() no longer creates a copy of the message TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void BuildMultipleWithoutChange() { //Calling Build() or BuildPartial() does not require a copy of the message @@ -51,31 +46,31 @@ namespace Google.ProtocolBuffers TestAllTypes first = builder.BuildPartial(); //Still the same instance? - Assert.IsTrue(ReferenceEquals(first, builder.Build())); + Assert.True(ReferenceEquals(first, builder.Build())); //Still the same instance? - Assert.IsTrue(ReferenceEquals(first, builder.BuildPartial().ToBuilder().Build())); + Assert.True(ReferenceEquals(first, builder.BuildPartial().ToBuilder().Build())); } - [TestMethod] + [Fact] public void MergeFromDefaultInstance() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.MergeFrom(TestAllTypes.DefaultInstance); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void BuildNewBuilderIsDefaultInstance() { - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, new TestAllTypes.Builder().Build())); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, new TestAllTypes.Builder().Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().Build())); //last test, if you clear a builder it reverts to default instance - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().SetOptionalBool(true).Build().ToBuilder().Clear().Build())); } - [TestMethod] + [Fact] public void BuildModifyAndRebuild() { TestAllTypes.Builder b1 = new TestAllTypes.Builder(); @@ -91,80 +86,80 @@ namespace Google.ProtocolBuffers TestAllTypes m2 = b1.Build(); - Assert.AreEqual("{\"optional_foreign_message\":{},\"repeated_int32\":[2],\"default_int32\":1}", Extensions.ToJson(m1)); - Assert.AreEqual("{\"optional_foreign_message\":{\"c\":7},\"repeated_int32\":[2,6],\"default_int32\":5}", Extensions.ToJson(m2)); + Assert.Equal("{\"optional_foreign_message\":{},\"repeated_int32\":[2],\"default_int32\":1}", Extensions.ToJson(m1)); + Assert.Equal("{\"optional_foreign_message\":{\"c\":7},\"repeated_int32\":[2,6],\"default_int32\":5}", Extensions.ToJson(m2)); } - [TestMethod] + [Fact] public void CloneOnChangePrimitive() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetDefaultBool(true); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnAddRepeatedBool() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.AddRepeatedBool(true); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnGetRepeatedBoolList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedBoolList); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnChangeMessage() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetOptionalForeignMessage(new ForeignMessage.Builder()); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnClearMessage() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.ClearOptionalForeignMessage(); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnGetRepeatedForeignMessageList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedForeignMessageList); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnChangeEnumValue() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetOptionalForeignEnum(ForeignEnum.FOREIGN_BAR); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [TestMethod] + [Fact] public void CloneOnGetRepeatedForeignEnumList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedForeignEnumList); - Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } } diff --git a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs b/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs index 0be4e1d4..5bec24f1 100644 --- a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs +++ b/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs @@ -1,15 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using UnitTest.Issues.TestProtos; +using UnitTest.Issues.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestCornerCases { - [TestMethod] + [Fact] public void TestRoundTripNegativeEnums() { NegativeEnumMessage msg = NegativeEnumMessage.CreateBuilder() @@ -23,16 +19,16 @@ namespace Google.ProtocolBuffers .AddPackedValues(NegativeEnum.FiveBelow) //10 .Build(); - Assert.AreEqual(58, msg.SerializedSize); + Assert.Equal(58, msg.SerializedSize); byte[] bytes = new byte[58]; CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); msg.WriteTo(output); - Assert.AreEqual(0, output.SpaceLeft); + Assert.Equal(0, output.SpaceLeft); NegativeEnumMessage copy = NegativeEnumMessage.ParseFrom(bytes); - Assert.AreEqual(msg, copy); + Assert.Equal(msg, copy); } } } diff --git a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs index c16f567f..5caa2e23 100644 --- a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs +++ b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs @@ -5,11 +5,10 @@ using System.Text; using Google.ProtocolBuffers.Serialization; using Google.ProtocolBuffers.Serialization.Http; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestMimeMessageFormats { // There is a whole host of various json mime types in use around the net, this is the set we accept... @@ -17,85 +16,91 @@ namespace Google.ProtocolBuffers readonly IEnumerable XmlTypes = new string[] { "text/xml", "application/xml" }; readonly IEnumerable ProtobufTypes = new string[] { "application/binary", "application/x-protobuf", "application/vnd.google.protobuf" }; - [TestMethod] + [Fact] public void TestReadJsonMimeTypes() { foreach (string type in JsonTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is JsonFormatReader); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/json" }, null, Stream.Null) is JsonFormatReader); } - [TestMethod] + + [Fact] public void TestWriteJsonMimeTypes() { foreach (string type in JsonTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is JsonFormatWriter); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/json" }, null, Stream.Null) is JsonFormatWriter); } - [TestMethod] + + [Fact] public void TestReadXmlMimeTypes() { foreach (string type in XmlTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is XmlFormatReader); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/xml" }, null, Stream.Null) is XmlFormatReader); } - [TestMethod] + + [Fact] public void TestWriteXmlMimeTypes() { foreach (string type in XmlTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is XmlFormatWriter); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/xml" }, null, Stream.Null) is XmlFormatWriter); } - [TestMethod] + + [Fact] public void TestReadProtoMimeTypes() { foreach (string type in ProtobufTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is CodedInputStream); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/vnd.google.protobuf" }, null, Stream.Null) is CodedInputStream); } - [TestMethod] + + [Fact] public void TestWriteProtoMimeTypes() { foreach (string type in ProtobufTypes) { - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is CodedOutputStream); } - Assert.IsTrue( + Assert.True( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/vnd.google.protobuf" }, null, Stream.Null) is CodedOutputStream); } - [TestMethod] + + [Fact] public void TestMergeFromJsonType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -103,10 +108,11 @@ namespace Google.ProtocolBuffers Extensions.ToJson(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) ))) .Build(); - Assert.AreEqual("a", msg.Text); - Assert.AreEqual(1, msg.Number); + Assert.Equal("a", msg.Text); + Assert.Equal(1, msg.Number); } - [TestMethod] + + [Fact] public void TestMergeFromXmlType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -114,10 +120,10 @@ namespace Google.ProtocolBuffers Extensions.ToXml(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) ))) .Build(); - Assert.AreEqual("a", msg.Text); - Assert.AreEqual(1, msg.Number); + Assert.Equal("a", msg.Text); + Assert.Equal(1, msg.Number); } - [TestMethod] + [Fact] public void TestMergeFromProtoType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -125,28 +131,30 @@ namespace Google.ProtocolBuffers TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build().ToByteArray() )) .Build(); - Assert.AreEqual("a", msg.Text); - Assert.AreEqual(1, msg.Number); + Assert.Equal("a", msg.Text); + Assert.Equal(1, msg.Number); } - [TestMethod] + + [Fact] public void TestWriteToJsonType() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions(), "application/json", ms); - Assert.AreEqual(@"{""text"":""a"",""number"":1}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.Equal(@"{""text"":""a"",""number"":1}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [TestMethod] + + [Fact] public void TestWriteToXmlType() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions(), "application/xml", ms); - Assert.AreEqual("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.Equal("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [TestMethod] + [Fact] public void TestWriteToProtoType() { MemoryStream ms = new MemoryStream(); @@ -154,9 +162,10 @@ namespace Google.ProtocolBuffers new MessageFormatOptions(), "application/vnd.google.protobuf", ms); byte[] bytes = TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build().ToByteArray(); - TestUtil.AssertBytesEqual(bytes, ms.ToArray()); + Assert.Equal(bytes, ms.ToArray()); } - [TestMethod] + + [Fact] public void TestXmlReaderOptions() { MemoryStream ms = new MemoryStream(); @@ -175,12 +184,13 @@ namespace Google.ProtocolBuffers options, "application/xml", ms) .Build(); - Assert.AreEqual("a", msg.Text); - Assert.AreEqual(1, msg.NumbersList[0]); - Assert.AreEqual(2, msg.NumbersList[1]); + Assert.Equal("a", msg.Text); + Assert.Equal(1, msg.NumbersList[0]); + Assert.Equal(2, msg.NumbersList[1]); } - [TestMethod] + + [Fact] public void TestXmlWriterOptions() { TestXmlMessage message = TestXmlMessage.CreateBuilder().SetText("a").AddNumbers(1).AddNumbers(2).Build(); @@ -199,30 +209,32 @@ namespace Google.ProtocolBuffers .SetOptions(XmlReaderOptions.ReadNestedArrays) .Merge("root-node", builder); - Assert.AreEqual("a", builder.Text); - Assert.AreEqual(1, builder.NumbersList[0]); - Assert.AreEqual(2, builder.NumbersList[1]); + Assert.Equal("a", builder.Text); + Assert.Equal(1, builder.NumbersList[0]); + Assert.Equal(2, builder.NumbersList[1]); } - [TestMethod] + + [Fact] public void TestJsonFormatted() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions() { FormattedOutput = true }, "application/json", ms); - Assert.AreEqual("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.Equal("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [TestMethod] + + [Fact] public void TestXmlFormatted() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions() { FormattedOutput = true }, "application/xml", ms); - Assert.AreEqual("\r\n a\r\n 1\r\n", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.Equal("\r\n a\r\n 1\r\n", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [TestMethod] + [Fact] public void TestReadCustomMimeTypes() { var options = new MessageFormatOptions(); @@ -230,7 +242,7 @@ namespace Google.ProtocolBuffers options.MimeInputTypes.Clear(); //Add our own options.MimeInputTypes.Add("-custom-XML-mime-type-", XmlFormatReader.CreateInstance); - Assert.AreEqual(1, options.MimeInputTypes.Count); + Assert.Equal(1, options.MimeInputTypes.Count); Stream xmlStream = new MemoryStream(Encoding.UTF8.GetBytes( Extensions.ToXml(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) @@ -239,11 +251,11 @@ namespace Google.ProtocolBuffers TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), options, "-custom-XML-mime-type-", xmlStream) .Build(); - Assert.AreEqual("a", msg.Text); - Assert.AreEqual(1, msg.Number); + Assert.Equal("a", msg.Text); + Assert.Equal(1, msg.Number); } - [TestMethod] + [Fact] public void TestWriteToCustomType() { var options = new MessageFormatOptions(); @@ -252,13 +264,13 @@ namespace Google.ProtocolBuffers //Add our own options.MimeOutputTypes.Add("-custom-XML-mime-type-", XmlFormatWriter.CreateInstance); - Assert.AreEqual(1, options.MimeOutputTypes.Count); + Assert.Equal(1, options.MimeOutputTypes.Count); MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), options, "-custom-XML-mime-type-", ms); - Assert.AreEqual("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.Equal("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs index 1c43e24d..b262667a 100644 --- a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs +++ b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs @@ -1,16 +1,15 @@ using System; using System.IO; using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Google.ProtocolBuffers.TestProtos; using Google.ProtocolBuffers.Serialization.Http; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestReaderForUrlEncoded { - [TestMethod] + [Fact] public void Example_FromQueryString() { Uri sampleUri = new Uri("http://sample.com/Path/File.ext?text=two+three%20four&valid=true&numbers=1&numbers=2", UriKind.Absolute); @@ -21,14 +20,14 @@ namespace Google.ProtocolBuffers builder.MergeFrom(input); TestXmlMessage message = builder.Build(); - Assert.AreEqual(true, message.Valid); - Assert.AreEqual("two three four", message.Text); - Assert.AreEqual(2, message.NumbersCount); - Assert.AreEqual(1, message.NumbersList[0]); - Assert.AreEqual(2, message.NumbersList[1]); + Assert.Equal(true, message.Valid); + Assert.Equal("two three four", message.Text); + Assert.Equal(2, message.NumbersCount); + Assert.Equal(1, message.NumbersList[0]); + Assert.Equal(2, message.NumbersList[1]); } - [TestMethod] + [Fact] public void Example_FromFormData() { Stream rawPost = new MemoryStream(Encoding.UTF8.GetBytes("text=two+three%20four&valid=true&numbers=1&numbers=2"), false); @@ -39,46 +38,46 @@ namespace Google.ProtocolBuffers builder.MergeFrom(input); TestXmlMessage message = builder.Build(); - Assert.AreEqual(true, message.Valid); - Assert.AreEqual("two three four", message.Text); - Assert.AreEqual(2, message.NumbersCount); - Assert.AreEqual(1, message.NumbersList[0]); - Assert.AreEqual(2, message.NumbersList[1]); + Assert.Equal(true, message.Valid); + Assert.Equal("two three four", message.Text); + Assert.Equal(2, message.NumbersCount); + Assert.Equal(1, message.NumbersList[0]); + Assert.Equal(2, message.NumbersList[1]); } - [TestMethod] + [Fact] public void TestEmptyValues() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text=&numbers=1"); TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(input); - Assert.IsTrue(builder.Valid); - Assert.IsTrue(builder.HasText); - Assert.AreEqual("", builder.Text); - Assert.AreEqual(1, builder.NumbersCount); - Assert.AreEqual(1, builder.NumbersList[0]); + Assert.True(builder.Valid); + Assert.True(builder.HasText); + Assert.Equal("", builder.Text); + Assert.Equal(1, builder.NumbersCount); + Assert.Equal(1, builder.NumbersList[0]); } - [TestMethod] + [Fact] public void TestNoValue() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text&numbers=1"); TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(input); - Assert.IsTrue(builder.Valid); - Assert.IsTrue(builder.HasText); - Assert.AreEqual("", builder.Text); - Assert.AreEqual(1, builder.NumbersCount); - Assert.AreEqual(1, builder.NumbersList[0]); + Assert.True(builder.Valid); + Assert.True(builder.HasText); + Assert.Equal("", builder.Text); + Assert.Equal(1, builder.NumbersCount); + Assert.Equal(1, builder.NumbersList[0]); } - [TestMethod, ExpectedException(typeof(NotSupportedException))] + [Fact] public void FormUrlEncodedReaderDoesNotSupportChildren() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("child=uh0"); - TestXmlMessage.CreateBuilder().MergeFrom(input); + Assert.Throws(() => TestXmlMessage.CreateBuilder().MergeFrom(input)); } } } diff --git a/csharp/src/ProtocolBuffers.Test/TestUtil.cs b/csharp/src/ProtocolBuffers.Test/TestUtil.cs index ec30cbcd..83509c18 100644 --- a/csharp/src/ProtocolBuffers.Test/TestUtil.cs +++ b/csharp/src/ProtocolBuffers.Test/TestUtil.cs @@ -41,7 +41,7 @@ using System.IO; using System.Text; using System.Threading; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { @@ -324,343 +324,343 @@ namespace Google.ProtocolBuffers /// internal static void AssertAllFieldsSet(TestAllTypes message) { - Assert.IsTrue(message.HasOptionalInt32); - Assert.IsTrue(message.HasOptionalInt64); - Assert.IsTrue(message.HasOptionalUint32); - Assert.IsTrue(message.HasOptionalUint64); - Assert.IsTrue(message.HasOptionalSint32); - Assert.IsTrue(message.HasOptionalSint64); - Assert.IsTrue(message.HasOptionalFixed32); - Assert.IsTrue(message.HasOptionalFixed64); - Assert.IsTrue(message.HasOptionalSfixed32); - Assert.IsTrue(message.HasOptionalSfixed64); - Assert.IsTrue(message.HasOptionalFloat); - Assert.IsTrue(message.HasOptionalDouble); - Assert.IsTrue(message.HasOptionalBool); - Assert.IsTrue(message.HasOptionalString); - Assert.IsTrue(message.HasOptionalBytes); - - Assert.IsTrue(message.HasOptionalGroup); - Assert.IsTrue(message.HasOptionalNestedMessage); - Assert.IsTrue(message.HasOptionalForeignMessage); - Assert.IsTrue(message.HasOptionalImportMessage); - - Assert.IsTrue(message.OptionalGroup.HasA); - Assert.IsTrue(message.OptionalNestedMessage.HasBb); - Assert.IsTrue(message.OptionalForeignMessage.HasC); - Assert.IsTrue(message.OptionalImportMessage.HasD); - - Assert.IsTrue(message.HasOptionalNestedEnum); - Assert.IsTrue(message.HasOptionalForeignEnum); - Assert.IsTrue(message.HasOptionalImportEnum); - - Assert.IsTrue(message.HasOptionalStringPiece); - Assert.IsTrue(message.HasOptionalCord); - - Assert.AreEqual(101, message.OptionalInt32); - Assert.AreEqual(102, message.OptionalInt64); - Assert.AreEqual(103u, message.OptionalUint32); - Assert.AreEqual(104u, message.OptionalUint64); - Assert.AreEqual(105, message.OptionalSint32); - Assert.AreEqual(106, message.OptionalSint64); - Assert.AreEqual(107u, message.OptionalFixed32); - Assert.AreEqual(108u, message.OptionalFixed64); - Assert.AreEqual(109, message.OptionalSfixed32); - Assert.AreEqual(110, message.OptionalSfixed64); - Assert.AreEqual(111, message.OptionalFloat); - Assert.AreEqual(112, message.OptionalDouble); - Assert.AreEqual(true, message.OptionalBool); - Assert.AreEqual("115", message.OptionalString); - Assert.AreEqual(ToBytes("116"), message.OptionalBytes); - - Assert.AreEqual(117, message.OptionalGroup.A); - Assert.AreEqual(118, message.OptionalNestedMessage.Bb); - Assert.AreEqual(119, message.OptionalForeignMessage.C); - Assert.AreEqual(120, message.OptionalImportMessage.D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.OptionalNestedEnum); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.OptionalForeignEnum); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.OptionalImportEnum); - - Assert.AreEqual("124", message.OptionalStringPiece); - Assert.AreEqual("125", message.OptionalCord); + Assert.True(message.HasOptionalInt32); + Assert.True(message.HasOptionalInt64); + Assert.True(message.HasOptionalUint32); + Assert.True(message.HasOptionalUint64); + Assert.True(message.HasOptionalSint32); + Assert.True(message.HasOptionalSint64); + Assert.True(message.HasOptionalFixed32); + Assert.True(message.HasOptionalFixed64); + Assert.True(message.HasOptionalSfixed32); + Assert.True(message.HasOptionalSfixed64); + Assert.True(message.HasOptionalFloat); + Assert.True(message.HasOptionalDouble); + Assert.True(message.HasOptionalBool); + Assert.True(message.HasOptionalString); + Assert.True(message.HasOptionalBytes); + + Assert.True(message.HasOptionalGroup); + Assert.True(message.HasOptionalNestedMessage); + Assert.True(message.HasOptionalForeignMessage); + Assert.True(message.HasOptionalImportMessage); + + Assert.True(message.OptionalGroup.HasA); + Assert.True(message.OptionalNestedMessage.HasBb); + Assert.True(message.OptionalForeignMessage.HasC); + Assert.True(message.OptionalImportMessage.HasD); + + Assert.True(message.HasOptionalNestedEnum); + Assert.True(message.HasOptionalForeignEnum); + Assert.True(message.HasOptionalImportEnum); + + Assert.True(message.HasOptionalStringPiece); + Assert.True(message.HasOptionalCord); + + Assert.Equal(101, message.OptionalInt32); + Assert.Equal(102, message.OptionalInt64); + Assert.Equal(103u, message.OptionalUint32); + Assert.Equal(104u, message.OptionalUint64); + Assert.Equal(105, message.OptionalSint32); + Assert.Equal(106, message.OptionalSint64); + Assert.Equal(107u, message.OptionalFixed32); + Assert.Equal(108u, message.OptionalFixed64); + Assert.Equal(109, message.OptionalSfixed32); + Assert.Equal(110, message.OptionalSfixed64); + Assert.Equal(111, message.OptionalFloat); + Assert.Equal(112, message.OptionalDouble); + Assert.Equal(true, message.OptionalBool); + Assert.Equal("115", message.OptionalString); + Assert.Equal(ToBytes("116"), message.OptionalBytes); + + Assert.Equal(117, message.OptionalGroup.A); + Assert.Equal(118, message.OptionalNestedMessage.Bb); + Assert.Equal(119, message.OptionalForeignMessage.C); + Assert.Equal(120, message.OptionalImportMessage.D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.OptionalNestedEnum); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.OptionalForeignEnum); + Assert.Equal(ImportEnum.IMPORT_BAZ, message.OptionalImportEnum); + + Assert.Equal("124", message.OptionalStringPiece); + Assert.Equal("125", message.OptionalCord); // ----------------------------------------------------------------- - Assert.AreEqual(2, message.RepeatedInt32Count); - Assert.AreEqual(2, message.RepeatedInt64Count); - Assert.AreEqual(2, message.RepeatedUint32Count); - Assert.AreEqual(2, message.RepeatedUint64Count); - Assert.AreEqual(2, message.RepeatedSint32Count); - Assert.AreEqual(2, message.RepeatedSint64Count); - Assert.AreEqual(2, message.RepeatedFixed32Count); - Assert.AreEqual(2, message.RepeatedFixed64Count); - Assert.AreEqual(2, message.RepeatedSfixed32Count); - Assert.AreEqual(2, message.RepeatedSfixed64Count); - Assert.AreEqual(2, message.RepeatedFloatCount); - Assert.AreEqual(2, message.RepeatedDoubleCount); - Assert.AreEqual(2, message.RepeatedBoolCount); - Assert.AreEqual(2, message.RepeatedStringCount); - Assert.AreEqual(2, message.RepeatedBytesCount); - - Assert.AreEqual(2, message.RepeatedGroupCount); - Assert.AreEqual(2, message.RepeatedNestedMessageCount); - Assert.AreEqual(2, message.RepeatedForeignMessageCount); - Assert.AreEqual(2, message.RepeatedImportMessageCount); - Assert.AreEqual(2, message.RepeatedNestedEnumCount); - Assert.AreEqual(2, message.RepeatedForeignEnumCount); - Assert.AreEqual(2, message.RepeatedImportEnumCount); - - Assert.AreEqual(2, message.RepeatedStringPieceCount); - Assert.AreEqual(2, message.RepeatedCordCount); - - Assert.AreEqual(201, message.GetRepeatedInt32(0)); - Assert.AreEqual(202, message.GetRepeatedInt64(0)); - Assert.AreEqual(203u, message.GetRepeatedUint32(0)); - Assert.AreEqual(204u, message.GetRepeatedUint64(0)); - Assert.AreEqual(205, message.GetRepeatedSint32(0)); - Assert.AreEqual(206, message.GetRepeatedSint64(0)); - Assert.AreEqual(207u, message.GetRepeatedFixed32(0)); - Assert.AreEqual(208u, message.GetRepeatedFixed64(0)); - Assert.AreEqual(209, message.GetRepeatedSfixed32(0)); - Assert.AreEqual(210, message.GetRepeatedSfixed64(0)); - Assert.AreEqual(211, message.GetRepeatedFloat(0)); - Assert.AreEqual(212, message.GetRepeatedDouble(0)); - Assert.AreEqual(true, message.GetRepeatedBool(0)); - Assert.AreEqual("215", message.GetRepeatedString(0)); - Assert.AreEqual(ToBytes("216"), message.GetRepeatedBytes(0)); - - Assert.AreEqual(217, message.GetRepeatedGroup(0).A); - Assert.AreEqual(218, message.GetRepeatedNestedMessage(0).Bb); - Assert.AreEqual(219, message.GetRepeatedForeignMessage(0).C); - Assert.AreEqual(220, message.GetRepeatedImportMessage(0).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); - Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); - - Assert.AreEqual("224", message.GetRepeatedStringPiece(0)); - Assert.AreEqual("225", message.GetRepeatedCord(0)); - - Assert.AreEqual(301, message.GetRepeatedInt32(1)); - Assert.AreEqual(302, message.GetRepeatedInt64(1)); - Assert.AreEqual(303u, message.GetRepeatedUint32(1)); - Assert.AreEqual(304u, message.GetRepeatedUint64(1)); - Assert.AreEqual(305, message.GetRepeatedSint32(1)); - Assert.AreEqual(306, message.GetRepeatedSint64(1)); - Assert.AreEqual(307u, message.GetRepeatedFixed32(1)); - Assert.AreEqual(308u, message.GetRepeatedFixed64(1)); - Assert.AreEqual(309, message.GetRepeatedSfixed32(1)); - Assert.AreEqual(310, message.GetRepeatedSfixed64(1)); - Assert.AreEqual(311, message.GetRepeatedFloat(1), 0.0); - Assert.AreEqual(312, message.GetRepeatedDouble(1), 0.0); - Assert.AreEqual(false, message.GetRepeatedBool(1)); - Assert.AreEqual("315", message.GetRepeatedString(1)); - Assert.AreEqual(ToBytes("316"), message.GetRepeatedBytes(1)); - - Assert.AreEqual(317, message.GetRepeatedGroup(1).A); - Assert.AreEqual(318, message.GetRepeatedNestedMessage(1).Bb); - Assert.AreEqual(319, message.GetRepeatedForeignMessage(1).C); - Assert.AreEqual(320, message.GetRepeatedImportMessage(1).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.GetRepeatedNestedEnum(1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetRepeatedForeignEnum(1)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.GetRepeatedImportEnum(1)); - - Assert.AreEqual("324", message.GetRepeatedStringPiece(1)); - Assert.AreEqual("325", message.GetRepeatedCord(1)); + Assert.Equal(2, message.RepeatedInt32Count); + Assert.Equal(2, message.RepeatedInt64Count); + Assert.Equal(2, message.RepeatedUint32Count); + Assert.Equal(2, message.RepeatedUint64Count); + Assert.Equal(2, message.RepeatedSint32Count); + Assert.Equal(2, message.RepeatedSint64Count); + Assert.Equal(2, message.RepeatedFixed32Count); + Assert.Equal(2, message.RepeatedFixed64Count); + Assert.Equal(2, message.RepeatedSfixed32Count); + Assert.Equal(2, message.RepeatedSfixed64Count); + Assert.Equal(2, message.RepeatedFloatCount); + Assert.Equal(2, message.RepeatedDoubleCount); + Assert.Equal(2, message.RepeatedBoolCount); + Assert.Equal(2, message.RepeatedStringCount); + Assert.Equal(2, message.RepeatedBytesCount); + + Assert.Equal(2, message.RepeatedGroupCount); + Assert.Equal(2, message.RepeatedNestedMessageCount); + Assert.Equal(2, message.RepeatedForeignMessageCount); + Assert.Equal(2, message.RepeatedImportMessageCount); + Assert.Equal(2, message.RepeatedNestedEnumCount); + Assert.Equal(2, message.RepeatedForeignEnumCount); + Assert.Equal(2, message.RepeatedImportEnumCount); + + Assert.Equal(2, message.RepeatedStringPieceCount); + Assert.Equal(2, message.RepeatedCordCount); + + Assert.Equal(201, message.GetRepeatedInt32(0)); + Assert.Equal(202, message.GetRepeatedInt64(0)); + Assert.Equal(203u, message.GetRepeatedUint32(0)); + Assert.Equal(204u, message.GetRepeatedUint64(0)); + Assert.Equal(205, message.GetRepeatedSint32(0)); + Assert.Equal(206, message.GetRepeatedSint64(0)); + Assert.Equal(207u, message.GetRepeatedFixed32(0)); + Assert.Equal(208u, message.GetRepeatedFixed64(0)); + Assert.Equal(209, message.GetRepeatedSfixed32(0)); + Assert.Equal(210, message.GetRepeatedSfixed64(0)); + Assert.Equal(211, message.GetRepeatedFloat(0)); + Assert.Equal(212, message.GetRepeatedDouble(0)); + Assert.Equal(true, message.GetRepeatedBool(0)); + Assert.Equal("215", message.GetRepeatedString(0)); + Assert.Equal(ToBytes("216"), message.GetRepeatedBytes(0)); + + Assert.Equal(217, message.GetRepeatedGroup(0).A); + Assert.Equal(218, message.GetRepeatedNestedMessage(0).Bb); + Assert.Equal(219, message.GetRepeatedForeignMessage(0).C); + Assert.Equal(220, message.GetRepeatedImportMessage(0).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); + Assert.Equal(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); + + Assert.Equal("224", message.GetRepeatedStringPiece(0)); + Assert.Equal("225", message.GetRepeatedCord(0)); + + Assert.Equal(301, message.GetRepeatedInt32(1)); + Assert.Equal(302, message.GetRepeatedInt64(1)); + Assert.Equal(303u, message.GetRepeatedUint32(1)); + Assert.Equal(304u, message.GetRepeatedUint64(1)); + Assert.Equal(305, message.GetRepeatedSint32(1)); + Assert.Equal(306, message.GetRepeatedSint64(1)); + Assert.Equal(307u, message.GetRepeatedFixed32(1)); + Assert.Equal(308u, message.GetRepeatedFixed64(1)); + Assert.Equal(309, message.GetRepeatedSfixed32(1)); + Assert.Equal(310, message.GetRepeatedSfixed64(1)); + Assert.Equal(311f, message.GetRepeatedFloat(1)); + Assert.Equal(312d, message.GetRepeatedDouble(1)); + Assert.Equal(false, message.GetRepeatedBool(1)); + Assert.Equal("315", message.GetRepeatedString(1)); + Assert.Equal(ToBytes("316"), message.GetRepeatedBytes(1)); + + Assert.Equal(317, message.GetRepeatedGroup(1).A); + Assert.Equal(318, message.GetRepeatedNestedMessage(1).Bb); + Assert.Equal(319, message.GetRepeatedForeignMessage(1).C); + Assert.Equal(320, message.GetRepeatedImportMessage(1).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.GetRepeatedNestedEnum(1)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetRepeatedForeignEnum(1)); + Assert.Equal(ImportEnum.IMPORT_BAZ, message.GetRepeatedImportEnum(1)); + + Assert.Equal("324", message.GetRepeatedStringPiece(1)); + Assert.Equal("325", message.GetRepeatedCord(1)); // ----------------------------------------------------------------- - Assert.IsTrue(message.HasDefaultInt32); - Assert.IsTrue(message.HasDefaultInt64); - Assert.IsTrue(message.HasDefaultUint32); - Assert.IsTrue(message.HasDefaultUint64); - Assert.IsTrue(message.HasDefaultSint32); - Assert.IsTrue(message.HasDefaultSint64); - Assert.IsTrue(message.HasDefaultFixed32); - Assert.IsTrue(message.HasDefaultFixed64); - Assert.IsTrue(message.HasDefaultSfixed32); - Assert.IsTrue(message.HasDefaultSfixed64); - Assert.IsTrue(message.HasDefaultFloat); - Assert.IsTrue(message.HasDefaultDouble); - Assert.IsTrue(message.HasDefaultBool); - Assert.IsTrue(message.HasDefaultString); - Assert.IsTrue(message.HasDefaultBytes); - - Assert.IsTrue(message.HasDefaultNestedEnum); - Assert.IsTrue(message.HasDefaultForeignEnum); - Assert.IsTrue(message.HasDefaultImportEnum); - - Assert.IsTrue(message.HasDefaultStringPiece); - Assert.IsTrue(message.HasDefaultCord); - - Assert.AreEqual(401, message.DefaultInt32); - Assert.AreEqual(402, message.DefaultInt64); - Assert.AreEqual(403u, message.DefaultUint32); - Assert.AreEqual(404u, message.DefaultUint64); - Assert.AreEqual(405, message.DefaultSint32); - Assert.AreEqual(406, message.DefaultSint64); - Assert.AreEqual(407u, message.DefaultFixed32); - Assert.AreEqual(408u, message.DefaultFixed64); - Assert.AreEqual(409, message.DefaultSfixed32); - Assert.AreEqual(410, message.DefaultSfixed64); - Assert.AreEqual(411, message.DefaultFloat); - Assert.AreEqual(412, message.DefaultDouble); - Assert.AreEqual(false, message.DefaultBool); - Assert.AreEqual("415", message.DefaultString); - Assert.AreEqual(ToBytes("416"), message.DefaultBytes); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.DefaultNestedEnum); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.DefaultForeignEnum); - Assert.AreEqual(ImportEnum.IMPORT_FOO, message.DefaultImportEnum); - - Assert.AreEqual("424", message.DefaultStringPiece); - Assert.AreEqual("425", message.DefaultCord); + Assert.True(message.HasDefaultInt32); + Assert.True(message.HasDefaultInt64); + Assert.True(message.HasDefaultUint32); + Assert.True(message.HasDefaultUint64); + Assert.True(message.HasDefaultSint32); + Assert.True(message.HasDefaultSint64); + Assert.True(message.HasDefaultFixed32); + Assert.True(message.HasDefaultFixed64); + Assert.True(message.HasDefaultSfixed32); + Assert.True(message.HasDefaultSfixed64); + Assert.True(message.HasDefaultFloat); + Assert.True(message.HasDefaultDouble); + Assert.True(message.HasDefaultBool); + Assert.True(message.HasDefaultString); + Assert.True(message.HasDefaultBytes); + + Assert.True(message.HasDefaultNestedEnum); + Assert.True(message.HasDefaultForeignEnum); + Assert.True(message.HasDefaultImportEnum); + + Assert.True(message.HasDefaultStringPiece); + Assert.True(message.HasDefaultCord); + + Assert.Equal(401, message.DefaultInt32); + Assert.Equal(402, message.DefaultInt64); + Assert.Equal(403u, message.DefaultUint32); + Assert.Equal(404u, message.DefaultUint64); + Assert.Equal(405, message.DefaultSint32); + Assert.Equal(406, message.DefaultSint64); + Assert.Equal(407u, message.DefaultFixed32); + Assert.Equal(408u, message.DefaultFixed64); + Assert.Equal(409, message.DefaultSfixed32); + Assert.Equal(410, message.DefaultSfixed64); + Assert.Equal(411, message.DefaultFloat); + Assert.Equal(412, message.DefaultDouble); + Assert.Equal(false, message.DefaultBool); + Assert.Equal("415", message.DefaultString); + Assert.Equal(ToBytes("416"), message.DefaultBytes); + + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.DefaultNestedEnum); + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.DefaultForeignEnum); + Assert.Equal(ImportEnum.IMPORT_FOO, message.DefaultImportEnum); + + Assert.Equal("424", message.DefaultStringPiece); + Assert.Equal("425", message.DefaultCord); } internal static void AssertClear(TestAllTypes message) { // HasBlah() should initially be false for all optional fields. - Assert.IsFalse(message.HasOptionalInt32); - Assert.IsFalse(message.HasOptionalInt64); - Assert.IsFalse(message.HasOptionalUint32); - Assert.IsFalse(message.HasOptionalUint64); - Assert.IsFalse(message.HasOptionalSint32); - Assert.IsFalse(message.HasOptionalSint64); - Assert.IsFalse(message.HasOptionalFixed32); - Assert.IsFalse(message.HasOptionalFixed64); - Assert.IsFalse(message.HasOptionalSfixed32); - Assert.IsFalse(message.HasOptionalSfixed64); - Assert.IsFalse(message.HasOptionalFloat); - Assert.IsFalse(message.HasOptionalDouble); - Assert.IsFalse(message.HasOptionalBool); - Assert.IsFalse(message.HasOptionalString); - Assert.IsFalse(message.HasOptionalBytes); - - Assert.IsFalse(message.HasOptionalGroup); - Assert.IsFalse(message.HasOptionalNestedMessage); - Assert.IsFalse(message.HasOptionalForeignMessage); - Assert.IsFalse(message.HasOptionalImportMessage); - - Assert.IsFalse(message.HasOptionalNestedEnum); - Assert.IsFalse(message.HasOptionalForeignEnum); - Assert.IsFalse(message.HasOptionalImportEnum); - - Assert.IsFalse(message.HasOptionalStringPiece); - Assert.IsFalse(message.HasOptionalCord); + Assert.False(message.HasOptionalInt32); + Assert.False(message.HasOptionalInt64); + Assert.False(message.HasOptionalUint32); + Assert.False(message.HasOptionalUint64); + Assert.False(message.HasOptionalSint32); + Assert.False(message.HasOptionalSint64); + Assert.False(message.HasOptionalFixed32); + Assert.False(message.HasOptionalFixed64); + Assert.False(message.HasOptionalSfixed32); + Assert.False(message.HasOptionalSfixed64); + Assert.False(message.HasOptionalFloat); + Assert.False(message.HasOptionalDouble); + Assert.False(message.HasOptionalBool); + Assert.False(message.HasOptionalString); + Assert.False(message.HasOptionalBytes); + + Assert.False(message.HasOptionalGroup); + Assert.False(message.HasOptionalNestedMessage); + Assert.False(message.HasOptionalForeignMessage); + Assert.False(message.HasOptionalImportMessage); + + Assert.False(message.HasOptionalNestedEnum); + Assert.False(message.HasOptionalForeignEnum); + Assert.False(message.HasOptionalImportEnum); + + Assert.False(message.HasOptionalStringPiece); + Assert.False(message.HasOptionalCord); // Optional fields without defaults are set to zero or something like it. - Assert.AreEqual(0, message.OptionalInt32); - Assert.AreEqual(0, message.OptionalInt64); - Assert.AreEqual(0u, message.OptionalUint32); - Assert.AreEqual(0u, message.OptionalUint64); - Assert.AreEqual(0, message.OptionalSint32); - Assert.AreEqual(0, message.OptionalSint64); - Assert.AreEqual(0u, message.OptionalFixed32); - Assert.AreEqual(0u, message.OptionalFixed64); - Assert.AreEqual(0, message.OptionalSfixed32); - Assert.AreEqual(0, message.OptionalSfixed64); - Assert.AreEqual(0, message.OptionalFloat); - Assert.AreEqual(0, message.OptionalDouble); - Assert.AreEqual(false, message.OptionalBool); - Assert.AreEqual("", message.OptionalString); - Assert.AreEqual(ByteString.Empty, message.OptionalBytes); + Assert.Equal(0, message.OptionalInt32); + Assert.Equal(0, message.OptionalInt64); + Assert.Equal(0u, message.OptionalUint32); + Assert.Equal(0u, message.OptionalUint64); + Assert.Equal(0, message.OptionalSint32); + Assert.Equal(0, message.OptionalSint64); + Assert.Equal(0u, message.OptionalFixed32); + Assert.Equal(0u, message.OptionalFixed64); + Assert.Equal(0, message.OptionalSfixed32); + Assert.Equal(0, message.OptionalSfixed64); + Assert.Equal(0, message.OptionalFloat); + Assert.Equal(0, message.OptionalDouble); + Assert.Equal(false, message.OptionalBool); + Assert.Equal("", message.OptionalString); + Assert.Equal(ByteString.Empty, message.OptionalBytes); // Embedded messages should also be clear. - Assert.IsFalse(message.OptionalGroup.HasA); - Assert.IsFalse(message.OptionalNestedMessage.HasBb); - Assert.IsFalse(message.OptionalForeignMessage.HasC); - Assert.IsFalse(message.OptionalImportMessage.HasD); + Assert.False(message.OptionalGroup.HasA); + Assert.False(message.OptionalNestedMessage.HasBb); + Assert.False(message.OptionalForeignMessage.HasC); + Assert.False(message.OptionalImportMessage.HasD); - Assert.AreEqual(0, message.OptionalGroup.A); - Assert.AreEqual(0, message.OptionalNestedMessage.Bb); - Assert.AreEqual(0, message.OptionalForeignMessage.C); - Assert.AreEqual(0, message.OptionalImportMessage.D); + Assert.Equal(0, message.OptionalGroup.A); + Assert.Equal(0, message.OptionalNestedMessage.Bb); + Assert.Equal(0, message.OptionalForeignMessage.C); + Assert.Equal(0, message.OptionalImportMessage.D); // Enums without defaults are set to the first value in the enum. - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.OptionalForeignEnum); - Assert.AreEqual(ImportEnum.IMPORT_FOO, message.OptionalImportEnum); + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.OptionalForeignEnum); + Assert.Equal(ImportEnum.IMPORT_FOO, message.OptionalImportEnum); - Assert.AreEqual("", message.OptionalStringPiece); - Assert.AreEqual("", message.OptionalCord); + Assert.Equal("", message.OptionalStringPiece); + Assert.Equal("", message.OptionalCord); // Repeated fields are empty. - Assert.AreEqual(0, message.RepeatedInt32Count); - Assert.AreEqual(0, message.RepeatedInt64Count); - Assert.AreEqual(0, message.RepeatedUint32Count); - Assert.AreEqual(0, message.RepeatedUint64Count); - Assert.AreEqual(0, message.RepeatedSint32Count); - Assert.AreEqual(0, message.RepeatedSint64Count); - Assert.AreEqual(0, message.RepeatedFixed32Count); - Assert.AreEqual(0, message.RepeatedFixed64Count); - Assert.AreEqual(0, message.RepeatedSfixed32Count); - Assert.AreEqual(0, message.RepeatedSfixed64Count); - Assert.AreEqual(0, message.RepeatedFloatCount); - Assert.AreEqual(0, message.RepeatedDoubleCount); - Assert.AreEqual(0, message.RepeatedBoolCount); - Assert.AreEqual(0, message.RepeatedStringCount); - Assert.AreEqual(0, message.RepeatedBytesCount); - - Assert.AreEqual(0, message.RepeatedGroupCount); - Assert.AreEqual(0, message.RepeatedNestedMessageCount); - Assert.AreEqual(0, message.RepeatedForeignMessageCount); - Assert.AreEqual(0, message.RepeatedImportMessageCount); - Assert.AreEqual(0, message.RepeatedNestedEnumCount); - Assert.AreEqual(0, message.RepeatedForeignEnumCount); - Assert.AreEqual(0, message.RepeatedImportEnumCount); - - Assert.AreEqual(0, message.RepeatedStringPieceCount); - Assert.AreEqual(0, message.RepeatedCordCount); + Assert.Equal(0, message.RepeatedInt32Count); + Assert.Equal(0, message.RepeatedInt64Count); + Assert.Equal(0, message.RepeatedUint32Count); + Assert.Equal(0, message.RepeatedUint64Count); + Assert.Equal(0, message.RepeatedSint32Count); + Assert.Equal(0, message.RepeatedSint64Count); + Assert.Equal(0, message.RepeatedFixed32Count); + Assert.Equal(0, message.RepeatedFixed64Count); + Assert.Equal(0, message.RepeatedSfixed32Count); + Assert.Equal(0, message.RepeatedSfixed64Count); + Assert.Equal(0, message.RepeatedFloatCount); + Assert.Equal(0, message.RepeatedDoubleCount); + Assert.Equal(0, message.RepeatedBoolCount); + Assert.Equal(0, message.RepeatedStringCount); + Assert.Equal(0, message.RepeatedBytesCount); + + Assert.Equal(0, message.RepeatedGroupCount); + Assert.Equal(0, message.RepeatedNestedMessageCount); + Assert.Equal(0, message.RepeatedForeignMessageCount); + Assert.Equal(0, message.RepeatedImportMessageCount); + Assert.Equal(0, message.RepeatedNestedEnumCount); + Assert.Equal(0, message.RepeatedForeignEnumCount); + Assert.Equal(0, message.RepeatedImportEnumCount); + + Assert.Equal(0, message.RepeatedStringPieceCount); + Assert.Equal(0, message.RepeatedCordCount); // HasBlah() should also be false for all default fields. - Assert.IsFalse(message.HasDefaultInt32); - Assert.IsFalse(message.HasDefaultInt64); - Assert.IsFalse(message.HasDefaultUint32); - Assert.IsFalse(message.HasDefaultUint64); - Assert.IsFalse(message.HasDefaultSint32); - Assert.IsFalse(message.HasDefaultSint64); - Assert.IsFalse(message.HasDefaultFixed32); - Assert.IsFalse(message.HasDefaultFixed64); - Assert.IsFalse(message.HasDefaultSfixed32); - Assert.IsFalse(message.HasDefaultSfixed64); - Assert.IsFalse(message.HasDefaultFloat); - Assert.IsFalse(message.HasDefaultDouble); - Assert.IsFalse(message.HasDefaultBool); - Assert.IsFalse(message.HasDefaultString); - Assert.IsFalse(message.HasDefaultBytes); - - Assert.IsFalse(message.HasDefaultNestedEnum); - Assert.IsFalse(message.HasDefaultForeignEnum); - Assert.IsFalse(message.HasDefaultImportEnum); - - Assert.IsFalse(message.HasDefaultStringPiece); - Assert.IsFalse(message.HasDefaultCord); + Assert.False(message.HasDefaultInt32); + Assert.False(message.HasDefaultInt64); + Assert.False(message.HasDefaultUint32); + Assert.False(message.HasDefaultUint64); + Assert.False(message.HasDefaultSint32); + Assert.False(message.HasDefaultSint64); + Assert.False(message.HasDefaultFixed32); + Assert.False(message.HasDefaultFixed64); + Assert.False(message.HasDefaultSfixed32); + Assert.False(message.HasDefaultSfixed64); + Assert.False(message.HasDefaultFloat); + Assert.False(message.HasDefaultDouble); + Assert.False(message.HasDefaultBool); + Assert.False(message.HasDefaultString); + Assert.False(message.HasDefaultBytes); + + Assert.False(message.HasDefaultNestedEnum); + Assert.False(message.HasDefaultForeignEnum); + Assert.False(message.HasDefaultImportEnum); + + Assert.False(message.HasDefaultStringPiece); + Assert.False(message.HasDefaultCord); // Fields with defaults have their default values (duh). - Assert.AreEqual(41, message.DefaultInt32); - Assert.AreEqual(42, message.DefaultInt64); - Assert.AreEqual(43u, message.DefaultUint32); - Assert.AreEqual(44u, message.DefaultUint64); - Assert.AreEqual(-45, message.DefaultSint32); - Assert.AreEqual(46, message.DefaultSint64); - Assert.AreEqual(47u, message.DefaultFixed32); - Assert.AreEqual(48u, message.DefaultFixed64); - Assert.AreEqual(49, message.DefaultSfixed32); - Assert.AreEqual(-50, message.DefaultSfixed64); - Assert.AreEqual(51.5, message.DefaultFloat, 0.0); - Assert.AreEqual(52e3, message.DefaultDouble, 0.0); - Assert.AreEqual(true, message.DefaultBool); - Assert.AreEqual("hello", message.DefaultString); - Assert.AreEqual(ToBytes("world"), message.DefaultBytes); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.DefaultNestedEnum); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.DefaultForeignEnum); - Assert.AreEqual(ImportEnum.IMPORT_BAR, message.DefaultImportEnum); - - Assert.AreEqual("abc", message.DefaultStringPiece); - Assert.AreEqual("123", message.DefaultCord); + Assert.Equal(41, message.DefaultInt32); + Assert.Equal(42, message.DefaultInt64); + Assert.Equal(43u, message.DefaultUint32); + Assert.Equal(44u, message.DefaultUint64); + Assert.Equal(-45, message.DefaultSint32); + Assert.Equal(46, message.DefaultSint64); + Assert.Equal(47u, message.DefaultFixed32); + Assert.Equal(48u, message.DefaultFixed64); + Assert.Equal(49, message.DefaultSfixed32); + Assert.Equal(-50, message.DefaultSfixed64); + Assert.Equal(51.5f, message.DefaultFloat); + Assert.Equal(52e3d, message.DefaultDouble); + Assert.Equal(true, message.DefaultBool); + Assert.Equal("hello", message.DefaultString); + Assert.Equal(ToBytes("world"), message.DefaultBytes); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.DefaultNestedEnum); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.DefaultForeignEnum); + Assert.Equal(ImportEnum.IMPORT_BAR, message.DefaultImportEnum); + + Assert.Equal("abc", message.DefaultStringPiece); + Assert.Equal("123", message.DefaultCord); } /// @@ -855,89 +855,89 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.AreEqual(2, message.RepeatedInt32Count); - Assert.AreEqual(2, message.RepeatedInt64Count); - Assert.AreEqual(2, message.RepeatedUint32Count); - Assert.AreEqual(2, message.RepeatedUint64Count); - Assert.AreEqual(2, message.RepeatedSint32Count); - Assert.AreEqual(2, message.RepeatedSint64Count); - Assert.AreEqual(2, message.RepeatedFixed32Count); - Assert.AreEqual(2, message.RepeatedFixed64Count); - Assert.AreEqual(2, message.RepeatedSfixed32Count); - Assert.AreEqual(2, message.RepeatedSfixed64Count); - Assert.AreEqual(2, message.RepeatedFloatCount); - Assert.AreEqual(2, message.RepeatedDoubleCount); - Assert.AreEqual(2, message.RepeatedBoolCount); - Assert.AreEqual(2, message.RepeatedStringCount); - Assert.AreEqual(2, message.RepeatedBytesCount); - - Assert.AreEqual(2, message.RepeatedGroupCount); - Assert.AreEqual(2, message.RepeatedNestedMessageCount); - Assert.AreEqual(2, message.RepeatedForeignMessageCount); - Assert.AreEqual(2, message.RepeatedImportMessageCount); - Assert.AreEqual(2, message.RepeatedNestedEnumCount); - Assert.AreEqual(2, message.RepeatedForeignEnumCount); - Assert.AreEqual(2, message.RepeatedImportEnumCount); - - Assert.AreEqual(2, message.RepeatedStringPieceCount); - Assert.AreEqual(2, message.RepeatedCordCount); - - Assert.AreEqual(201, message.GetRepeatedInt32(0)); - Assert.AreEqual(202L, message.GetRepeatedInt64(0)); - Assert.AreEqual(203U, message.GetRepeatedUint32(0)); - Assert.AreEqual(204UL, message.GetRepeatedUint64(0)); - Assert.AreEqual(205, message.GetRepeatedSint32(0)); - Assert.AreEqual(206L, message.GetRepeatedSint64(0)); - Assert.AreEqual(207U, message.GetRepeatedFixed32(0)); - Assert.AreEqual(208UL, message.GetRepeatedFixed64(0)); - Assert.AreEqual(209, message.GetRepeatedSfixed32(0)); - Assert.AreEqual(210L, message.GetRepeatedSfixed64(0)); - Assert.AreEqual(211F, message.GetRepeatedFloat(0)); - Assert.AreEqual(212D, message.GetRepeatedDouble(0)); - Assert.AreEqual(true, message.GetRepeatedBool(0)); - Assert.AreEqual("215", message.GetRepeatedString(0)); - Assert.AreEqual(ToBytes("216"), message.GetRepeatedBytes(0)); - - Assert.AreEqual(217, message.GetRepeatedGroup(0).A); - Assert.AreEqual(218, message.GetRepeatedNestedMessage(0).Bb); - Assert.AreEqual(219, message.GetRepeatedForeignMessage(0).C); - Assert.AreEqual(220, message.GetRepeatedImportMessage(0).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); - Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); - - Assert.AreEqual("224", message.GetRepeatedStringPiece(0)); - Assert.AreEqual("225", message.GetRepeatedCord(0)); + Assert.Equal(2, message.RepeatedInt32Count); + Assert.Equal(2, message.RepeatedInt64Count); + Assert.Equal(2, message.RepeatedUint32Count); + Assert.Equal(2, message.RepeatedUint64Count); + Assert.Equal(2, message.RepeatedSint32Count); + Assert.Equal(2, message.RepeatedSint64Count); + Assert.Equal(2, message.RepeatedFixed32Count); + Assert.Equal(2, message.RepeatedFixed64Count); + Assert.Equal(2, message.RepeatedSfixed32Count); + Assert.Equal(2, message.RepeatedSfixed64Count); + Assert.Equal(2, message.RepeatedFloatCount); + Assert.Equal(2, message.RepeatedDoubleCount); + Assert.Equal(2, message.RepeatedBoolCount); + Assert.Equal(2, message.RepeatedStringCount); + Assert.Equal(2, message.RepeatedBytesCount); + + Assert.Equal(2, message.RepeatedGroupCount); + Assert.Equal(2, message.RepeatedNestedMessageCount); + Assert.Equal(2, message.RepeatedForeignMessageCount); + Assert.Equal(2, message.RepeatedImportMessageCount); + Assert.Equal(2, message.RepeatedNestedEnumCount); + Assert.Equal(2, message.RepeatedForeignEnumCount); + Assert.Equal(2, message.RepeatedImportEnumCount); + + Assert.Equal(2, message.RepeatedStringPieceCount); + Assert.Equal(2, message.RepeatedCordCount); + + Assert.Equal(201, message.GetRepeatedInt32(0)); + Assert.Equal(202L, message.GetRepeatedInt64(0)); + Assert.Equal(203U, message.GetRepeatedUint32(0)); + Assert.Equal(204UL, message.GetRepeatedUint64(0)); + Assert.Equal(205, message.GetRepeatedSint32(0)); + Assert.Equal(206L, message.GetRepeatedSint64(0)); + Assert.Equal(207U, message.GetRepeatedFixed32(0)); + Assert.Equal(208UL, message.GetRepeatedFixed64(0)); + Assert.Equal(209, message.GetRepeatedSfixed32(0)); + Assert.Equal(210L, message.GetRepeatedSfixed64(0)); + Assert.Equal(211F, message.GetRepeatedFloat(0)); + Assert.Equal(212D, message.GetRepeatedDouble(0)); + Assert.Equal(true, message.GetRepeatedBool(0)); + Assert.Equal("215", message.GetRepeatedString(0)); + Assert.Equal(ToBytes("216"), message.GetRepeatedBytes(0)); + + Assert.Equal(217, message.GetRepeatedGroup(0).A); + Assert.Equal(218, message.GetRepeatedNestedMessage(0).Bb); + Assert.Equal(219, message.GetRepeatedForeignMessage(0).C); + Assert.Equal(220, message.GetRepeatedImportMessage(0).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); + Assert.Equal(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); + + Assert.Equal("224", message.GetRepeatedStringPiece(0)); + Assert.Equal("225", message.GetRepeatedCord(0)); // Actually verify the second (modified) elements now. - Assert.AreEqual(501, message.GetRepeatedInt32(1)); - Assert.AreEqual(502L, message.GetRepeatedInt64(1)); - Assert.AreEqual(503U, message.GetRepeatedUint32(1)); - Assert.AreEqual(504UL, message.GetRepeatedUint64(1)); - Assert.AreEqual(505, message.GetRepeatedSint32(1)); - Assert.AreEqual(506L, message.GetRepeatedSint64(1)); - Assert.AreEqual(507U, message.GetRepeatedFixed32(1)); - Assert.AreEqual(508UL, message.GetRepeatedFixed64(1)); - Assert.AreEqual(509, message.GetRepeatedSfixed32(1)); - Assert.AreEqual(510L, message.GetRepeatedSfixed64(1)); - Assert.AreEqual(511F, message.GetRepeatedFloat(1)); - Assert.AreEqual(512D, message.GetRepeatedDouble(1)); - Assert.AreEqual(true, message.GetRepeatedBool(1)); - Assert.AreEqual("515", message.GetRepeatedString(1)); - Assert.AreEqual(ToBytes("516"), message.GetRepeatedBytes(1)); - - Assert.AreEqual(517, message.GetRepeatedGroup(1).A); - Assert.AreEqual(518, message.GetRepeatedNestedMessage(1).Bb); - Assert.AreEqual(519, message.GetRepeatedForeignMessage(1).C); - Assert.AreEqual(520, message.GetRepeatedImportMessage(1).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.GetRepeatedNestedEnum(1)); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetRepeatedForeignEnum(1)); - Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetRepeatedImportEnum(1)); - - Assert.AreEqual("524", message.GetRepeatedStringPiece(1)); - Assert.AreEqual("525", message.GetRepeatedCord(1)); + Assert.Equal(501, message.GetRepeatedInt32(1)); + Assert.Equal(502L, message.GetRepeatedInt64(1)); + Assert.Equal(503U, message.GetRepeatedUint32(1)); + Assert.Equal(504UL, message.GetRepeatedUint64(1)); + Assert.Equal(505, message.GetRepeatedSint32(1)); + Assert.Equal(506L, message.GetRepeatedSint64(1)); + Assert.Equal(507U, message.GetRepeatedFixed32(1)); + Assert.Equal(508UL, message.GetRepeatedFixed64(1)); + Assert.Equal(509, message.GetRepeatedSfixed32(1)); + Assert.Equal(510L, message.GetRepeatedSfixed64(1)); + Assert.Equal(511F, message.GetRepeatedFloat(1)); + Assert.Equal(512D, message.GetRepeatedDouble(1)); + Assert.Equal(true, message.GetRepeatedBool(1)); + Assert.Equal("515", message.GetRepeatedString(1)); + Assert.Equal(ToBytes("516"), message.GetRepeatedBytes(1)); + + Assert.Equal(517, message.GetRepeatedGroup(1).A); + Assert.Equal(518, message.GetRepeatedNestedMessage(1).Bb); + Assert.Equal(519, message.GetRepeatedForeignMessage(1).C); + Assert.Equal(520, message.GetRepeatedImportMessage(1).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.GetRepeatedNestedEnum(1)); + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetRepeatedForeignEnum(1)); + Assert.Equal(ImportEnum.IMPORT_FOO, message.GetRepeatedImportEnum(1)); + + Assert.Equal("524", message.GetRepeatedStringPiece(1)); + Assert.Equal("525", message.GetRepeatedCord(1)); } /// @@ -949,222 +949,222 @@ namespace Google.ProtocolBuffers { foreach (T secondElement in second) { - Assert.IsTrue(firstEnumerator.MoveNext(), "First enumerator ran out of elements too early."); - Assert.AreEqual(firstEnumerator.Current, secondElement); + Assert.True(firstEnumerator.MoveNext(), "First enumerator ran out of elements too early."); + Assert.Equal(firstEnumerator.Current, secondElement); } - Assert.IsFalse(firstEnumerator.MoveNext(), "Second enumerator ran out of elements too early."); + Assert.False(firstEnumerator.MoveNext(), "Second enumerator ran out of elements too early."); } } internal static void AssertEqualBytes(byte[] expected, byte[] actual) { - Assert.AreEqual(ByteString.CopyFrom(expected), ByteString.CopyFrom(actual)); + Assert.Equal(ByteString.CopyFrom(expected), ByteString.CopyFrom(actual)); } internal static void AssertAllExtensionsSet(TestAllExtensions message) { - Assert.IsTrue(message.HasExtension(Unittest.OptionalInt32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalInt64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalUint32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalUint64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalSint32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalSint64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalFixed32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalFixed64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalSfixed32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalSfixed64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalFloatExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalDoubleExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalBoolExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalStringExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalBytesExtension)); - - Assert.IsTrue(message.HasExtension(Unittest.OptionalGroupExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalNestedMessageExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalForeignMessageExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalImportMessageExtension)); - - Assert.IsTrue(message.GetExtension(Unittest.OptionalGroupExtension).HasA); - Assert.IsTrue(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); - Assert.IsTrue(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); - Assert.IsTrue(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); - - Assert.IsTrue(message.HasExtension(Unittest.OptionalNestedEnumExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalForeignEnumExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalImportEnumExtension)); - - Assert.IsTrue(message.HasExtension(Unittest.OptionalStringPieceExtension)); - Assert.IsTrue(message.HasExtension(Unittest.OptionalCordExtension)); - - Assert.AreEqual(101, message.GetExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(102L, message.GetExtension(Unittest.OptionalInt64Extension)); - Assert.AreEqual(103U, message.GetExtension(Unittest.OptionalUint32Extension)); - Assert.AreEqual(104UL, message.GetExtension(Unittest.OptionalUint64Extension)); - Assert.AreEqual(105, message.GetExtension(Unittest.OptionalSint32Extension)); - Assert.AreEqual(106L, message.GetExtension(Unittest.OptionalSint64Extension)); - Assert.AreEqual(107U, message.GetExtension(Unittest.OptionalFixed32Extension)); - Assert.AreEqual(108UL, message.GetExtension(Unittest.OptionalFixed64Extension)); - Assert.AreEqual(109, message.GetExtension(Unittest.OptionalSfixed32Extension)); - Assert.AreEqual(110L, message.GetExtension(Unittest.OptionalSfixed64Extension)); - Assert.AreEqual(111F, message.GetExtension(Unittest.OptionalFloatExtension)); - Assert.AreEqual(112D, message.GetExtension(Unittest.OptionalDoubleExtension)); - Assert.AreEqual(true, message.GetExtension(Unittest.OptionalBoolExtension)); - Assert.AreEqual("115", message.GetExtension(Unittest.OptionalStringExtension)); - Assert.AreEqual(ToBytes("116"), message.GetExtension(Unittest.OptionalBytesExtension)); - - Assert.AreEqual(117, message.GetExtension(Unittest.OptionalGroupExtension).A); - Assert.AreEqual(118, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); - Assert.AreEqual(119, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); - Assert.AreEqual(120, message.GetExtension(Unittest.OptionalImportMessageExtension).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, + Assert.True(message.HasExtension(Unittest.OptionalInt32Extension)); + Assert.True(message.HasExtension(Unittest.OptionalInt64Extension)); + Assert.True(message.HasExtension(Unittest.OptionalUint32Extension)); + Assert.True(message.HasExtension(Unittest.OptionalUint64Extension)); + Assert.True(message.HasExtension(Unittest.OptionalSint32Extension)); + Assert.True(message.HasExtension(Unittest.OptionalSint64Extension)); + Assert.True(message.HasExtension(Unittest.OptionalFixed32Extension)); + Assert.True(message.HasExtension(Unittest.OptionalFixed64Extension)); + Assert.True(message.HasExtension(Unittest.OptionalSfixed32Extension)); + Assert.True(message.HasExtension(Unittest.OptionalSfixed64Extension)); + Assert.True(message.HasExtension(Unittest.OptionalFloatExtension)); + Assert.True(message.HasExtension(Unittest.OptionalDoubleExtension)); + Assert.True(message.HasExtension(Unittest.OptionalBoolExtension)); + Assert.True(message.HasExtension(Unittest.OptionalStringExtension)); + Assert.True(message.HasExtension(Unittest.OptionalBytesExtension)); + + Assert.True(message.HasExtension(Unittest.OptionalGroupExtension)); + Assert.True(message.HasExtension(Unittest.OptionalNestedMessageExtension)); + Assert.True(message.HasExtension(Unittest.OptionalForeignMessageExtension)); + Assert.True(message.HasExtension(Unittest.OptionalImportMessageExtension)); + + Assert.True(message.GetExtension(Unittest.OptionalGroupExtension).HasA); + Assert.True(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); + Assert.True(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); + Assert.True(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); + + Assert.True(message.HasExtension(Unittest.OptionalNestedEnumExtension)); + Assert.True(message.HasExtension(Unittest.OptionalForeignEnumExtension)); + Assert.True(message.HasExtension(Unittest.OptionalImportEnumExtension)); + + Assert.True(message.HasExtension(Unittest.OptionalStringPieceExtension)); + Assert.True(message.HasExtension(Unittest.OptionalCordExtension)); + + Assert.Equal(101, message.GetExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(102L, message.GetExtension(Unittest.OptionalInt64Extension)); + Assert.Equal(103U, message.GetExtension(Unittest.OptionalUint32Extension)); + Assert.Equal(104UL, message.GetExtension(Unittest.OptionalUint64Extension)); + Assert.Equal(105, message.GetExtension(Unittest.OptionalSint32Extension)); + Assert.Equal(106L, message.GetExtension(Unittest.OptionalSint64Extension)); + Assert.Equal(107U, message.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.Equal(108UL, message.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.Equal(109, message.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.Equal(110L, message.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.Equal(111F, message.GetExtension(Unittest.OptionalFloatExtension)); + Assert.Equal(112D, message.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.Equal(true, message.GetExtension(Unittest.OptionalBoolExtension)); + Assert.Equal("115", message.GetExtension(Unittest.OptionalStringExtension)); + Assert.Equal(ToBytes("116"), message.GetExtension(Unittest.OptionalBytesExtension)); + + Assert.Equal(117, message.GetExtension(Unittest.OptionalGroupExtension).A); + Assert.Equal(118, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); + Assert.Equal(119, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); + Assert.Equal(120, message.GetExtension(Unittest.OptionalImportMessageExtension).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.GetExtension(Unittest.OptionalNestedEnumExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.OptionalForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.OptionalImportEnumExtension)); - Assert.AreEqual("124", message.GetExtension(Unittest.OptionalStringPieceExtension)); - Assert.AreEqual("125", message.GetExtension(Unittest.OptionalCordExtension)); + Assert.Equal("124", message.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.Equal("125", message.GetExtension(Unittest.OptionalCordExtension)); // ----------------------------------------------------------------- - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); - - Assert.AreEqual(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); - Assert.AreEqual(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); - Assert.AreEqual(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); - Assert.AreEqual(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); - Assert.AreEqual(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); - Assert.AreEqual(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); - Assert.AreEqual(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); - Assert.AreEqual(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); - Assert.AreEqual(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); - Assert.AreEqual(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); - Assert.AreEqual(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); - Assert.AreEqual(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); - Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); - Assert.AreEqual("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); - Assert.AreEqual(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); - - Assert.AreEqual(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); - Assert.AreEqual(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); - Assert.AreEqual(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); - Assert.AreEqual(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + + Assert.Equal(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.Equal(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); + Assert.Equal(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.Equal(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); + Assert.Equal(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.Equal(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.Equal(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.Equal(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.Equal(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.Equal(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.Equal(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); + Assert.Equal(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); + Assert.Equal("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.Equal(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); + + Assert.Equal(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); + Assert.Equal(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); + Assert.Equal(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); + Assert.Equal(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); - Assert.AreEqual(ImportEnum.IMPORT_BAR, + Assert.Equal(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); - Assert.AreEqual("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); - Assert.AreEqual("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); - - Assert.AreEqual(301, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); - Assert.AreEqual(302L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); - Assert.AreEqual(303U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); - Assert.AreEqual(304UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); - Assert.AreEqual(305, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); - Assert.AreEqual(306L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); - Assert.AreEqual(307U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); - Assert.AreEqual(308UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); - Assert.AreEqual(309, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); - Assert.AreEqual(310L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); - Assert.AreEqual(311F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); - Assert.AreEqual(312D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); - Assert.AreEqual(false, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); - Assert.AreEqual("315", message.GetExtension(Unittest.RepeatedStringExtension, 1)); - Assert.AreEqual(ToBytes("316"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); - - Assert.AreEqual(317, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); - Assert.AreEqual(318, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); - Assert.AreEqual(319, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); - Assert.AreEqual(320, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, + Assert.Equal("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.Equal("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); + + Assert.Equal(301, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); + Assert.Equal(302L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); + Assert.Equal(303U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); + Assert.Equal(304UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); + Assert.Equal(305, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); + Assert.Equal(306L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); + Assert.Equal(307U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); + Assert.Equal(308UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); + Assert.Equal(309, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); + Assert.Equal(310L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); + Assert.Equal(311F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); + Assert.Equal(312D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); + Assert.Equal(false, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); + Assert.Equal("315", message.GetExtension(Unittest.RepeatedStringExtension, 1)); + Assert.Equal(ToBytes("316"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); + + Assert.Equal(317, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); + Assert.Equal(318, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); + Assert.Equal(319, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); + Assert.Equal(320, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 1)); - Assert.AreEqual(ImportEnum.IMPORT_BAZ, + Assert.Equal(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.RepeatedImportEnumExtension, 1)); - Assert.AreEqual("324", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); - Assert.AreEqual("325", message.GetExtension(Unittest.RepeatedCordExtension, 1)); + Assert.Equal("324", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); + Assert.Equal("325", message.GetExtension(Unittest.RepeatedCordExtension, 1)); // ----------------------------------------------------------------- - Assert.IsTrue(message.HasExtension(Unittest.DefaultInt32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultInt64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultUint32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultUint64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultSint32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultSint64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultFixed32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultFixed64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultSfixed32Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultSfixed64Extension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultFloatExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultDoubleExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultBoolExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultStringExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultBytesExtension)); - - Assert.IsTrue(message.HasExtension(Unittest.DefaultNestedEnumExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultForeignEnumExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultImportEnumExtension)); - - Assert.IsTrue(message.HasExtension(Unittest.DefaultStringPieceExtension)); - Assert.IsTrue(message.HasExtension(Unittest.DefaultCordExtension)); - - Assert.AreEqual(401, message.GetExtension(Unittest.DefaultInt32Extension)); - Assert.AreEqual(402L, message.GetExtension(Unittest.DefaultInt64Extension)); - Assert.AreEqual(403U, message.GetExtension(Unittest.DefaultUint32Extension)); - Assert.AreEqual(404UL, message.GetExtension(Unittest.DefaultUint64Extension)); - Assert.AreEqual(405, message.GetExtension(Unittest.DefaultSint32Extension)); - Assert.AreEqual(406L, message.GetExtension(Unittest.DefaultSint64Extension)); - Assert.AreEqual(407U, message.GetExtension(Unittest.DefaultFixed32Extension)); - Assert.AreEqual(408UL, message.GetExtension(Unittest.DefaultFixed64Extension)); - Assert.AreEqual(409, message.GetExtension(Unittest.DefaultSfixed32Extension)); - Assert.AreEqual(410L, message.GetExtension(Unittest.DefaultSfixed64Extension)); - Assert.AreEqual(411F, message.GetExtension(Unittest.DefaultFloatExtension)); - Assert.AreEqual(412D, message.GetExtension(Unittest.DefaultDoubleExtension)); - Assert.AreEqual(false, message.GetExtension(Unittest.DefaultBoolExtension)); - Assert.AreEqual("415", message.GetExtension(Unittest.DefaultStringExtension)); - Assert.AreEqual(ToBytes("416"), message.GetExtension(Unittest.DefaultBytesExtension)); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.True(message.HasExtension(Unittest.DefaultInt32Extension)); + Assert.True(message.HasExtension(Unittest.DefaultInt64Extension)); + Assert.True(message.HasExtension(Unittest.DefaultUint32Extension)); + Assert.True(message.HasExtension(Unittest.DefaultUint64Extension)); + Assert.True(message.HasExtension(Unittest.DefaultSint32Extension)); + Assert.True(message.HasExtension(Unittest.DefaultSint64Extension)); + Assert.True(message.HasExtension(Unittest.DefaultFixed32Extension)); + Assert.True(message.HasExtension(Unittest.DefaultFixed64Extension)); + Assert.True(message.HasExtension(Unittest.DefaultSfixed32Extension)); + Assert.True(message.HasExtension(Unittest.DefaultSfixed64Extension)); + Assert.True(message.HasExtension(Unittest.DefaultFloatExtension)); + Assert.True(message.HasExtension(Unittest.DefaultDoubleExtension)); + Assert.True(message.HasExtension(Unittest.DefaultBoolExtension)); + Assert.True(message.HasExtension(Unittest.DefaultStringExtension)); + Assert.True(message.HasExtension(Unittest.DefaultBytesExtension)); + + Assert.True(message.HasExtension(Unittest.DefaultNestedEnumExtension)); + Assert.True(message.HasExtension(Unittest.DefaultForeignEnumExtension)); + Assert.True(message.HasExtension(Unittest.DefaultImportEnumExtension)); + + Assert.True(message.HasExtension(Unittest.DefaultStringPieceExtension)); + Assert.True(message.HasExtension(Unittest.DefaultCordExtension)); + + Assert.Equal(401, message.GetExtension(Unittest.DefaultInt32Extension)); + Assert.Equal(402L, message.GetExtension(Unittest.DefaultInt64Extension)); + Assert.Equal(403U, message.GetExtension(Unittest.DefaultUint32Extension)); + Assert.Equal(404UL, message.GetExtension(Unittest.DefaultUint64Extension)); + Assert.Equal(405, message.GetExtension(Unittest.DefaultSint32Extension)); + Assert.Equal(406L, message.GetExtension(Unittest.DefaultSint64Extension)); + Assert.Equal(407U, message.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.Equal(408UL, message.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.Equal(409, message.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.Equal(410L, message.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.Equal(411F, message.GetExtension(Unittest.DefaultFloatExtension)); + Assert.Equal(412D, message.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.Equal(false, message.GetExtension(Unittest.DefaultBoolExtension)); + Assert.Equal("415", message.GetExtension(Unittest.DefaultStringExtension)); + Assert.Equal(ToBytes("416"), message.GetExtension(Unittest.DefaultBytesExtension)); + + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.DefaultNestedEnumExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.DefaultForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.DefaultImportEnumExtension)); - Assert.AreEqual("424", message.GetExtension(Unittest.DefaultStringPieceExtension)); - Assert.AreEqual("425", message.GetExtension(Unittest.DefaultCordExtension)); + Assert.Equal("424", message.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.Equal("425", message.GetExtension(Unittest.DefaultCordExtension)); } /// @@ -1215,242 +1215,242 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); - - Assert.AreEqual(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); - Assert.AreEqual(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); - Assert.AreEqual(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); - Assert.AreEqual(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); - Assert.AreEqual(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); - Assert.AreEqual(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); - Assert.AreEqual(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); - Assert.AreEqual(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); - Assert.AreEqual(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); - Assert.AreEqual(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); - Assert.AreEqual(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); - Assert.AreEqual(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); - Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); - Assert.AreEqual("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); - Assert.AreEqual(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); - - Assert.AreEqual(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); - Assert.AreEqual(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); - Assert.AreEqual(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); - Assert.AreEqual(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + + Assert.Equal(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.Equal(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); + Assert.Equal(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.Equal(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); + Assert.Equal(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.Equal(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.Equal(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.Equal(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.Equal(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.Equal(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.Equal(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); + Assert.Equal(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); + Assert.Equal("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.Equal(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); + + Assert.Equal(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); + Assert.Equal(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); + Assert.Equal(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); + Assert.Equal(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); - Assert.AreEqual(ImportEnum.IMPORT_BAR, + Assert.Equal(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); - Assert.AreEqual("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); - Assert.AreEqual("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); + Assert.Equal("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.Equal("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); // Actually verify the second (modified) elements now. - Assert.AreEqual(501, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); - Assert.AreEqual(502L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); - Assert.AreEqual(503U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); - Assert.AreEqual(504UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); - Assert.AreEqual(505, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); - Assert.AreEqual(506L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); - Assert.AreEqual(507U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); - Assert.AreEqual(508UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); - Assert.AreEqual(509, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); - Assert.AreEqual(510L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); - Assert.AreEqual(511F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); - Assert.AreEqual(512D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); - Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); - Assert.AreEqual("515", message.GetExtension(Unittest.RepeatedStringExtension, 1)); - Assert.AreEqual(ToBytes("516"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); - - Assert.AreEqual(517, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); - Assert.AreEqual(518, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); - Assert.AreEqual(519, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); - Assert.AreEqual(520, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.Equal(501, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); + Assert.Equal(502L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); + Assert.Equal(503U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); + Assert.Equal(504UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); + Assert.Equal(505, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); + Assert.Equal(506L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); + Assert.Equal(507U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); + Assert.Equal(508UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); + Assert.Equal(509, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); + Assert.Equal(510L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); + Assert.Equal(511F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); + Assert.Equal(512D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); + Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); + Assert.Equal("515", message.GetExtension(Unittest.RepeatedStringExtension, 1)); + Assert.Equal(ToBytes("516"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); + + Assert.Equal(517, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); + Assert.Equal(518, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); + Assert.Equal(519, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); + Assert.Equal(520, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); + + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 1)); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 1)); - Assert.AreEqual(ImportEnum.IMPORT_FOO, + Assert.Equal(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.RepeatedImportEnumExtension, 1)); - Assert.AreEqual("524", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); - Assert.AreEqual("525", message.GetExtension(Unittest.RepeatedCordExtension, 1)); + Assert.Equal("524", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); + Assert.Equal("525", message.GetExtension(Unittest.RepeatedCordExtension, 1)); } internal static void AssertExtensionsClear(TestAllExtensions message) { // HasBlah() should initially be false for all optional fields. - Assert.IsFalse(message.HasExtension(Unittest.OptionalInt32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalInt64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalUint32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalUint64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalSint32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalSint64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalFixed32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalFixed64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalSfixed32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalSfixed64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalFloatExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalDoubleExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalBoolExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalStringExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalBytesExtension)); - - Assert.IsFalse(message.HasExtension(Unittest.OptionalGroupExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalNestedMessageExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalForeignMessageExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalImportMessageExtension)); - - Assert.IsFalse(message.HasExtension(Unittest.OptionalNestedEnumExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalForeignEnumExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalImportEnumExtension)); - - Assert.IsFalse(message.HasExtension(Unittest.OptionalStringPieceExtension)); - Assert.IsFalse(message.HasExtension(Unittest.OptionalCordExtension)); + Assert.False(message.HasExtension(Unittest.OptionalInt32Extension)); + Assert.False(message.HasExtension(Unittest.OptionalInt64Extension)); + Assert.False(message.HasExtension(Unittest.OptionalUint32Extension)); + Assert.False(message.HasExtension(Unittest.OptionalUint64Extension)); + Assert.False(message.HasExtension(Unittest.OptionalSint32Extension)); + Assert.False(message.HasExtension(Unittest.OptionalSint64Extension)); + Assert.False(message.HasExtension(Unittest.OptionalFixed32Extension)); + Assert.False(message.HasExtension(Unittest.OptionalFixed64Extension)); + Assert.False(message.HasExtension(Unittest.OptionalSfixed32Extension)); + Assert.False(message.HasExtension(Unittest.OptionalSfixed64Extension)); + Assert.False(message.HasExtension(Unittest.OptionalFloatExtension)); + Assert.False(message.HasExtension(Unittest.OptionalDoubleExtension)); + Assert.False(message.HasExtension(Unittest.OptionalBoolExtension)); + Assert.False(message.HasExtension(Unittest.OptionalStringExtension)); + Assert.False(message.HasExtension(Unittest.OptionalBytesExtension)); + + Assert.False(message.HasExtension(Unittest.OptionalGroupExtension)); + Assert.False(message.HasExtension(Unittest.OptionalNestedMessageExtension)); + Assert.False(message.HasExtension(Unittest.OptionalForeignMessageExtension)); + Assert.False(message.HasExtension(Unittest.OptionalImportMessageExtension)); + + Assert.False(message.HasExtension(Unittest.OptionalNestedEnumExtension)); + Assert.False(message.HasExtension(Unittest.OptionalForeignEnumExtension)); + Assert.False(message.HasExtension(Unittest.OptionalImportEnumExtension)); + + Assert.False(message.HasExtension(Unittest.OptionalStringPieceExtension)); + Assert.False(message.HasExtension(Unittest.OptionalCordExtension)); // Optional fields without defaults are set to zero or something like it. - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalInt64Extension)); - Assert.AreEqual(0U, message.GetExtension(Unittest.OptionalUint32Extension)); - Assert.AreEqual(0UL, message.GetExtension(Unittest.OptionalUint64Extension)); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalSint32Extension)); - Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalSint64Extension)); - Assert.AreEqual(0U, message.GetExtension(Unittest.OptionalFixed32Extension)); - Assert.AreEqual(0UL, message.GetExtension(Unittest.OptionalFixed64Extension)); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalSfixed32Extension)); - Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalSfixed64Extension)); - Assert.AreEqual(0F, message.GetExtension(Unittest.OptionalFloatExtension)); - Assert.AreEqual(0D, message.GetExtension(Unittest.OptionalDoubleExtension)); - Assert.AreEqual(false, message.GetExtension(Unittest.OptionalBoolExtension)); - Assert.AreEqual("", message.GetExtension(Unittest.OptionalStringExtension)); - Assert.AreEqual(ByteString.Empty, message.GetExtension(Unittest.OptionalBytesExtension)); + Assert.Equal(0, message.GetExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(0L, message.GetExtension(Unittest.OptionalInt64Extension)); + Assert.Equal(0U, message.GetExtension(Unittest.OptionalUint32Extension)); + Assert.Equal(0UL, message.GetExtension(Unittest.OptionalUint64Extension)); + Assert.Equal(0, message.GetExtension(Unittest.OptionalSint32Extension)); + Assert.Equal(0L, message.GetExtension(Unittest.OptionalSint64Extension)); + Assert.Equal(0U, message.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.Equal(0UL, message.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.Equal(0, message.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.Equal(0L, message.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.Equal(0F, message.GetExtension(Unittest.OptionalFloatExtension)); + Assert.Equal(0D, message.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.Equal(false, message.GetExtension(Unittest.OptionalBoolExtension)); + Assert.Equal("", message.GetExtension(Unittest.OptionalStringExtension)); + Assert.Equal(ByteString.Empty, message.GetExtension(Unittest.OptionalBytesExtension)); // Embedded messages should also be clear. - Assert.IsFalse(message.GetExtension(Unittest.OptionalGroupExtension).HasA); - Assert.IsFalse(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); - Assert.IsFalse(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); - Assert.IsFalse(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); + Assert.False(message.GetExtension(Unittest.OptionalGroupExtension).HasA); + Assert.False(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); + Assert.False(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); + Assert.False(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalGroupExtension).A); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); - Assert.AreEqual(0, message.GetExtension(Unittest.OptionalImportMessageExtension).D); + Assert.Equal(0, message.GetExtension(Unittest.OptionalGroupExtension).A); + Assert.Equal(0, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); + Assert.Equal(0, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); + Assert.Equal(0, message.GetExtension(Unittest.OptionalImportMessageExtension).D); // Enums without defaults are set to the first value in the enum. - Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, + Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.OptionalNestedEnumExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_FOO, + Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.OptionalForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.OptionalImportEnumExtension)); - Assert.AreEqual("", message.GetExtension(Unittest.OptionalStringPieceExtension)); - Assert.AreEqual("", message.GetExtension(Unittest.OptionalCordExtension)); + Assert.Equal("", message.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.Equal("", message.GetExtension(Unittest.OptionalCordExtension)); // Repeated fields are empty. - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedCordExtension)); // HasBlah() should also be false for all default fields. - Assert.IsFalse(message.HasExtension(Unittest.DefaultInt32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultInt64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultUint32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultUint64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultSint32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultSint64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultFixed32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultFixed64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultSfixed32Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultSfixed64Extension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultFloatExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultDoubleExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultBoolExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultStringExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultBytesExtension)); - - Assert.IsFalse(message.HasExtension(Unittest.DefaultNestedEnumExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultForeignEnumExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultImportEnumExtension)); - - Assert.IsFalse(message.HasExtension(Unittest.DefaultStringPieceExtension)); - Assert.IsFalse(message.HasExtension(Unittest.DefaultCordExtension)); + Assert.False(message.HasExtension(Unittest.DefaultInt32Extension)); + Assert.False(message.HasExtension(Unittest.DefaultInt64Extension)); + Assert.False(message.HasExtension(Unittest.DefaultUint32Extension)); + Assert.False(message.HasExtension(Unittest.DefaultUint64Extension)); + Assert.False(message.HasExtension(Unittest.DefaultSint32Extension)); + Assert.False(message.HasExtension(Unittest.DefaultSint64Extension)); + Assert.False(message.HasExtension(Unittest.DefaultFixed32Extension)); + Assert.False(message.HasExtension(Unittest.DefaultFixed64Extension)); + Assert.False(message.HasExtension(Unittest.DefaultSfixed32Extension)); + Assert.False(message.HasExtension(Unittest.DefaultSfixed64Extension)); + Assert.False(message.HasExtension(Unittest.DefaultFloatExtension)); + Assert.False(message.HasExtension(Unittest.DefaultDoubleExtension)); + Assert.False(message.HasExtension(Unittest.DefaultBoolExtension)); + Assert.False(message.HasExtension(Unittest.DefaultStringExtension)); + Assert.False(message.HasExtension(Unittest.DefaultBytesExtension)); + + Assert.False(message.HasExtension(Unittest.DefaultNestedEnumExtension)); + Assert.False(message.HasExtension(Unittest.DefaultForeignEnumExtension)); + Assert.False(message.HasExtension(Unittest.DefaultImportEnumExtension)); + + Assert.False(message.HasExtension(Unittest.DefaultStringPieceExtension)); + Assert.False(message.HasExtension(Unittest.DefaultCordExtension)); // Fields with defaults have their default values (duh). - Assert.AreEqual(41, message.GetExtension(Unittest.DefaultInt32Extension)); - Assert.AreEqual(42L, message.GetExtension(Unittest.DefaultInt64Extension)); - Assert.AreEqual(43U, message.GetExtension(Unittest.DefaultUint32Extension)); - Assert.AreEqual(44UL, message.GetExtension(Unittest.DefaultUint64Extension)); - Assert.AreEqual(-45, message.GetExtension(Unittest.DefaultSint32Extension)); - Assert.AreEqual(46L, message.GetExtension(Unittest.DefaultSint64Extension)); - Assert.AreEqual(47U, message.GetExtension(Unittest.DefaultFixed32Extension)); - Assert.AreEqual(48UL, message.GetExtension(Unittest.DefaultFixed64Extension)); - Assert.AreEqual(49, message.GetExtension(Unittest.DefaultSfixed32Extension)); - Assert.AreEqual(-50L, message.GetExtension(Unittest.DefaultSfixed64Extension)); - Assert.AreEqual(51.5F, message.GetExtension(Unittest.DefaultFloatExtension)); - Assert.AreEqual(52e3D, message.GetExtension(Unittest.DefaultDoubleExtension)); - Assert.AreEqual(true, message.GetExtension(Unittest.DefaultBoolExtension)); - Assert.AreEqual("hello", message.GetExtension(Unittest.DefaultStringExtension)); - Assert.AreEqual(ToBytes("world"), message.GetExtension(Unittest.DefaultBytesExtension)); - - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, + Assert.Equal(41, message.GetExtension(Unittest.DefaultInt32Extension)); + Assert.Equal(42L, message.GetExtension(Unittest.DefaultInt64Extension)); + Assert.Equal(43U, message.GetExtension(Unittest.DefaultUint32Extension)); + Assert.Equal(44UL, message.GetExtension(Unittest.DefaultUint64Extension)); + Assert.Equal(-45, message.GetExtension(Unittest.DefaultSint32Extension)); + Assert.Equal(46L, message.GetExtension(Unittest.DefaultSint64Extension)); + Assert.Equal(47U, message.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.Equal(48UL, message.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.Equal(49, message.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.Equal(-50L, message.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.Equal(51.5F, message.GetExtension(Unittest.DefaultFloatExtension)); + Assert.Equal(52e3D, message.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.Equal(true, message.GetExtension(Unittest.DefaultBoolExtension)); + Assert.Equal("hello", message.GetExtension(Unittest.DefaultStringExtension)); + Assert.Equal(ToBytes("world"), message.GetExtension(Unittest.DefaultBytesExtension)); + + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.DefaultNestedEnumExtension)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.DefaultForeignEnumExtension)); - Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.Equal(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.DefaultImportEnumExtension)); - Assert.AreEqual("abc", message.GetExtension(Unittest.DefaultStringPieceExtension)); - Assert.AreEqual("123", message.GetExtension(Unittest.DefaultCordExtension)); + Assert.Equal("abc", message.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.Equal("123", message.GetExtension(Unittest.DefaultCordExtension)); } /// @@ -1495,48 +1495,48 @@ namespace Google.ProtocolBuffers /// public static void AssertPackedFieldsSet(TestPackedTypes message) { - Assert.AreEqual(2, message.PackedInt32Count); - Assert.AreEqual(2, message.PackedInt64Count); - Assert.AreEqual(2, message.PackedUint32Count); - Assert.AreEqual(2, message.PackedUint64Count); - Assert.AreEqual(2, message.PackedSint32Count); - Assert.AreEqual(2, message.PackedSint64Count); - Assert.AreEqual(2, message.PackedFixed32Count); - Assert.AreEqual(2, message.PackedFixed64Count); - Assert.AreEqual(2, message.PackedSfixed32Count); - Assert.AreEqual(2, message.PackedSfixed64Count); - Assert.AreEqual(2, message.PackedFloatCount); - Assert.AreEqual(2, message.PackedDoubleCount); - Assert.AreEqual(2, message.PackedBoolCount); - Assert.AreEqual(2, message.PackedEnumCount); - Assert.AreEqual(601, message.GetPackedInt32(0)); - Assert.AreEqual(602, message.GetPackedInt64(0)); - Assert.AreEqual(603u, message.GetPackedUint32(0)); - Assert.AreEqual(604u, message.GetPackedUint64(0)); - Assert.AreEqual(605, message.GetPackedSint32(0)); - Assert.AreEqual(606, message.GetPackedSint64(0)); - Assert.AreEqual(607u, message.GetPackedFixed32(0)); - Assert.AreEqual(608u, message.GetPackedFixed64(0)); - Assert.AreEqual(609, message.GetPackedSfixed32(0)); - Assert.AreEqual(610, message.GetPackedSfixed64(0)); - Assert.AreEqual(611, message.GetPackedFloat(0), 0.0); - Assert.AreEqual(612, message.GetPackedDouble(0), 0.0); - Assert.AreEqual(true, message.GetPackedBool(0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetPackedEnum(0)); - Assert.AreEqual(701, message.GetPackedInt32(1)); - Assert.AreEqual(702, message.GetPackedInt64(1)); - Assert.AreEqual(703u, message.GetPackedUint32(1)); - Assert.AreEqual(704u, message.GetPackedUint64(1)); - Assert.AreEqual(705, message.GetPackedSint32(1)); - Assert.AreEqual(706, message.GetPackedSint64(1)); - Assert.AreEqual(707u, message.GetPackedFixed32(1)); - Assert.AreEqual(708u, message.GetPackedFixed64(1)); - Assert.AreEqual(709, message.GetPackedSfixed32(1)); - Assert.AreEqual(710, message.GetPackedSfixed64(1)); - Assert.AreEqual(711, message.GetPackedFloat(1), 0.0); - Assert.AreEqual(712, message.GetPackedDouble(1), 0.0); - Assert.AreEqual(false, message.GetPackedBool(1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetPackedEnum(1)); + Assert.Equal(2, message.PackedInt32Count); + Assert.Equal(2, message.PackedInt64Count); + Assert.Equal(2, message.PackedUint32Count); + Assert.Equal(2, message.PackedUint64Count); + Assert.Equal(2, message.PackedSint32Count); + Assert.Equal(2, message.PackedSint64Count); + Assert.Equal(2, message.PackedFixed32Count); + Assert.Equal(2, message.PackedFixed64Count); + Assert.Equal(2, message.PackedSfixed32Count); + Assert.Equal(2, message.PackedSfixed64Count); + Assert.Equal(2, message.PackedFloatCount); + Assert.Equal(2, message.PackedDoubleCount); + Assert.Equal(2, message.PackedBoolCount); + Assert.Equal(2, message.PackedEnumCount); + Assert.Equal(601, message.GetPackedInt32(0)); + Assert.Equal(602, message.GetPackedInt64(0)); + Assert.Equal(603u, message.GetPackedUint32(0)); + Assert.Equal(604u, message.GetPackedUint64(0)); + Assert.Equal(605, message.GetPackedSint32(0)); + Assert.Equal(606, message.GetPackedSint64(0)); + Assert.Equal(607u, message.GetPackedFixed32(0)); + Assert.Equal(608u, message.GetPackedFixed64(0)); + Assert.Equal(609, message.GetPackedSfixed32(0)); + Assert.Equal(610, message.GetPackedSfixed64(0)); + Assert.Equal(611f, message.GetPackedFloat(0)); + Assert.Equal(612d, message.GetPackedDouble(0)); + Assert.Equal(true, message.GetPackedBool(0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetPackedEnum(0)); + Assert.Equal(701, message.GetPackedInt32(1)); + Assert.Equal(702, message.GetPackedInt64(1)); + Assert.Equal(703u, message.GetPackedUint32(1)); + Assert.Equal(704u, message.GetPackedUint64(1)); + Assert.Equal(705, message.GetPackedSint32(1)); + Assert.Equal(706, message.GetPackedSint64(1)); + Assert.Equal(707u, message.GetPackedFixed32(1)); + Assert.Equal(708u, message.GetPackedFixed64(1)); + Assert.Equal(709, message.GetPackedSfixed32(1)); + Assert.Equal(710, message.GetPackedSfixed64(1)); + Assert.Equal(711f, message.GetPackedFloat(1)); + Assert.Equal(712d, message.GetPackedDouble(1)); + Assert.Equal(false, message.GetPackedBool(1)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetPackedEnum(1)); } /// /// Asserts that all the fields of the specified message are set to the values assigned @@ -1544,48 +1544,48 @@ namespace Google.ProtocolBuffers /// public static void AssertUnpackedFieldsSet(TestUnpackedTypes message) { - Assert.AreEqual(2, message.UnpackedInt32Count); - Assert.AreEqual(2, message.UnpackedInt64Count); - Assert.AreEqual(2, message.UnpackedUint32Count); - Assert.AreEqual(2, message.UnpackedUint64Count); - Assert.AreEqual(2, message.UnpackedSint32Count); - Assert.AreEqual(2, message.UnpackedSint64Count); - Assert.AreEqual(2, message.UnpackedFixed32Count); - Assert.AreEqual(2, message.UnpackedFixed64Count); - Assert.AreEqual(2, message.UnpackedSfixed32Count); - Assert.AreEqual(2, message.UnpackedSfixed64Count); - Assert.AreEqual(2, message.UnpackedFloatCount); - Assert.AreEqual(2, message.UnpackedDoubleCount); - Assert.AreEqual(2, message.UnpackedBoolCount); - Assert.AreEqual(2, message.UnpackedEnumCount); - Assert.AreEqual(601, message.GetUnpackedInt32(0)); - Assert.AreEqual(602, message.GetUnpackedInt64(0)); - Assert.AreEqual(603u, message.GetUnpackedUint32(0)); - Assert.AreEqual(604u, message.GetUnpackedUint64(0)); - Assert.AreEqual(605, message.GetUnpackedSint32(0)); - Assert.AreEqual(606, message.GetUnpackedSint64(0)); - Assert.AreEqual(607u, message.GetUnpackedFixed32(0)); - Assert.AreEqual(608u, message.GetUnpackedFixed64(0)); - Assert.AreEqual(609, message.GetUnpackedSfixed32(0)); - Assert.AreEqual(610, message.GetUnpackedSfixed64(0)); - Assert.AreEqual(611, message.GetUnpackedFloat(0), 0.0); - Assert.AreEqual(612, message.GetUnpackedDouble(0), 0.0); - Assert.AreEqual(true, message.GetUnpackedBool(0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetUnpackedEnum(0)); - Assert.AreEqual(701, message.GetUnpackedInt32(1)); - Assert.AreEqual(702, message.GetUnpackedInt64(1)); - Assert.AreEqual(703u, message.GetUnpackedUint32(1)); - Assert.AreEqual(704u, message.GetUnpackedUint64(1)); - Assert.AreEqual(705, message.GetUnpackedSint32(1)); - Assert.AreEqual(706, message.GetUnpackedSint64(1)); - Assert.AreEqual(707u, message.GetUnpackedFixed32(1)); - Assert.AreEqual(708u, message.GetUnpackedFixed64(1)); - Assert.AreEqual(709, message.GetUnpackedSfixed32(1)); - Assert.AreEqual(710, message.GetUnpackedSfixed64(1)); - Assert.AreEqual(711, message.GetUnpackedFloat(1), 0.0); - Assert.AreEqual(712, message.GetUnpackedDouble(1), 0.0); - Assert.AreEqual(false, message.GetUnpackedBool(1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetUnpackedEnum(1)); + Assert.Equal(2, message.UnpackedInt32Count); + Assert.Equal(2, message.UnpackedInt64Count); + Assert.Equal(2, message.UnpackedUint32Count); + Assert.Equal(2, message.UnpackedUint64Count); + Assert.Equal(2, message.UnpackedSint32Count); + Assert.Equal(2, message.UnpackedSint64Count); + Assert.Equal(2, message.UnpackedFixed32Count); + Assert.Equal(2, message.UnpackedFixed64Count); + Assert.Equal(2, message.UnpackedSfixed32Count); + Assert.Equal(2, message.UnpackedSfixed64Count); + Assert.Equal(2, message.UnpackedFloatCount); + Assert.Equal(2, message.UnpackedDoubleCount); + Assert.Equal(2, message.UnpackedBoolCount); + Assert.Equal(2, message.UnpackedEnumCount); + Assert.Equal(601, message.GetUnpackedInt32(0)); + Assert.Equal(602, message.GetUnpackedInt64(0)); + Assert.Equal(603u, message.GetUnpackedUint32(0)); + Assert.Equal(604u, message.GetUnpackedUint64(0)); + Assert.Equal(605, message.GetUnpackedSint32(0)); + Assert.Equal(606, message.GetUnpackedSint64(0)); + Assert.Equal(607u, message.GetUnpackedFixed32(0)); + Assert.Equal(608u, message.GetUnpackedFixed64(0)); + Assert.Equal(609, message.GetUnpackedSfixed32(0)); + Assert.Equal(610, message.GetUnpackedSfixed64(0)); + Assert.Equal(611f, message.GetUnpackedFloat(0)); + Assert.Equal(612d, message.GetUnpackedDouble(0)); + Assert.Equal(true, message.GetUnpackedBool(0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetUnpackedEnum(0)); + Assert.Equal(701, message.GetUnpackedInt32(1)); + Assert.Equal(702, message.GetUnpackedInt64(1)); + Assert.Equal(703u, message.GetUnpackedUint32(1)); + Assert.Equal(704u, message.GetUnpackedUint64(1)); + Assert.Equal(705, message.GetUnpackedSint32(1)); + Assert.Equal(706, message.GetUnpackedSint64(1)); + Assert.Equal(707u, message.GetUnpackedFixed32(1)); + Assert.Equal(708u, message.GetUnpackedFixed64(1)); + Assert.Equal(709, message.GetUnpackedSfixed32(1)); + Assert.Equal(710, message.GetUnpackedSfixed64(1)); + Assert.Equal(711f, message.GetUnpackedFloat(1)); + Assert.Equal(712d, message.GetUnpackedDouble(1)); + Assert.Equal(false, message.GetUnpackedBool(1)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetUnpackedEnum(1)); } public static void SetPackedExtensions(TestPackedExtensions.Builder message) @@ -1623,95 +1623,95 @@ namespace Google.ProtocolBuffers public static void AssertPackedExtensionsSet(TestPackedExtensions message) { - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedInt32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedInt64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedUint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedUint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSfixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSfixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFloatExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedDoubleExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedBoolExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedEnumExtension)); - Assert.AreEqual(601, message.GetExtension(Unittest.PackedInt32Extension, 0)); - Assert.AreEqual(602L, message.GetExtension(Unittest.PackedInt64Extension, 0)); - Assert.AreEqual(603u, message.GetExtension(Unittest.PackedUint32Extension, 0)); - Assert.AreEqual(604uL, message.GetExtension(Unittest.PackedUint64Extension, 0)); - Assert.AreEqual(605, message.GetExtension(Unittest.PackedSint32Extension, 0)); - Assert.AreEqual(606L, message.GetExtension(Unittest.PackedSint64Extension, 0)); - Assert.AreEqual(607u, message.GetExtension(Unittest.PackedFixed32Extension, 0)); - Assert.AreEqual(608uL, message.GetExtension(Unittest.PackedFixed64Extension, 0)); - Assert.AreEqual(609, message.GetExtension(Unittest.PackedSfixed32Extension, 0)); - Assert.AreEqual(610L, message.GetExtension(Unittest.PackedSfixed64Extension, 0)); - Assert.AreEqual(611F, message.GetExtension(Unittest.PackedFloatExtension, 0)); - Assert.AreEqual(612D, message.GetExtension(Unittest.PackedDoubleExtension, 0)); - Assert.AreEqual(true, message.GetExtension(Unittest.PackedBoolExtension, 0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedInt32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedInt64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedUint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedUint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSfixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSfixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFloatExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedDoubleExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedBoolExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.PackedEnumExtension)); + Assert.Equal(601, message.GetExtension(Unittest.PackedInt32Extension, 0)); + Assert.Equal(602L, message.GetExtension(Unittest.PackedInt64Extension, 0)); + Assert.Equal(603u, message.GetExtension(Unittest.PackedUint32Extension, 0)); + Assert.Equal(604uL, message.GetExtension(Unittest.PackedUint64Extension, 0)); + Assert.Equal(605, message.GetExtension(Unittest.PackedSint32Extension, 0)); + Assert.Equal(606L, message.GetExtension(Unittest.PackedSint64Extension, 0)); + Assert.Equal(607u, message.GetExtension(Unittest.PackedFixed32Extension, 0)); + Assert.Equal(608uL, message.GetExtension(Unittest.PackedFixed64Extension, 0)); + Assert.Equal(609, message.GetExtension(Unittest.PackedSfixed32Extension, 0)); + Assert.Equal(610L, message.GetExtension(Unittest.PackedSfixed64Extension, 0)); + Assert.Equal(611F, message.GetExtension(Unittest.PackedFloatExtension, 0)); + Assert.Equal(612D, message.GetExtension(Unittest.PackedDoubleExtension, 0)); + Assert.Equal(true, message.GetExtension(Unittest.PackedBoolExtension, 0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.PackedEnumExtension, 0)); - Assert.AreEqual(701, message.GetExtension(Unittest.PackedInt32Extension, 1)); - Assert.AreEqual(702L, message.GetExtension(Unittest.PackedInt64Extension, 1)); - Assert.AreEqual(703u, message.GetExtension(Unittest.PackedUint32Extension, 1)); - Assert.AreEqual(704uL, message.GetExtension(Unittest.PackedUint64Extension, 1)); - Assert.AreEqual(705, message.GetExtension(Unittest.PackedSint32Extension, 1)); - Assert.AreEqual(706L, message.GetExtension(Unittest.PackedSint64Extension, 1)); - Assert.AreEqual(707u, message.GetExtension(Unittest.PackedFixed32Extension, 1)); - Assert.AreEqual(708uL, message.GetExtension(Unittest.PackedFixed64Extension, 1)); - Assert.AreEqual(709, message.GetExtension(Unittest.PackedSfixed32Extension, 1)); - Assert.AreEqual(710L, message.GetExtension(Unittest.PackedSfixed64Extension, 1)); - Assert.AreEqual(711F, message.GetExtension(Unittest.PackedFloatExtension, 1)); - Assert.AreEqual(712D, message.GetExtension(Unittest.PackedDoubleExtension, 1)); - Assert.AreEqual(false, message.GetExtension(Unittest.PackedBoolExtension, 1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.PackedEnumExtension, 1)); + Assert.Equal(701, message.GetExtension(Unittest.PackedInt32Extension, 1)); + Assert.Equal(702L, message.GetExtension(Unittest.PackedInt64Extension, 1)); + Assert.Equal(703u, message.GetExtension(Unittest.PackedUint32Extension, 1)); + Assert.Equal(704uL, message.GetExtension(Unittest.PackedUint64Extension, 1)); + Assert.Equal(705, message.GetExtension(Unittest.PackedSint32Extension, 1)); + Assert.Equal(706L, message.GetExtension(Unittest.PackedSint64Extension, 1)); + Assert.Equal(707u, message.GetExtension(Unittest.PackedFixed32Extension, 1)); + Assert.Equal(708uL, message.GetExtension(Unittest.PackedFixed64Extension, 1)); + Assert.Equal(709, message.GetExtension(Unittest.PackedSfixed32Extension, 1)); + Assert.Equal(710L, message.GetExtension(Unittest.PackedSfixed64Extension, 1)); + Assert.Equal(711F, message.GetExtension(Unittest.PackedFloatExtension, 1)); + Assert.Equal(712D, message.GetExtension(Unittest.PackedDoubleExtension, 1)); + Assert.Equal(false, message.GetExtension(Unittest.PackedBoolExtension, 1)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.PackedEnumExtension, 1)); } public static void AssertUnpackedExtensionsSet(TestUnpackedExtensions message) { - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedInt32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedInt64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedUint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedUint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSint32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSint64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSfixed32Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSfixed64Extension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFloatExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedDoubleExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedBoolExtension)); - Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedEnumExtension)); - Assert.AreEqual(601, message.GetExtension(Unittest.UnpackedInt32Extension, 0)); - Assert.AreEqual(602L, message.GetExtension(Unittest.UnpackedInt64Extension, 0)); - Assert.AreEqual(603u, message.GetExtension(Unittest.UnpackedUint32Extension, 0)); - Assert.AreEqual(604uL, message.GetExtension(Unittest.UnpackedUint64Extension, 0)); - Assert.AreEqual(605, message.GetExtension(Unittest.UnpackedSint32Extension, 0)); - Assert.AreEqual(606L, message.GetExtension(Unittest.UnpackedSint64Extension, 0)); - Assert.AreEqual(607u, message.GetExtension(Unittest.UnpackedFixed32Extension, 0)); - Assert.AreEqual(608uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 0)); - Assert.AreEqual(609, message.GetExtension(Unittest.UnpackedSfixed32Extension, 0)); - Assert.AreEqual(610L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 0)); - Assert.AreEqual(611F, message.GetExtension(Unittest.UnpackedFloatExtension, 0)); - Assert.AreEqual(612D, message.GetExtension(Unittest.UnpackedDoubleExtension, 0)); - Assert.AreEqual(true, message.GetExtension(Unittest.UnpackedBoolExtension, 0)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.UnpackedEnumExtension, 0)); - Assert.AreEqual(701, message.GetExtension(Unittest.UnpackedInt32Extension, 1)); - Assert.AreEqual(702L, message.GetExtension(Unittest.UnpackedInt64Extension, 1)); - Assert.AreEqual(703u, message.GetExtension(Unittest.UnpackedUint32Extension, 1)); - Assert.AreEqual(704uL, message.GetExtension(Unittest.UnpackedUint64Extension, 1)); - Assert.AreEqual(705, message.GetExtension(Unittest.UnpackedSint32Extension, 1)); - Assert.AreEqual(706L, message.GetExtension(Unittest.UnpackedSint64Extension, 1)); - Assert.AreEqual(707u, message.GetExtension(Unittest.UnpackedFixed32Extension, 1)); - Assert.AreEqual(708uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 1)); - Assert.AreEqual(709, message.GetExtension(Unittest.UnpackedSfixed32Extension, 1)); - Assert.AreEqual(710L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 1)); - Assert.AreEqual(711F, message.GetExtension(Unittest.UnpackedFloatExtension, 1)); - Assert.AreEqual(712D, message.GetExtension(Unittest.UnpackedDoubleExtension, 1)); - Assert.AreEqual(false, message.GetExtension(Unittest.UnpackedBoolExtension, 1)); - Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.UnpackedEnumExtension, 1)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedInt32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedInt64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedUint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedUint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSint32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSint64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSfixed32Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSfixed64Extension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFloatExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedDoubleExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedBoolExtension)); + Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedEnumExtension)); + Assert.Equal(601, message.GetExtension(Unittest.UnpackedInt32Extension, 0)); + Assert.Equal(602L, message.GetExtension(Unittest.UnpackedInt64Extension, 0)); + Assert.Equal(603u, message.GetExtension(Unittest.UnpackedUint32Extension, 0)); + Assert.Equal(604uL, message.GetExtension(Unittest.UnpackedUint64Extension, 0)); + Assert.Equal(605, message.GetExtension(Unittest.UnpackedSint32Extension, 0)); + Assert.Equal(606L, message.GetExtension(Unittest.UnpackedSint64Extension, 0)); + Assert.Equal(607u, message.GetExtension(Unittest.UnpackedFixed32Extension, 0)); + Assert.Equal(608uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 0)); + Assert.Equal(609, message.GetExtension(Unittest.UnpackedSfixed32Extension, 0)); + Assert.Equal(610L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 0)); + Assert.Equal(611F, message.GetExtension(Unittest.UnpackedFloatExtension, 0)); + Assert.Equal(612D, message.GetExtension(Unittest.UnpackedDoubleExtension, 0)); + Assert.Equal(true, message.GetExtension(Unittest.UnpackedBoolExtension, 0)); + Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.UnpackedEnumExtension, 0)); + Assert.Equal(701, message.GetExtension(Unittest.UnpackedInt32Extension, 1)); + Assert.Equal(702L, message.GetExtension(Unittest.UnpackedInt64Extension, 1)); + Assert.Equal(703u, message.GetExtension(Unittest.UnpackedUint32Extension, 1)); + Assert.Equal(704uL, message.GetExtension(Unittest.UnpackedUint64Extension, 1)); + Assert.Equal(705, message.GetExtension(Unittest.UnpackedSint32Extension, 1)); + Assert.Equal(706L, message.GetExtension(Unittest.UnpackedSint64Extension, 1)); + Assert.Equal(707u, message.GetExtension(Unittest.UnpackedFixed32Extension, 1)); + Assert.Equal(708uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 1)); + Assert.Equal(709, message.GetExtension(Unittest.UnpackedSfixed32Extension, 1)); + Assert.Equal(710L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 1)); + Assert.Equal(711F, message.GetExtension(Unittest.UnpackedFloatExtension, 1)); + Assert.Equal(712D, message.GetExtension(Unittest.UnpackedDoubleExtension, 1)); + Assert.Equal(false, message.GetExtension(Unittest.UnpackedBoolExtension, 1)); + Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.UnpackedEnumExtension, 1)); } private static readonly string[] TestCultures = {"en-US", "en-GB", "fr-FR", "de-DE"}; @@ -1751,61 +1751,5 @@ namespace Google.ProtocolBuffers } return bytes; } - - - internal delegate void Action(); - - internal static void AssertNotSupported(Action action) - { - try - { - action(); - Assert.Fail("Expected NotSupportedException"); - } - catch (NotSupportedException) - { - // Expected - } - } - - internal static void AssertArgumentNullException(Action action) - { - try - { - action(); - Assert.Fail("Exception was not thrown"); - } - // Not a general case, however, Compact Framework v2 does use Invoke - catch (System.Reflection.TargetInvocationException te) - { - if (te.InnerException.GetType() != typeof(ArgumentNullException)) - throw; - } - // Normally expected exception - catch (ArgumentNullException) - { - // We expect this exception. - } - } - - internal static void AssertBytesEqual(byte[] a, byte[]b) - { - if (a == null || b == null) - { - Assert.AreEqual(a, b); - } - else - { - Assert.AreEqual(a.Length, b.Length, "The byte[] is not of the expected length."); - - for (int i = 0; i < a.Length; i++) - { - if (a[i] != b[i]) - { - Assert.AreEqual(a[i], b[i], "Byte[] differs at index " + i); - } - } - } - } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs b/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs index b4472a60..ad5c052e 100644 --- a/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs +++ b/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs @@ -1,18 +1,18 @@ using System; using System.IO; +using System.Runtime.InteropServices; using System.Text; +using EnumOptions = Google.ProtocolBuffers.TestProtos.EnumOptions; using Google.ProtocolBuffers.DescriptorProtos; using Google.ProtocolBuffers.Serialization; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Google.ProtocolBuffers.TestProtos; -using EnumOptions = Google.ProtocolBuffers.TestProtos.EnumOptions; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestWriterFormatJson { - [TestMethod] + [Fact] public void Example_FromJson() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -21,10 +21,10 @@ namespace Google.ProtocolBuffers Extensions.MergeFromJson(builder, @"{""valid"":true}"); TestXmlMessage message = builder.Build(); - Assert.AreEqual(true, message.Valid); + Assert.Equal(true, message.Valid); } - [TestMethod] + [Fact] public void Example_ToJson() { TestXmlMessage message = @@ -35,10 +35,10 @@ namespace Google.ProtocolBuffers //3.5: string json = message.ToJson(); string json = Extensions.ToJson(message); - Assert.AreEqual(@"{""valid"":true}", json); + Assert.Equal(@"{""valid"":true}", json); } - [TestMethod] + [Fact] public void Example_WriteJsonUsingICodedOutputStream() { TestXmlMessage message = @@ -52,20 +52,20 @@ namespace Google.ProtocolBuffers writer.WriteMessageStart(); //manually begin the message, output is '{' writer.Flush(); - Assert.AreEqual("{", output.ToString()); + Assert.Equal("{", output.ToString()); ICodedOutputStream stream = writer; message.WriteTo(stream); //write the message normally writer.Flush(); - Assert.AreEqual(@"{""valid"":true", output.ToString()); + Assert.Equal(@"{""valid"":true", output.ToString()); writer.WriteMessageEnd(); //manually write the end message '}' - Assert.AreEqual(@"{""valid"":true}", output.ToString()); + Assert.Equal(@"{""valid"":true}", output.ToString()); } } - [TestMethod] + [Fact] public void Example_ReadJsonUsingICodedInputStream() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -94,35 +94,37 @@ namespace Google.ProtocolBuffers JsonFormatReader.CreateInstance(Content) .Merge(message.WeakCreateBuilderForType(), registry).WeakBuild(); - Assert.AreEqual(typeof(TMessage), copy.GetType()); - Assert.AreEqual(message, copy); + Assert.Equal(typeof(TMessage), copy.GetType()); + Assert.Equal(message, copy); foreach (string expect in expecting) - Assert.IsTrue(Content.IndexOf(expect) >= 0, "Expected to find content '{0}' in: \r\n{1}", expect, Content); + { + Assert.True(Content.IndexOf(expect) >= 0); + } } - [TestMethod] + [Fact] public void TestToJsonParseFromJson() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string json = Extensions.ToJson(msg); - Assert.AreEqual("{\"default_bool\":true}", json); + Assert.Equal("{\"default_bool\":true}", json); TestAllTypes copy = Extensions.MergeFromJson(new TestAllTypes.Builder(), json).Build(); - Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); - Assert.AreEqual(msg, copy); + Assert.True(copy.HasDefaultBool && copy.DefaultBool); + Assert.Equal(msg, copy); } - [TestMethod] + [Fact] public void TestToJsonParseFromJsonReader() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string json = Extensions.ToJson(msg); - Assert.AreEqual("{\"default_bool\":true}", json); + Assert.Equal("{\"default_bool\":true}", json); TestAllTypes copy = Extensions.MergeFromJson(new TestAllTypes.Builder(), new StringReader(json)).Build(); - Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); - Assert.AreEqual(msg, copy); + Assert.True(copy.HasDefaultBool && copy.DefaultBool); + Assert.Equal(msg, copy); } - [TestMethod] + [Fact] public void TestJsonFormatted() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -142,10 +144,10 @@ namespace Google.ProtocolBuffers TestXmlMessage copy = JsonFormatReader.CreateInstance(json) .Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + [Fact] public void TestEmptyMessage() { FormatterAssert( @@ -155,7 +157,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestRepeatedField() { FormatterAssert( @@ -167,7 +169,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestNestedEmptyMessage() { FormatterAssert( @@ -178,7 +180,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestNestedMessage() { FormatterAssert( @@ -189,7 +191,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestBooleanTypes() { FormatterAssert( @@ -200,7 +202,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestFullMessage() { FormatterAssert( @@ -230,7 +232,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestMessageWithXmlText() { FormatterAssert( @@ -241,7 +243,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestWithEscapeChars() { FormatterAssert( @@ -252,7 +254,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestWithExtensionText() { FormatterAssert( @@ -264,7 +266,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestWithExtensionNumber() { FormatterAssert( @@ -276,7 +278,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestWithExtensionArray() { FormatterAssert( @@ -289,7 +291,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestWithExtensionEnum() { FormatterAssert( @@ -300,7 +302,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestMessageWithExtensions() { FormatterAssert( @@ -323,7 +325,7 @@ namespace Google.ProtocolBuffers ); } - [TestMethod] + [Fact] public void TestMessageMissingExtensions() { TestXmlMessage original = TestXmlMessage.CreateBuilder() @@ -351,23 +353,23 @@ namespace Google.ProtocolBuffers IMessageLite copy = JsonFormatReader.CreateInstance(Content) .Merge(message.CreateBuilderForType()).Build(); - Assert.AreNotEqual(original, message); - Assert.AreNotEqual(original, copy); - Assert.AreEqual(message, copy); + Assert.NotEqual(original, message); + Assert.NotEqual(original, copy); + Assert.Equal(message, copy); } - [TestMethod] + [Fact] public void TestMergeFields() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(JsonFormatReader.CreateInstance("\"valid\": true")); builder.MergeFrom(JsonFormatReader.CreateInstance("\"text\": \"text\", \"number\": \"411\"")); - Assert.AreEqual(true, builder.Valid); - Assert.AreEqual("text", builder.Text); - Assert.AreEqual(411, builder.Number); + Assert.Equal(true, builder.Valid); + Assert.Equal("text", builder.Text); + Assert.Equal(411, builder.Number); } - [TestMethod] + [Fact] public void TestMessageArray() { JsonFormatWriter writer = JsonFormatWriter.CreateInstance().Formatted(); @@ -386,13 +388,13 @@ namespace Google.ProtocolBuffers foreach (JsonFormatReader r in reader.EnumerateArray()) { r.Merge(builder); - Assert.AreEqual(++ordinal, builder.Number); + Assert.Equal(++ordinal, builder.Number); } - Assert.AreEqual(3, ordinal); - Assert.AreEqual(3, builder.TextlinesCount); + Assert.Equal(3, ordinal); + Assert.Equal(3, builder.TextlinesCount); } - [TestMethod] + [Fact] public void TestNestedMessageArray() { JsonFormatWriter writer = JsonFormatWriter.CreateInstance(); @@ -416,13 +418,13 @@ namespace Google.ProtocolBuffers foreach (JsonFormatReader r2 in r.EnumerateArray()) { r2.Merge(builder); - Assert.AreEqual(++ordinal, builder.Number); + Assert.Equal(++ordinal, builder.Number); } - Assert.AreEqual(3, ordinal); - Assert.AreEqual(3, builder.TextlinesCount); + Assert.Equal(3, ordinal); + Assert.Equal(3, builder.TextlinesCount); } - [TestMethod] + [Fact] public void TestReadWriteJsonWithoutRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -437,53 +439,51 @@ namespace Google.ProtocolBuffers output.Flush(); Json = sw.ToString(); } - Assert.AreEqual(@"""text"":""abc"",""number"":123", Json); + Assert.Equal(@"""text"":""abc"",""number"":123", Json); ICodedInputStream input = JsonFormatReader.CreateInstance(Json); TestXmlMessage copy = TestXmlMessage.CreateBuilder().MergeFrom(input).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod,ExpectedException(typeof(RecursionLimitExceededException))] + [Fact] public void TestRecursiveLimit() { StringBuilder sb = new StringBuilder(8192); for (int i = 0; i < 80; i++) + { sb.Append("{\"child\":"); - TestXmlRescursive msg = Extensions.MergeFromJson(new TestXmlRescursive.Builder(), sb.ToString()).Build(); + } + Assert.Throws(() => Extensions.MergeFromJson(new TestXmlRescursive.Builder(), sb.ToString()).Build()); } - [TestMethod, ExpectedException(typeof(FormatException))] + [Fact] public void FailWithEmptyText() { - JsonFormatReader.CreateInstance("") - .Merge(TestXmlMessage.CreateBuilder()); + Assert.Throws(() => JsonFormatReader.CreateInstance("").Merge(TestXmlMessage.CreateBuilder())); } - [TestMethod, ExpectedException(typeof(FormatException))] + [Fact] public void FailWithUnexpectedValue() { - JsonFormatReader.CreateInstance("{{}}") - .Merge(TestXmlMessage.CreateBuilder()); + Assert.Throws(() => JsonFormatReader.CreateInstance("{{}}").Merge(TestXmlMessage.CreateBuilder())); } - [TestMethod, ExpectedException(typeof(FormatException))] + [Fact] public void FailWithUnQuotedName() { - JsonFormatReader.CreateInstance("{name:{}}") - .Merge(TestXmlMessage.CreateBuilder()); + Assert.Throws(() => JsonFormatReader.CreateInstance("{name:{}}").Merge(TestXmlMessage.CreateBuilder())); } - [TestMethod, ExpectedException(typeof(FormatException))] + [Fact] public void FailWithUnexpectedType() { - JsonFormatReader.CreateInstance("{\"valid\":{}}") - .Merge(TestXmlMessage.CreateBuilder()); + Assert.Throws(() => JsonFormatReader.CreateInstance("{\"valid\":{}}").Merge(TestXmlMessage.CreateBuilder())); } // See issue 64 for background. - [TestMethod] + [Fact] public void ToJsonRequiringBufferExpansion() { string s = new string('.', 4086); @@ -492,7 +492,7 @@ namespace Google.ProtocolBuffers .SetPackage("package") .BuildPartial(); - Assert.IsNotNull(Extensions.ToJson(opts)); + Assert.NotNull(Extensions.ToJson(opts)); } } } diff --git a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs index 695daa84..78e6bb27 100644 --- a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs +++ b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs @@ -1,18 +1,16 @@ using System; -using System.Collections.Generic; using System.IO; using System.Text; using System.Xml; using Google.ProtocolBuffers.Serialization; -using Microsoft.VisualStudio.TestTools.UnitTesting; using Google.ProtocolBuffers.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestWriterFormatXml { - [TestMethod] + [Fact] public void Example_FromXml() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -22,10 +20,10 @@ namespace Google.ProtocolBuffers Extensions.MergeFromXml(builder, rdr); TestXmlMessage message = builder.Build(); - Assert.AreEqual(true, message.Valid); + Assert.Equal(true, message.Valid); } - [TestMethod] + [Fact] public void Example_ToXml() { TestXmlMessage message = @@ -36,10 +34,10 @@ namespace Google.ProtocolBuffers //3.5: string Xml = message.ToXml(); string Xml = Extensions.ToXml(message); - Assert.AreEqual(@"true", Xml); + Assert.Equal(@"true", Xml); } - [TestMethod] + [Fact] public void Example_WriteXmlUsingICodedOutputStream() { TestXmlMessage message = @@ -56,11 +54,11 @@ namespace Google.ProtocolBuffers message.WriteTo(stream); //write the message normally writer.WriteMessageEnd(); //manually write the end message '}' - Assert.AreEqual(@"true", output.ToString()); + Assert.Equal(@"true", output.ToString()); } } - [TestMethod] + [Fact] public void Example_ReadXmlUsingICodedInputStream() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -73,29 +71,29 @@ namespace Google.ProtocolBuffers reader.ReadMessageEnd(); //manually read the end message '}' } - [TestMethod] + [Fact] public void TestToXmlParseFromXml() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string xml = Extensions.ToXml(msg); - Assert.AreEqual("true", xml); + Assert.Equal("true", xml); TestAllTypes copy = Extensions.MergeFromXml(new TestAllTypes.Builder(), XmlReader.Create(new StringReader(xml))).Build(); - Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); - Assert.AreEqual(msg, copy); + Assert.True(copy.HasDefaultBool && copy.DefaultBool); + Assert.Equal(msg, copy); } - [TestMethod] + [Fact] public void TestToXmlParseFromXmlWithRootName() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string xml = Extensions.ToXml(msg, "message"); - Assert.AreEqual("true", xml); + Assert.Equal("true", xml); TestAllTypes copy = Extensions.MergeFromXml(new TestAllTypes.Builder(), "message", XmlReader.Create(new StringReader(xml))).Build(); - Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); - Assert.AreEqual(msg, copy); + Assert.True(copy.HasDefaultBool && copy.DefaultBool); + Assert.Equal(msg, copy); } - [TestMethod] + [Fact] public void TestEmptyMessage() { TestXmlChild message = TestXmlChild.CreateBuilder() @@ -113,9 +111,9 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlChild copy = rdr.Merge(TestXmlChild.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + [Fact] public void TestRepeatedField() { TestXmlChild message = TestXmlChild.CreateBuilder() @@ -130,9 +128,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlChild copy = rdr.Merge(TestXmlChild.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestNestedEmptyMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -145,9 +144,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestNestedMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -160,9 +160,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestBooleanTypes() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -175,9 +176,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestFullMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -204,9 +206,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestFullMessageWithRichTypes() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -236,9 +239,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); rdr.Options = XmlReaderOptions.ReadNestedArrays; TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestFullMessageWithUnknownFields() { TestXmlMessage origial = TestXmlMessage.CreateBuilder() @@ -257,7 +261,7 @@ namespace Google.ProtocolBuffers .Build(); TestXmlNoFields message = TestXmlNoFields.CreateBuilder().MergeFrom(origial.ToByteArray()).Build(); - Assert.AreEqual(0, message.AllFields.Count); + Assert.Equal(0, message.AllFields.Count); StringWriter sw = new StringWriter(); XmlFormatWriter.CreateInstance(sw) @@ -269,9 +273,9 @@ namespace Google.ProtocolBuffers using (XmlReader x = XmlReader.Create(new StringReader(xml))) { x.MoveToContent(); - Assert.AreEqual(XmlNodeType.Element, x.NodeType); + Assert.Equal(XmlNodeType.Element, x.NodeType); //should always be empty - Assert.IsTrue(x.IsEmptyElement || + Assert.True(x.IsEmptyElement || (x.Read() && x.NodeType == XmlNodeType.EndElement) ); } @@ -279,9 +283,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); rdr.Options = XmlReaderOptions.ReadNestedArrays; TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(TestXmlMessage.DefaultInstance, copy); + Assert.Equal(TestXmlMessage.DefaultInstance, copy); } - [TestMethod] + + [Fact] public void TestMessageWithXmlText() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -294,9 +299,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlWithWhitespace() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -309,9 +315,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlWithExtensionText() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -328,9 +335,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlWithExtensionMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -347,9 +355,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlWithExtensionArray() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -368,9 +377,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlWithExtensionEnum() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -387,9 +397,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod] + + [Fact] public void TestXmlReadEmptyRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -402,7 +413,7 @@ namespace Google.ProtocolBuffers reader.ReadMessageEnd(); //manually read the end message '}' } - [TestMethod] + [Fact] public void TestXmlReadEmptyChild() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -411,11 +422,11 @@ namespace Google.ProtocolBuffers reader.ReadMessageStart(); //manually read the begin the message '{' builder.MergeFrom(reader); //write the message normally - Assert.IsTrue(builder.HasText); - Assert.AreEqual(String.Empty, builder.Text); + Assert.True(builder.HasText); + Assert.Equal(String.Empty, builder.Text); } - [TestMethod] + [Fact] public void TestXmlReadWriteWithoutRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -431,7 +442,7 @@ namespace Google.ProtocolBuffers output.Flush(); xml = sw.ToString(); } - Assert.AreEqual("abc123", xml); + Assert.Equal("abc123", xml); TestXmlMessage copy; using (XmlReader xr = XmlReader.Create(new StringReader(xml), new XmlReaderSettings() { ConformanceLevel = ConformanceLevel.Fragment })) @@ -440,16 +451,18 @@ namespace Google.ProtocolBuffers copy = TestXmlMessage.CreateBuilder().MergeFrom(input).Build(); } - Assert.AreEqual(message, copy); + Assert.Equal(message, copy); } - [TestMethod, ExpectedException(typeof(RecursionLimitExceededException))] + [Fact] public void TestRecursiveLimit() { StringBuilder sb = new StringBuilder(8192); for (int i = 0; i < 80; i++) + { sb.Append(""); - TestXmlRescursive msg = Extensions.MergeFromXml(new TestXmlRescursive.Builder(), "child", XmlReader.Create(new StringReader(sb.ToString()))).Build(); + } + Assert.Throws(() => Extensions.MergeFromXml(new TestXmlRescursive.Builder(), "child", XmlReader.Create(new StringReader(sb.ToString()))).Build()); } } } diff --git a/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs b/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs index 37a4192a..1e083c6b 100644 --- a/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs +++ b/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs @@ -36,15 +36,11 @@ using System; using System.IO; -using System.Text; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Globalization; -using System.Threading; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TextFormatTest { private static readonly string AllFieldsSetText = TestResources.text_format_unittest_data; @@ -88,46 +84,46 @@ namespace Google.ProtocolBuffers /// /// Print TestAllTypes and compare with golden file. /// - [TestMethod] + [Fact] public void PrintMessage() { TestUtil.TestInMultipleCultures(() => - { - string text = TextFormat.PrintToString(TestUtil.GetAllSet()); - Assert.AreEqual(AllFieldsSetText.Replace("\r\n", "\n").Trim(), - text.Replace("\r\n", "\n").Trim()); - }); + { + string text = TextFormat.PrintToString(TestUtil.GetAllSet()); + Assert.Equal(AllFieldsSetText.Replace("\r\n", "\n").Trim(), + text.Replace("\r\n", "\n").Trim()); + }); } /// /// Tests that a builder prints the same way as a message. /// - [TestMethod] + [Fact] public void PrintBuilder() { TestUtil.TestInMultipleCultures(() => { string messageText = TextFormat.PrintToString(TestUtil.GetAllSet()); string builderText = TextFormat.PrintToString(TestUtil.GetAllSet().ToBuilder()); - Assert.AreEqual(messageText, builderText); + Assert.Equal(messageText, builderText); }); } /// /// Print TestAllExtensions and compare with golden file. /// - [TestMethod] + [Fact] public void PrintExtensions() { string text = TextFormat.PrintToString(TestUtil.GetAllExtensionsSet()); - Assert.AreEqual(AllExtensionsSetText.Replace("\r\n", "\n").Trim(), text.Replace("\r\n", "\n").Trim()); + Assert.Equal(AllExtensionsSetText.Replace("\r\n", "\n").Trim(), text.Replace("\r\n", "\n").Trim()); } /// /// Test printing of unknown fields in a message. /// - [TestMethod] + [Fact] public void PrintUnknownFields() { TestEmptyMessage message = @@ -163,7 +159,7 @@ namespace Google.ProtocolBuffers .Build()) .Build(); - Assert.AreEqual( + Assert.Equal( "5: 1\n" + "5: 0x00000002\n" + "5: 0x0000000000000003\n" + @@ -193,7 +189,7 @@ namespace Google.ProtocolBuffers return ByteString.CopyFrom(bytes); } - [TestMethod] + [Fact] public void PrintExotic() { IMessage message = TestAllTypes.CreateBuilder() @@ -224,10 +220,10 @@ namespace Google.ProtocolBuffers .AddRepeatedBytes(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\"\u00fe")) .Build(); - Assert.AreEqual(ExoticText, message.ToString()); + Assert.Equal(ExoticText, message.ToString()); } - [TestMethod] + [Fact] public void PrintMessageSet() { TestMessageSet messageSet = @@ -240,12 +236,12 @@ namespace Google.ProtocolBuffers TestMessageSetExtension2.CreateBuilder().SetStr("foo").Build()) .Build(); - Assert.AreEqual(MessageSetText, messageSet.ToString()); + Assert.Equal(MessageSetText, messageSet.ToString()); } // ================================================================= - [TestMethod] + [Fact] public void Parse() { TestUtil.TestInMultipleCultures(() => @@ -256,7 +252,7 @@ namespace Google.ProtocolBuffers }); } - [TestMethod] + [Fact] public void ParseReader() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -264,7 +260,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(builder.Build()); } - [TestMethod] + [Fact] public void ParseExtensions() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -274,7 +270,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(builder.Build()); } - [TestMethod] + [Fact] public void ParseCompatibility() { string original = "repeated_float: inf\n" + @@ -303,10 +299,10 @@ namespace Google.ProtocolBuffers "repeated_double: NaN\n"; TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge(original, builder); - Assert.AreEqual(canonical, builder.Build().ToString()); + Assert.Equal(canonical, builder.Build().ToString()); } - [TestMethod] + [Fact] public void ParseExotic() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -314,10 +310,10 @@ namespace Google.ProtocolBuffers // Too lazy to check things individually. Don't try to debug this // if testPrintExotic() is Assert.Failing. - Assert.AreEqual(ExoticText, builder.Build().ToString()); + Assert.Equal(ExoticText, builder.Build().ToString()); } - [TestMethod] + [Fact] public void ParseMessageSet() { ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance(); @@ -328,30 +324,30 @@ namespace Google.ProtocolBuffers TextFormat.Merge(MessageSetText, extensionRegistry, builder); TestMessageSet messageSet = builder.Build(); - Assert.IsTrue(messageSet.HasExtension(TestMessageSetExtension1.MessageSetExtension)); - Assert.AreEqual(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); - Assert.IsTrue(messageSet.HasExtension(TestMessageSetExtension2.MessageSetExtension)); - Assert.AreEqual("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); + Assert.True(messageSet.HasExtension(TestMessageSetExtension1.MessageSetExtension)); + Assert.Equal(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); + Assert.True(messageSet.HasExtension(TestMessageSetExtension2.MessageSetExtension)); + Assert.Equal("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); } - [TestMethod] + [Fact] public void ParseNumericEnum() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("optional_nested_enum: 2", builder); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, builder.OptionalNestedEnum); + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, builder.OptionalNestedEnum); } - [TestMethod] + [Fact] public void ParseAngleBrackets() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("OptionalGroup: < a: 1 >", builder); - Assert.IsTrue(builder.HasOptionalGroup); - Assert.AreEqual(1, builder.OptionalGroup.A); + Assert.True(builder.HasOptionalGroup); + Assert.Equal(1, builder.OptionalGroup.A); } - [TestMethod] + [Fact] public void ParseComment() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -360,26 +356,19 @@ namespace Google.ProtocolBuffers "optional_int32: 1 # another comment\n" + "optional_int64: 2\n" + "# EOF comment", builder); - Assert.AreEqual(1, builder.OptionalInt32); - Assert.AreEqual(2, builder.OptionalInt64); + Assert.Equal(1, builder.OptionalInt32); + Assert.Equal(2, builder.OptionalInt64); } private static void AssertParseError(string error, string text) { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); - try - { - TextFormat.Merge(text, TestUtil.CreateExtensionRegistry(), builder); - Assert.Fail("Expected parse exception."); - } - catch (FormatException e) - { - Assert.AreEqual(error, e.Message); - } + Exception exception = Assert.Throws(() => TextFormat.Merge(text, TestUtil.CreateExtensionRegistry(), builder)); + Assert.Equal(error, exception.Message); } - [TestMethod] + [Fact] public void ParseErrors() { AssertParseError( @@ -454,111 +443,96 @@ namespace Google.ProtocolBuffers return ByteString.CopyFrom(bytes); } - private delegate void FormattingAction(); - - private static void AssertFormatException(FormattingAction action) - { - try - { - action(); - Assert.Fail("Should have thrown an exception."); - } - catch (FormatException) - { - // success - } - } - - [TestMethod] + [Fact] public void Escape() { // Escape sequences. - Assert.AreEqual("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", + Assert.Equal("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", TextFormat.EscapeBytes(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""))); - Assert.AreEqual("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", + Assert.Equal("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", TextFormat.EscapeText("\0\u0001\u0007\b\f\n\r\t\v\\\'\"")); - Assert.AreEqual(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""), + Assert.Equal(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""), TextFormat.UnescapeBytes("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); - Assert.AreEqual("\0\u0001\u0007\b\f\n\r\t\v\\\'\"", + Assert.Equal("\0\u0001\u0007\b\f\n\r\t\v\\\'\"", TextFormat.UnescapeText("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); // Unicode handling. - Assert.AreEqual("\\341\\210\\264", TextFormat.EscapeText("\u1234")); - Assert.AreEqual("\\341\\210\\264", TextFormat.EscapeBytes(Bytes(0xe1, 0x88, 0xb4))); - Assert.AreEqual("\u1234", TextFormat.UnescapeText("\\341\\210\\264")); - Assert.AreEqual(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\341\\210\\264")); - Assert.AreEqual("\u1234", TextFormat.UnescapeText("\\xe1\\x88\\xb4")); - Assert.AreEqual(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\xe1\\x88\\xb4")); + Assert.Equal("\\341\\210\\264", TextFormat.EscapeText("\u1234")); + Assert.Equal("\\341\\210\\264", TextFormat.EscapeBytes(Bytes(0xe1, 0x88, 0xb4))); + Assert.Equal("\u1234", TextFormat.UnescapeText("\\341\\210\\264")); + Assert.Equal(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\341\\210\\264")); + Assert.Equal("\u1234", TextFormat.UnescapeText("\\xe1\\x88\\xb4")); + Assert.Equal(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\xe1\\x88\\xb4")); // Errors. - AssertFormatException(() => TextFormat.UnescapeText("\\x")); - AssertFormatException(() => TextFormat.UnescapeText("\\z")); - AssertFormatException(() => TextFormat.UnescapeText("\\")); + Assert.Throws(() => TextFormat.UnescapeText("\\x")); + Assert.Throws(() => TextFormat.UnescapeText("\\z")); + Assert.Throws(() => TextFormat.UnescapeText("\\")); } - [TestMethod] + [Fact] public void ParseInteger() { - Assert.AreEqual(0, TextFormat.ParseInt32("0")); - Assert.AreEqual(1, TextFormat.ParseInt32("1")); - Assert.AreEqual(-1, TextFormat.ParseInt32("-1")); - Assert.AreEqual(12345, TextFormat.ParseInt32("12345")); - Assert.AreEqual(-12345, TextFormat.ParseInt32("-12345")); - Assert.AreEqual(2147483647, TextFormat.ParseInt32("2147483647")); - Assert.AreEqual(-2147483648, TextFormat.ParseInt32("-2147483648")); - - Assert.AreEqual(0u, TextFormat.ParseUInt32("0")); - Assert.AreEqual(1u, TextFormat.ParseUInt32("1")); - Assert.AreEqual(12345u, TextFormat.ParseUInt32("12345")); - Assert.AreEqual(2147483647u, TextFormat.ParseUInt32("2147483647")); - Assert.AreEqual(2147483648U, TextFormat.ParseUInt32("2147483648")); - Assert.AreEqual(4294967295U, TextFormat.ParseUInt32("4294967295")); - - Assert.AreEqual(0L, TextFormat.ParseInt64("0")); - Assert.AreEqual(1L, TextFormat.ParseInt64("1")); - Assert.AreEqual(-1L, TextFormat.ParseInt64("-1")); - Assert.AreEqual(12345L, TextFormat.ParseInt64("12345")); - Assert.AreEqual(-12345L, TextFormat.ParseInt64("-12345")); - Assert.AreEqual(2147483647L, TextFormat.ParseInt64("2147483647")); - Assert.AreEqual(-2147483648L, TextFormat.ParseInt64("-2147483648")); - Assert.AreEqual(4294967295L, TextFormat.ParseInt64("4294967295")); - Assert.AreEqual(4294967296L, TextFormat.ParseInt64("4294967296")); - Assert.AreEqual(9223372036854775807L, TextFormat.ParseInt64("9223372036854775807")); - Assert.AreEqual(-9223372036854775808L, TextFormat.ParseInt64("-9223372036854775808")); - - Assert.AreEqual(0uL, TextFormat.ParseUInt64("0")); - Assert.AreEqual(1uL, TextFormat.ParseUInt64("1")); - Assert.AreEqual(12345uL, TextFormat.ParseUInt64("12345")); - Assert.AreEqual(2147483647uL, TextFormat.ParseUInt64("2147483647")); - Assert.AreEqual(4294967295uL, TextFormat.ParseUInt64("4294967295")); - Assert.AreEqual(4294967296uL, TextFormat.ParseUInt64("4294967296")); - Assert.AreEqual(9223372036854775807UL, TextFormat.ParseUInt64("9223372036854775807")); - Assert.AreEqual(9223372036854775808UL, TextFormat.ParseUInt64("9223372036854775808")); - Assert.AreEqual(18446744073709551615UL, TextFormat.ParseUInt64("18446744073709551615")); + Assert.Equal(0, TextFormat.ParseInt32("0")); + Assert.Equal(1, TextFormat.ParseInt32("1")); + Assert.Equal(-1, TextFormat.ParseInt32("-1")); + Assert.Equal(12345, TextFormat.ParseInt32("12345")); + Assert.Equal(-12345, TextFormat.ParseInt32("-12345")); + Assert.Equal(2147483647, TextFormat.ParseInt32("2147483647")); + Assert.Equal(-2147483648, TextFormat.ParseInt32("-2147483648")); + + Assert.Equal(0u, TextFormat.ParseUInt32("0")); + Assert.Equal(1u, TextFormat.ParseUInt32("1")); + Assert.Equal(12345u, TextFormat.ParseUInt32("12345")); + Assert.Equal(2147483647u, TextFormat.ParseUInt32("2147483647")); + Assert.Equal(2147483648U, TextFormat.ParseUInt32("2147483648")); + Assert.Equal(4294967295U, TextFormat.ParseUInt32("4294967295")); + + Assert.Equal(0L, TextFormat.ParseInt64("0")); + Assert.Equal(1L, TextFormat.ParseInt64("1")); + Assert.Equal(-1L, TextFormat.ParseInt64("-1")); + Assert.Equal(12345L, TextFormat.ParseInt64("12345")); + Assert.Equal(-12345L, TextFormat.ParseInt64("-12345")); + Assert.Equal(2147483647L, TextFormat.ParseInt64("2147483647")); + Assert.Equal(-2147483648L, TextFormat.ParseInt64("-2147483648")); + Assert.Equal(4294967295L, TextFormat.ParseInt64("4294967295")); + Assert.Equal(4294967296L, TextFormat.ParseInt64("4294967296")); + Assert.Equal(9223372036854775807L, TextFormat.ParseInt64("9223372036854775807")); + Assert.Equal(-9223372036854775808L, TextFormat.ParseInt64("-9223372036854775808")); + + Assert.Equal(0uL, TextFormat.ParseUInt64("0")); + Assert.Equal(1uL, TextFormat.ParseUInt64("1")); + Assert.Equal(12345uL, TextFormat.ParseUInt64("12345")); + Assert.Equal(2147483647uL, TextFormat.ParseUInt64("2147483647")); + Assert.Equal(4294967295uL, TextFormat.ParseUInt64("4294967295")); + Assert.Equal(4294967296uL, TextFormat.ParseUInt64("4294967296")); + Assert.Equal(9223372036854775807UL, TextFormat.ParseUInt64("9223372036854775807")); + Assert.Equal(9223372036854775808UL, TextFormat.ParseUInt64("9223372036854775808")); + Assert.Equal(18446744073709551615UL, TextFormat.ParseUInt64("18446744073709551615")); // Hex - Assert.AreEqual(0x1234abcd, TextFormat.ParseInt32("0x1234abcd")); - Assert.AreEqual(-0x1234abcd, TextFormat.ParseInt32("-0x1234abcd")); - Assert.AreEqual(0xffffffffffffffffUL, TextFormat.ParseUInt64("0xffffffffffffffff")); - Assert.AreEqual(0x7fffffffffffffffL, + Assert.Equal(0x1234abcd, TextFormat.ParseInt32("0x1234abcd")); + Assert.Equal(-0x1234abcd, TextFormat.ParseInt32("-0x1234abcd")); + Assert.Equal(0xffffffffffffffffUL, TextFormat.ParseUInt64("0xffffffffffffffff")); + Assert.Equal(0x7fffffffffffffffL, TextFormat.ParseInt64("0x7fffffffffffffff")); // Octal - Assert.AreEqual(342391, TextFormat.ParseInt32("01234567")); + Assert.Equal(342391, TextFormat.ParseInt32("01234567")); // Out-of-range - AssertFormatException(() => TextFormat.ParseInt32("2147483648")); - AssertFormatException(() => TextFormat.ParseInt32("-2147483649")); - AssertFormatException(() => TextFormat.ParseUInt32("4294967296")); - AssertFormatException(() => TextFormat.ParseUInt32("-1")); - AssertFormatException(() => TextFormat.ParseInt64("9223372036854775808")); - AssertFormatException(() => TextFormat.ParseInt64("-9223372036854775809")); - AssertFormatException(() => TextFormat.ParseUInt64("18446744073709551616")); - AssertFormatException(() => TextFormat.ParseUInt64("-1")); - AssertFormatException(() => TextFormat.ParseInt32("abcd")); + Assert.Throws(() => TextFormat.ParseInt32("2147483648")); + Assert.Throws(() => TextFormat.ParseInt32("-2147483649")); + Assert.Throws(() => TextFormat.ParseUInt32("4294967296")); + Assert.Throws(() => TextFormat.ParseUInt32("-1")); + Assert.Throws(() => TextFormat.ParseInt64("9223372036854775808")); + Assert.Throws(() => TextFormat.ParseInt64("-9223372036854775809")); + Assert.Throws(() => TextFormat.ParseUInt64("18446744073709551616")); + Assert.Throws(() => TextFormat.ParseUInt64("-1")); + Assert.Throws(() => TextFormat.ParseInt32("abcd")); } - [TestMethod] + [Fact] public void ParseLongString() { string longText = @@ -580,7 +554,7 @@ namespace Google.ProtocolBuffers "123456789012345678901234567890123456789012345678901234567890"; TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("optional_string: \"" + longText + "\"", builder); - Assert.AreEqual(longText, builder.OptionalString); + Assert.Equal(longText, builder.OptionalString); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs b/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs index b5fc606d..f20ba7cb 100644 --- a/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs +++ b/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs @@ -38,27 +38,25 @@ using System; using System.Collections.Generic; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class UnknownFieldSetTest { - private MessageDescriptor descriptor; - private TestAllTypes allFields; - private ByteString allFieldsData; + private readonly MessageDescriptor descriptor; + private readonly TestAllTypes allFields; + private readonly ByteString allFieldsData; /// /// An empty message that has been parsed from allFieldsData. So, it has /// unknown fields of every type. /// - private TestEmptyMessage emptyMessage; + private readonly TestEmptyMessage emptyMessage; - private UnknownFieldSet unknownFields; + private readonly UnknownFieldSet unknownFields; - [TestInitialize] - public void SetUp() + public UnknownFieldSetTest() { descriptor = TestAllTypes.Descriptor; allFields = TestUtil.GetAllSet(); @@ -70,7 +68,7 @@ namespace Google.ProtocolBuffers private UnknownField GetField(String name) { FieldDescriptor field = descriptor.FindDescriptor(name); - Assert.IsNotNull(field); + Assert.NotNull(field); return unknownFields.FieldDictionary[field.FieldNumber]; } @@ -105,75 +103,75 @@ namespace Google.ProtocolBuffers // ================================================================= - [TestMethod] + [Fact] public void Varint() { UnknownField field = GetField("optional_int32"); - Assert.AreEqual(1, field.VarintList.Count); - Assert.AreEqual(allFields.OptionalInt32, (long) field.VarintList[0]); + Assert.Equal(1, field.VarintList.Count); + Assert.Equal(allFields.OptionalInt32, (long) field.VarintList[0]); } - [TestMethod] + [Fact] public void Fixed32() { UnknownField field = GetField("optional_fixed32"); - Assert.AreEqual(1, field.Fixed32List.Count); - Assert.AreEqual(allFields.OptionalFixed32, (int) field.Fixed32List[0]); + Assert.Equal(1, field.Fixed32List.Count); + Assert.Equal(allFields.OptionalFixed32, (int) field.Fixed32List[0]); } - [TestMethod] + [Fact] public void Fixed64() { UnknownField field = GetField("optional_fixed64"); - Assert.AreEqual(1, field.Fixed64List.Count); - Assert.AreEqual((long)allFields.OptionalFixed64, (long)field.Fixed64List[0]); + Assert.Equal(1, field.Fixed64List.Count); + Assert.Equal((long)allFields.OptionalFixed64, (long)field.Fixed64List[0]); } - [TestMethod] + [Fact] public void LengthDelimited() { UnknownField field = GetField("optional_bytes"); - Assert.AreEqual(1, field.LengthDelimitedList.Count); - Assert.AreEqual(allFields.OptionalBytes, field.LengthDelimitedList[0]); + Assert.Equal(1, field.LengthDelimitedList.Count); + Assert.Equal(allFields.OptionalBytes, field.LengthDelimitedList[0]); } - [TestMethod] + [Fact] public void Group() { FieldDescriptor nestedFieldDescriptor = TestAllTypes.Types.OptionalGroup.Descriptor.FindDescriptor("a"); - Assert.IsNotNull(nestedFieldDescriptor); + Assert.NotNull(nestedFieldDescriptor); UnknownField field = GetField("optionalgroup"); - Assert.AreEqual(1, field.GroupList.Count); + Assert.Equal(1, field.GroupList.Count); UnknownFieldSet group = field.GroupList[0]; - Assert.AreEqual(1, group.FieldDictionary.Count); - Assert.IsTrue(group.HasField(nestedFieldDescriptor.FieldNumber)); + Assert.Equal(1, group.FieldDictionary.Count); + Assert.True(group.HasField(nestedFieldDescriptor.FieldNumber)); UnknownField nestedField = group[nestedFieldDescriptor.FieldNumber]; - Assert.AreEqual(1, nestedField.VarintList.Count); - Assert.AreEqual(allFields.OptionalGroup.A, (long) nestedField.VarintList[0]); + Assert.Equal(1, nestedField.VarintList.Count); + Assert.Equal(allFields.OptionalGroup.A, (long) nestedField.VarintList[0]); } - [TestMethod] + [Fact] public void Serialize() { // Check that serializing the UnknownFieldSet produces the original data again. ByteString data = emptyMessage.ToByteString(); - Assert.AreEqual(allFieldsData, data); + Assert.Equal(allFieldsData, data); } - [TestMethod] + [Fact] public void CopyFrom() { TestEmptyMessage message = TestEmptyMessage.CreateBuilder().MergeFrom(emptyMessage).Build(); - Assert.AreEqual(emptyMessage.ToString(), message.ToString()); + Assert.Equal(emptyMessage.ToString(), message.ToString()); } - [TestMethod] + [Fact] public void MergeFrom() { TestEmptyMessage source = @@ -202,7 +200,7 @@ namespace Google.ProtocolBuffers .MergeFrom(source) .Build(); - Assert.AreEqual( + Assert.Equal( "1: 1\n" + "2: 2\n" + "3: 3\n" + @@ -210,23 +208,23 @@ namespace Google.ProtocolBuffers destination.ToString()); } - [TestMethod] + [Fact] public void Clear() { UnknownFieldSet fields = UnknownFieldSet.CreateBuilder().MergeFrom(unknownFields).Clear().Build(); - Assert.AreEqual(0, fields.FieldDictionary.Count); + Assert.Equal(0, fields.FieldDictionary.Count); } - [TestMethod] + [Fact] public void ClearMessage() { TestEmptyMessage message = TestEmptyMessage.CreateBuilder().MergeFrom(emptyMessage).Clear().Build(); - Assert.AreEqual(0, message.SerializedSize); + Assert.Equal(0, message.SerializedSize); } - [TestMethod] + [Fact] public void ParseKnownAndUnknown() { // Test mixing known and unknown fields when parsing. @@ -241,14 +239,14 @@ namespace Google.ProtocolBuffers TestAllTypes destination = TestAllTypes.ParseFrom(data); TestUtil.AssertAllFieldsSet(destination); - Assert.AreEqual(1, destination.UnknownFields.FieldDictionary.Count); + Assert.Equal(1, destination.UnknownFields.FieldDictionary.Count); UnknownField field = destination.UnknownFields[123456]; - Assert.AreEqual(1, field.VarintList.Count); - Assert.AreEqual(654321, (long) field.VarintList[0]); + Assert.Equal(1, field.VarintList.Count); + Assert.Equal(654321, (long) field.VarintList[0]); } - [TestMethod] + [Fact] public void WrongTypeTreatedAsUnknown() { // Test that fields of the wrong wire type are treated like unknown fields @@ -260,10 +258,10 @@ namespace Google.ProtocolBuffers // All fields should have been interpreted as unknown, so the debug strings // should be the same. - Assert.AreEqual(emptyMessage.ToString(), allTypesMessage.ToString()); + Assert.Equal(emptyMessage.ToString(), allTypesMessage.ToString()); } - [TestMethod] + [Fact] public void UnknownExtensions() { // Make sure fields are properly parsed to the UnknownFieldSet even when @@ -272,12 +270,12 @@ namespace Google.ProtocolBuffers TestEmptyMessageWithExtensions message = TestEmptyMessageWithExtensions.ParseFrom(allFieldsData); - Assert.AreEqual(unknownFields.FieldDictionary.Count, + Assert.Equal(unknownFields.FieldDictionary.Count, message.UnknownFields.FieldDictionary.Count); - Assert.AreEqual(allFieldsData, message.ToByteString()); + Assert.Equal(allFieldsData, message.ToByteString()); } - [TestMethod] + [Fact] public void WrongExtensionTypeTreatedAsUnknown() { // Test that fields of the wrong wire type are treated like unknown fields @@ -289,19 +287,19 @@ namespace Google.ProtocolBuffers // All fields should have been interpreted as unknown, so the debug strings // should be the same. - Assert.AreEqual(emptyMessage.ToString(), + Assert.Equal(emptyMessage.ToString(), allExtensionsMessage.ToString()); } - [TestMethod] + [Fact] public void ParseUnknownEnumValue() { FieldDescriptor singularField = TestAllTypes.Descriptor.FindDescriptor("optional_nested_enum"); FieldDescriptor repeatedField = TestAllTypes.Descriptor.FindDescriptor("repeated_nested_enum"); - Assert.IsNotNull(singularField); - Assert.IsNotNull(repeatedField); + Assert.NotNull(singularField); + Assert.NotNull(repeatedField); ByteString data = UnknownFieldSet.CreateBuilder() @@ -322,7 +320,7 @@ namespace Google.ProtocolBuffers { TestAllTypes message = TestAllTypes.ParseFrom(data); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.OptionalNestedEnum); TestUtil.AssertEqual(new[] {TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.BAZ}, message.RepeatedNestedEnumList); @@ -333,7 +331,7 @@ namespace Google.ProtocolBuffers { TestAllExtensions message = TestAllExtensions.ParseFrom(data, TestUtil.CreateExtensionRegistry()); - Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, + Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.OptionalNestedEnumExtension)); TestUtil.AssertEqual(new[] {TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.BAZ}, message.GetExtension(Unittest.RepeatedNestedEnumExtension)); @@ -342,7 +340,7 @@ namespace Google.ProtocolBuffers } } - [TestMethod] + [Fact] public void LargeVarint() { ByteString data = @@ -355,11 +353,11 @@ namespace Google.ProtocolBuffers .ToByteString(); UnknownFieldSet parsed = UnknownFieldSet.ParseFrom(data); UnknownField field = parsed[1]; - Assert.AreEqual(1, field.VarintList.Count); - Assert.AreEqual(0x7FFFFFFFFFFFFFFFUL, field.VarintList[0]); + Assert.Equal(1, field.VarintList.Count); + Assert.Equal(0x7FFFFFFFFFFFFFFFUL, field.VarintList[0]); } - [TestMethod] + [Fact] public void EqualsAndHashCode() { UnknownField fixed32Field = UnknownField.CreateBuilder().AddFixed32(1).Build(); @@ -407,10 +405,10 @@ namespace Google.ProtocolBuffers private static void CheckNotEqual(UnknownFieldSet s1, UnknownFieldSet s2) { String equalsError = string.Format("{0} should not be equal to {1}", s1, s2); - Assert.IsFalse(s1.Equals(s2), equalsError); - Assert.IsFalse(s2.Equals(s1), equalsError); + Assert.False(s1.Equals(s2), equalsError); + Assert.False(s2.Equals(s1), equalsError); - Assert.IsFalse(s1.GetHashCode() == s2.GetHashCode(), + Assert.False(s1.GetHashCode() == s2.GetHashCode(), string.Format("{0} should have a different hash code from {1}", s1, s2)); } @@ -421,13 +419,13 @@ namespace Google.ProtocolBuffers private static void CheckEqualsIsConsistent(UnknownFieldSet set) { // Object should be equal to itself. - Assert.AreEqual(set, set); + Assert.Equal(set, set); // Object should be equal to a copy of itself. UnknownFieldSet copy = UnknownFieldSet.CreateBuilder(set).Build(); - Assert.AreEqual(set, copy); - Assert.AreEqual(copy, set); - Assert.AreEqual(set.GetHashCode(), copy.GetHashCode()); + Assert.Equal(set, copy); + Assert.Equal(copy, set); + Assert.Equal(set.GetHashCode(), copy.GetHashCode()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs b/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs index 05241965..12a9d236 100644 --- a/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs +++ b/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs @@ -38,17 +38,16 @@ using System.IO; using System.Reflection; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class WireFormatTest { /// /// Keeps the attributes on FieldType and the switch statement in WireFormat in sync. /// - [TestMethod] + [Fact] public void FieldTypeToWireTypeMapping() { foreach (FieldInfo field in typeof(FieldType).GetFields(BindingFlags.Static | BindingFlags.Public)) @@ -56,34 +55,34 @@ namespace Google.ProtocolBuffers FieldType fieldType = (FieldType) field.GetValue(null); FieldMappingAttribute mapping = (FieldMappingAttribute) field.GetCustomAttributes(typeof(FieldMappingAttribute), false)[0]; - Assert.AreEqual(mapping.WireType, WireFormat.GetWireType(fieldType)); + Assert.Equal(mapping.WireType, WireFormat.GetWireType(fieldType)); } } - [TestMethod] + [Fact] public void Serialization() { TestAllTypes message = TestUtil.GetAllSet(); ByteString rawBytes = message.ToByteString(); - Assert.AreEqual(rawBytes.Length, message.SerializedSize); + Assert.Equal(rawBytes.Length, message.SerializedSize); TestAllTypes message2 = TestAllTypes.ParseFrom(rawBytes); TestUtil.AssertAllFieldsSet(message2); } - [TestMethod] + [Fact] public void SerializationPacked() { TestPackedTypes message = TestUtil.GetPackedSet(); ByteString rawBytes = message.ToByteString(); - Assert.AreEqual(rawBytes.Length, message.SerializedSize); + Assert.Equal(rawBytes.Length, message.SerializedSize); TestPackedTypes message2 = TestPackedTypes.ParseFrom(rawBytes); TestUtil.AssertPackedFieldsSet(message2); } - [TestMethod] + [Fact] public void SerializeExtensions() { // TestAllTypes and TestAllExtensions should have compatible wire formats, @@ -91,14 +90,14 @@ namespace Google.ProtocolBuffers // it should work. TestAllExtensions message = TestUtil.GetAllExtensionsSet(); ByteString rawBytes = message.ToByteString(); - Assert.AreEqual(rawBytes.Length, message.SerializedSize); + Assert.Equal(rawBytes.Length, message.SerializedSize); TestAllTypes message2 = TestAllTypes.ParseFrom(rawBytes); TestUtil.AssertAllFieldsSet(message2); } - [TestMethod] + [Fact] public void SerializePackedExtensions() { // TestPackedTypes and TestPackedExtensions should have compatible wire @@ -109,10 +108,10 @@ namespace Google.ProtocolBuffers TestPackedTypes message2 = TestUtil.GetPackedSet(); ByteString rawBytes2 = message2.ToByteString(); - Assert.AreEqual(rawBytes, rawBytes2); + Assert.Equal(rawBytes, rawBytes2); } - [TestMethod] + [Fact] public void SerializeDelimited() { MemoryStream stream = new MemoryStream(); @@ -124,13 +123,13 @@ namespace Google.ProtocolBuffers stream.Position = 0; TestUtil.AssertAllFieldsSet(TestAllTypes.ParseDelimitedFrom(stream)); - Assert.AreEqual(12, stream.ReadByte()); + Assert.Equal(12, stream.ReadByte()); TestUtil.AssertPackedFieldsSet(TestPackedTypes.ParseDelimitedFrom(stream)); - Assert.AreEqual(34, stream.ReadByte()); - Assert.AreEqual(-1, stream.ReadByte()); + Assert.Equal(34, stream.ReadByte()); + Assert.Equal(-1, stream.ReadByte()); } - [TestMethod] + [Fact] public void ParseExtensions() { // TestAllTypes and TestAllExtensions should have compatible wire formats, @@ -149,7 +148,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(message2); } - [TestMethod] + [Fact] public void ParsePackedExtensions() { // Ensure that packed extensions can be properly parsed. @@ -162,10 +161,10 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedExtensionsSet(message2); } - [TestMethod] + [Fact] public void ExtensionsSerializedSize() { - Assert.AreEqual(TestUtil.GetAllSet().SerializedSize, TestUtil.GetAllExtensionsSet().SerializedSize); + Assert.Equal(TestUtil.GetAllSet().SerializedSize, TestUtil.GetAllExtensionsSet().SerializedSize); } private static void AssertFieldsInOrder(ByteString data) @@ -177,13 +176,13 @@ namespace Google.ProtocolBuffers string name; while (input.ReadTag(out tag, out name)) { - Assert.IsTrue(tag > previousTag); + Assert.True(tag > previousTag); previousTag = tag; input.SkipField(); } } - [TestMethod] + [Fact] public void InterleavedFieldsAndExtensions() { // Tests that fields are written in order even when extension ranges @@ -214,7 +213,7 @@ namespace Google.ProtocolBuffers private static readonly int TypeId1 = TestMessageSetExtension1.Descriptor.Extensions[0].FieldNumber; private static readonly int TypeId2 = TestMessageSetExtension2.Descriptor.Extensions[0].FieldNumber; - [TestMethod] + [Fact] public void SerializeMessageSet() { // Set up a TestMessageSet with two known messages and an unknown one. @@ -240,23 +239,23 @@ namespace Google.ProtocolBuffers // Parse back using RawMessageSet and check the contents. RawMessageSet raw = RawMessageSet.ParseFrom(data); - Assert.AreEqual(0, raw.UnknownFields.FieldDictionary.Count); + Assert.Equal(0, raw.UnknownFields.FieldDictionary.Count); - Assert.AreEqual(3, raw.ItemCount); - Assert.AreEqual(TypeId1, raw.ItemList[0].TypeId); - Assert.AreEqual(TypeId2, raw.ItemList[1].TypeId); - Assert.AreEqual(UnknownTypeId, raw.ItemList[2].TypeId); + Assert.Equal(3, raw.ItemCount); + Assert.Equal(TypeId1, raw.ItemList[0].TypeId); + Assert.Equal(TypeId2, raw.ItemList[1].TypeId); + Assert.Equal(UnknownTypeId, raw.ItemList[2].TypeId); TestMessageSetExtension1 message1 = TestMessageSetExtension1.ParseFrom(raw.GetItem(0).Message.ToByteArray()); - Assert.AreEqual(123, message1.I); + Assert.Equal(123, message1.I); TestMessageSetExtension2 message2 = TestMessageSetExtension2.ParseFrom(raw.GetItem(1).Message.ToByteArray()); - Assert.AreEqual("foo", message2.Str); + Assert.Equal("foo", message2.Str); - Assert.AreEqual("bar", raw.GetItem(2).Message.ToStringUtf8()); + Assert.Equal("bar", raw.GetItem(2).Message.ToStringUtf8()); } - [TestMethod] + [Fact] public void ParseMessageSet() { ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance(); @@ -295,18 +294,18 @@ namespace Google.ProtocolBuffers TestMessageSet messageSet = TestMessageSet.ParseFrom(data, extensionRegistry); - Assert.AreEqual(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); - Assert.AreEqual("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); + Assert.Equal(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); + Assert.Equal("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); // Check for unknown field with type LENGTH_DELIMITED, // number UNKNOWN_TYPE_ID, and contents "bar". UnknownFieldSet unknownFields = messageSet.UnknownFields; - Assert.AreEqual(1, unknownFields.FieldDictionary.Count); - Assert.IsTrue(unknownFields.HasField(UnknownTypeId)); + Assert.Equal(1, unknownFields.FieldDictionary.Count); + Assert.True(unknownFields.HasField(UnknownTypeId)); UnknownField field = unknownFields[UnknownTypeId]; - Assert.AreEqual(1, field.LengthDelimitedList.Count); - Assert.AreEqual("bar", field.LengthDelimitedList[0].ToStringUtf8()); + Assert.Equal(1, field.LengthDelimitedList.Count); + Assert.Equal("bar", field.LengthDelimitedList[0].ToStringUtf8()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/packages.config b/csharp/src/ProtocolBuffers.Test/packages.config new file mode 100644 index 00000000..6f1fb7f5 --- /dev/null +++ b/csharp/src/ProtocolBuffers.Test/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs index f3a7789e..e0199202 100644 --- a/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs @@ -34,19 +34,15 @@ #endregion -using System; -using System.Collections.Generic; using System.IO; -using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class AbstractBuilderLiteTest { - [TestMethod] + [Fact] public void TestMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -54,7 +50,7 @@ namespace Google.ProtocolBuffers .SetOptionalUint32(uint.MaxValue).Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); using (MemoryStream ms = new MemoryStream(msg.ToByteArray())) { @@ -62,22 +58,22 @@ namespace Google.ProtocolBuffers copy = copy.ToBuilder().MergeFrom(ci).Build(); } - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakClear() { TestAllTypesLite copy, msg = TestAllTypesLite.DefaultInstance; copy = msg.ToBuilder().SetOptionalString("Should be removed.").Build(); - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakClear().WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestBuilderLiteMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -85,14 +81,14 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = copy.ToBuilder().MergeFrom(CodedInputStream.CreateInstance(new MemoryStream(msg.ToByteArray()))).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestBuilderLiteMergeDelimitedFrom() { TestAllTypesLite copy, @@ -100,15 +96,15 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteDelimitedTo(s); s.Position = 0; copy = copy.ToBuilder().MergeDelimitedFrom(s).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestBuilderLiteMergeDelimitedFromExtensions() { TestAllExtensionsLite copy, @@ -117,7 +113,7 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteDelimitedTo(s); @@ -127,11 +123,11 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = copy.ToBuilder().MergeDelimitedFrom(s, registry).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [TestMethod] + [Fact] public void TestBuilderLiteMergeFromStream() { TestAllTypesLite copy, @@ -139,15 +135,15 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteTo(s); s.Position = 0; copy = copy.ToBuilder().MergeFrom(s).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestBuilderLiteMergeFromStreamExtensions() { TestAllExtensionsLite copy, @@ -156,7 +152,7 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteTo(s); @@ -166,11 +162,11 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = copy.ToBuilder().MergeFrom(s, registry).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakMergeFromIMessageLite() { TestAllTypesLite copy, @@ -178,13 +174,13 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom((IMessageLite) msg).WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakMergeFromByteString() { TestAllTypesLite copy, @@ -192,13 +188,13 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString()).WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakMergeFromByteStringExtensions() { TestAllExtensionsLite copy, @@ -207,12 +203,12 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllExtensionsLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString(), ExtensionRegistry.Empty).WeakBuild(); - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestLite.RegisterAllExtensions(registry); @@ -220,11 +216,11 @@ namespace Google.ProtocolBuffers copy = (TestAllExtensionsLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString(), registry).WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -232,7 +228,7 @@ namespace Google.ProtocolBuffers .SetOptionalUint32(uint.MaxValue).Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); using (MemoryStream ms = new MemoryStream(msg.ToByteArray())) { @@ -240,58 +236,58 @@ namespace Google.ProtocolBuffers copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(ci).WeakBuild(); } - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakBuildPartial() { IBuilderLite builder = TestRequiredLite.CreateBuilder(); - Assert.IsFalse(builder.IsInitialized); + Assert.False(builder.IsInitialized); IMessageLite msg = builder.WeakBuildPartial(); - Assert.IsFalse(msg.IsInitialized); + Assert.False(msg.IsInitialized); - TestUtil.AssertBytesEqual(msg.ToByteArray(), TestRequiredLite.DefaultInstance.ToByteArray()); + Assert.Equal(msg.ToByteArray(), TestRequiredLite.DefaultInstance.ToByteArray()); } - [TestMethod, ExpectedException(typeof(UninitializedMessageException))] + [Fact] public void TestIBuilderLiteWeakBuildUninitialized() { IBuilderLite builder = TestRequiredLite.CreateBuilder(); - Assert.IsFalse(builder.IsInitialized); - builder.WeakBuild(); + Assert.False(builder.IsInitialized); + Assert.Throws(() => builder.WeakBuild()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakBuild() { IBuilderLite builder = TestRequiredLite.CreateBuilder() .SetD(0) .SetEn(ExtraEnum.EXLITE_BAZ); - Assert.IsTrue(builder.IsInitialized); + Assert.True(builder.IsInitialized); builder.WeakBuild(); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakClone() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() .SetD(1).SetEn(ExtraEnum.EXLITE_BAR).Build(); - Assert.IsTrue(msg.IsInitialized); + Assert.True(msg.IsInitialized); IMessageLite copy = ((IBuilderLite) msg.ToBuilder()).WeakClone().WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestIBuilderLiteWeakDefaultInstance() { - Assert.IsTrue(ReferenceEquals(TestRequiredLite.DefaultInstance, + Assert.True(ReferenceEquals(TestRequiredLite.DefaultInstance, ((IBuilderLite) TestRequiredLite.CreateBuilder()).WeakDefaultInstanceForType)); } - [TestMethod] + [Fact] public void TestGeneratedBuilderLiteAddRange() { TestAllTypesLite copy, @@ -303,11 +299,11 @@ namespace Google.ProtocolBuffers .Build(); copy = msg.DefaultInstanceForType.ToBuilder().MergeFrom(msg).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } // ROK 5/7/2013 Issue #54: should retire all bytes in buffer (bufferSize) - [TestMethod] + [Fact] public void TestBufferRefillIssue() { var ms = new MemoryStream(); @@ -326,15 +322,15 @@ namespace Google.ProtocolBuffers var input = CodedInputStream.CreateInstance(ms); var builder = BucketOfBytes.CreateBuilder(); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.AreEqual(3005L, input.Position); - Assert.AreEqual(3000, builder.Value.Length); + Assert.Equal(3005L, input.Position); + Assert.Equal(3000, builder.Value.Length); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.AreEqual(5114, input.Position); - Assert.AreEqual(1000, builder.Value.Length); + Assert.Equal(5114, input.Position); + Assert.Equal(1000, builder.Value.Length); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.AreEqual(5217L, input.Position); - Assert.AreEqual(input.Position, ms.Length); - Assert.AreEqual(100, builder.Value.Length); + Assert.Equal(5217L, input.Position); + Assert.Equal(input.Position, ms.Length); + Assert.Equal(100, builder.Value.Length); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs index bead60fb..f6a4e94b 100644 --- a/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs @@ -35,18 +35,15 @@ #endregion using System; -using System.Collections.Generic; using System.IO; -using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class AbstractMessageLiteTest { - [TestMethod] + [Fact] public void TestMessageLiteToByteString() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -55,14 +52,14 @@ namespace Google.ProtocolBuffers .Build(); ByteString b = msg.ToByteString(); - Assert.AreEqual(4, b.Length); - Assert.AreEqual(TestRequiredLite.DFieldNumber << 3, b[0]); - Assert.AreEqual(42, b[1]); - Assert.AreEqual(TestRequiredLite.EnFieldNumber << 3, b[2]); - Assert.AreEqual((int) ExtraEnum.EXLITE_BAZ, b[3]); + Assert.Equal(4, b.Length); + Assert.Equal(TestRequiredLite.DFieldNumber << 3, b[0]); + Assert.Equal(42, b[1]); + Assert.Equal(TestRequiredLite.EnFieldNumber << 3, b[2]); + Assert.Equal((int) ExtraEnum.EXLITE_BAZ, b[3]); } - [TestMethod] + [Fact] public void TestMessageLiteToByteArray() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -72,10 +69,10 @@ namespace Google.ProtocolBuffers ByteString b = msg.ToByteString(); ByteString copy = ByteString.CopyFrom(msg.ToByteArray()); - Assert.AreEqual(b, copy); + Assert.Equal(b, copy); } - [TestMethod] + [Fact] public void TestMessageLiteWriteTo() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -85,10 +82,10 @@ namespace Google.ProtocolBuffers MemoryStream ms = new MemoryStream(); msg.WriteTo(ms); - TestUtil.AssertBytesEqual(msg.ToByteArray(), ms.ToArray()); + Assert.Equal(msg.ToByteArray(), ms.ToArray()); } - [TestMethod] + [Fact] public void TestMessageLiteWriteDelimitedTo() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -100,21 +97,21 @@ namespace Google.ProtocolBuffers msg.WriteDelimitedTo(ms); byte[] buffer = ms.ToArray(); - Assert.AreEqual(5, buffer.Length); - Assert.AreEqual(4, buffer[0]); + Assert.Equal(5, buffer.Length); + Assert.Equal(4, buffer[0]); byte[] msgBytes = new byte[4]; Array.Copy(buffer, 1, msgBytes, 0, 4); - TestUtil.AssertBytesEqual(msg.ToByteArray(), msgBytes); + Assert.Equal(msg.ToByteArray(), msgBytes); } - [TestMethod] + [Fact] public void TestIMessageLiteWeakCreateBuilderForType() { IMessageLite msg = TestRequiredLite.DefaultInstance; - Assert.AreEqual(typeof(TestRequiredLite.Builder), msg.WeakCreateBuilderForType().GetType()); + Assert.Equal(typeof(TestRequiredLite.Builder), msg.WeakCreateBuilderForType().GetType()); } - [TestMethod] + [Fact] public void TestMessageLiteWeakToBuilder() { IMessageLite msg = TestRequiredLite.CreateBuilder() @@ -123,14 +120,14 @@ namespace Google.ProtocolBuffers .Build(); IMessageLite copy = msg.WeakToBuilder().WeakBuild(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestMessageLiteWeakDefaultInstanceForType() { IMessageLite msg = TestRequiredLite.DefaultInstance; - Assert.IsTrue(Object.ReferenceEquals(TestRequiredLite.DefaultInstance, msg.WeakDefaultInstanceForType)); + Assert.True(Object.ReferenceEquals(TestRequiredLite.DefaultInstance, msg.WeakDefaultInstanceForType)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs index 0430c4a1..5377ea6a 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs @@ -35,34 +35,31 @@ #endregion using System; -using System.Collections; using System.Collections.Generic; -using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class ExtendableBuilderLiteTest { - [TestMethod] + [Fact] public void TestHasExtensionT() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 123); - Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestHasExtensionTMissing() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestGetExtensionCountT() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -70,41 +67,41 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2) .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 3); - Assert.AreEqual(3, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(3, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestGetExtensionCountTEmpty() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestGetExtensionTNull() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); string value = builder.GetExtension(UnittestLite.OptionalStringExtensionLite); - Assert.IsNull(value); + Assert.Null(value); } - [TestMethod] + [Fact] public void TestGetExtensionTValue() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 3); - Assert.AreEqual(3, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.Equal(3, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestGetExtensionTEmpty() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.AreEqual(0, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite).Count); + Assert.Equal(0, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite).Count); } - [TestMethod] + [Fact] public void TestGetExtensionTList() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -113,10 +110,10 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 3); IList values = builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite); - Assert.AreEqual(3, values.Count); + Assert.Equal(3, values.Count); } - [TestMethod] + [Fact] public void TestGetExtensionTIndex() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -125,17 +122,17 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2); for (int i = 0; i < 3; i++) - Assert.AreEqual(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.Equal(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); } - [TestMethod, ExpectedException(typeof(ArgumentOutOfRangeException))] + [Fact] public void TestGetExtensionTIndexOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); + Assert.Throws(() => builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); } - [TestMethod] + [Fact] public void TestSetExtensionTIndex() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -144,107 +141,107 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2); for (int i = 0; i < 3; i++) - Assert.AreEqual(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.Equal(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0, 5); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1, 6); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 2, 7); for (int i = 0; i < 3; i++) - Assert.AreEqual(5 + i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.Equal(5 + i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); } - [TestMethod, ExpectedException(typeof(ArgumentOutOfRangeException))] + [Fact] public void TestSetExtensionTIndexOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0, -1); + Assert.Throws(() => builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0, -1)); } - [TestMethod] + [Fact] public void TestClearExtensionTList() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); builder.ClearExtension(UnittestLite.RepeatedInt32ExtensionLite); - Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestClearExtensionTValue() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 0); - Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); builder.ClearExtension(UnittestLite.OptionalInt32ExtensionLite); - Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestIndexedByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); builder[UnittestLite.OptionalInt32ExtensionLite.Descriptor] = 123; - Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.AreEqual(123, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.Equal(123, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestIndexedByDescriptorAndOrdinal() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder[f, 0] = 123; - Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); - Assert.AreEqual(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); + Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); } - [TestMethod, ExpectedException(typeof(ArgumentOutOfRangeException))] + [Fact] public void TestIndexedByDescriptorAndOrdinalOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; - builder[f, 0] = 123; + Assert.Throws(() => builder[f, 0] = 123); } - [TestMethod] + [Fact] public void TestClearFieldByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder.ClearField(f); - Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [TestMethod] + [Fact] public void TestAddRepeatedFieldByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder.AddRepeatedField(f, 123); - Assert.AreEqual(2, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); - Assert.AreEqual(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1)); + Assert.Equal(2, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.Equal(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1)); } - [TestMethod] + [Fact] public void TestMissingExtensionsLite() { const int optionalInt32 = 12345678; @@ -255,21 +252,21 @@ namespace Google.ProtocolBuffers builder.AddExtension(UnittestLite.RepeatedDoubleExtensionLite, 1.3); TestAllExtensionsLite msg = builder.Build(); - Assert.IsTrue(msg.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.AreEqual(3, msg.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); + Assert.True(msg.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.Equal(3, msg.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); byte[] bits = msg.ToByteArray(); TestAllExtensionsLite copy = TestAllExtensionsLite.ParseFrom(bits); - Assert.IsFalse(copy.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.AreEqual(0, copy.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); - Assert.AreNotEqual(msg, copy); + Assert.False(copy.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.Equal(0, copy.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); + Assert.NotEqual(msg, copy); //The lite runtime removes all unknown fields and extensions byte[] copybits = copy.ToByteArray(); - Assert.AreEqual(0, copybits.Length); + Assert.Equal(0, copybits.Length); } - [TestMethod] + [Fact] public void TestMissingFieldsLite() { TestAllTypesLite msg = TestAllTypesLite.CreateBuilder() @@ -278,12 +275,14 @@ namespace Google.ProtocolBuffers .Build(); byte[] bits = msg.ToByteArray(); - TestAllExtensionsLite copy = TestAllExtensionsLite.ParseFrom(bits); - Assert.AreNotEqual(msg, copy); + IMessageLite copy = TestAllExtensionsLite.ParseFrom(bits); + // Use explicit call to Equals to avoid xUnit checking for type equality. + Assert.False(msg.Equals(copy)); + Assert.False(copy.Equals(msg)); //The lite runtime removes all unknown fields and extensions byte[] copybits = copy.ToByteArray(); - Assert.AreEqual(0, copybits.Length); + Assert.Equal(0, copybits.Length); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs index b31fb754..78127445 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs @@ -39,11 +39,10 @@ using System.Collections.Generic; using System.Text; using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class ExtendableMessageLiteTest { //The lite framework does not make this assertion @@ -55,7 +54,7 @@ namespace Google.ProtocolBuffers // ForeignMessageLite.DefaultInstance; //} - [TestMethod] + [Fact] public void ExtensionWriterTestMessages() { TestAllExtensionsLite.Builder b = TestAllExtensionsLite.CreateBuilder().SetExtension( @@ -67,20 +66,20 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = TestAllExtensionsLite.ParseFrom(msg.ToByteArray(), registry); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void ExtensionWriterIsInitialized() { - Assert.IsTrue(ForeignMessageLite.DefaultInstance.IsInitialized); - Assert.IsTrue(TestPackedExtensionsLite.CreateBuilder().IsInitialized); - Assert.IsTrue(TestAllExtensionsLite.CreateBuilder().SetExtension( + Assert.True(ForeignMessageLite.DefaultInstance.IsInitialized); + Assert.True(TestPackedExtensionsLite.CreateBuilder().IsInitialized); + Assert.True(TestAllExtensionsLite.CreateBuilder().SetExtension( UnittestLite.OptionalForeignMessageExtensionLite, ForeignMessageLite.DefaultInstance) .IsInitialized); } - [TestMethod] + [Fact] public void ExtensionWriterTestSetExtensionLists() { TestAllExtensionsLite msg, copy; @@ -96,13 +95,13 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = TestAllExtensionsLite.ParseFrom(msg.ToByteArray(), registry); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_FOO, + Assert.Equal(ForeignEnumLite.FOREIGN_LITE_FOO, copy.GetExtension(UnittestLite.RepeatedForeignEnumExtensionLite, 1)); } - [TestMethod] + [Fact] public void ExtensionWriterTest() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -181,82 +180,82 @@ namespace Google.ProtocolBuffers TestAllExtensionsLite.CreateBuilder().MergeFrom(msg.ToByteArray(), registry); TestAllExtensionsLite copy = copyBuilder.Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.AreEqual(true, copy.GetExtension(UnittestLite.DefaultBoolExtensionLite)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), + Assert.Equal(true, copy.GetExtension(UnittestLite.DefaultBoolExtensionLite)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.DefaultBytesExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultCordExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultDoubleExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultFixed32ExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultFixed64ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultFloatExtensionLite)); - Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultCordExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultDoubleExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultFixed32ExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultFixed64ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultFloatExtensionLite)); + Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.DefaultForeignEnumExtensionLite)); - Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.DefaultImportEnumExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultInt32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultInt64ExtensionLite)); - Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultInt32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultInt64ExtensionLite)); + Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.DefaultNestedEnumExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSfixed32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSfixed64ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSint32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSint64ExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultStringExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultStringPieceExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultUint32ExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultUint64ExtensionLite)); - - Assert.AreEqual(true, copy.GetExtension(UnittestLite.OptionalBoolExtensionLite)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSfixed32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSfixed64ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSint32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSint64ExtensionLite)); + Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultStringExtensionLite)); + Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultStringPieceExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultUint32ExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultUint64ExtensionLite)); + + Assert.Equal(true, copy.GetExtension(UnittestLite.OptionalBoolExtensionLite)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.OptionalBytesExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalCordExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalDoubleExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalFixed32ExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalFixed64ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalFloatExtensionLite)); - Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalCordExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalDoubleExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalFixed32ExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalFixed64ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalFloatExtensionLite)); + Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.OptionalForeignEnumExtensionLite)); - Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.OptionalImportEnumExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalInt64ExtensionLite)); - Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalInt64ExtensionLite)); + Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.OptionalNestedEnumExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSfixed32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSfixed64ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSint32ExtensionLite)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSint64ExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalStringPieceExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalUint32ExtensionLite)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalUint64ExtensionLite)); - - Assert.AreEqual(true, copy.GetExtension(UnittestLite.RepeatedBoolExtensionLite, 0)); - Assert.AreEqual(ByteString.CopyFromUtf8("123"), + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSfixed32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSfixed64ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSint32ExtensionLite)); + Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSint64ExtensionLite)); + Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalStringPieceExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalUint32ExtensionLite)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalUint64ExtensionLite)); + + Assert.Equal(true, copy.GetExtension(UnittestLite.RepeatedBoolExtensionLite, 0)); + Assert.Equal(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.RepeatedBytesExtensionLite, 0)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedCordExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedDoubleExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedFixed32ExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedFixed64ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedFloatExtensionLite, 0)); - Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedCordExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedDoubleExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedFixed32ExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedFixed64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedFloatExtensionLite, 0)); + Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.RepeatedForeignEnumExtensionLite, 0)); - Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.RepeatedImportEnumExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedInt64ExtensionLite, 0)); - Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedInt64ExtensionLite, 0)); + Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.RepeatedNestedEnumExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSfixed32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSfixed64ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSint32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSint64ExtensionLite, 0)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedStringExtensionLite, 0)); - Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedStringPieceExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedUint32ExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedUint64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSfixed32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSfixed64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSint32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSint64ExtensionLite, 0)); + Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedStringExtensionLite, 0)); + Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedStringPieceExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedUint32ExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedUint64ExtensionLite, 0)); } private TestPackedExtensionsLite BuildPackedExtensions() @@ -295,36 +294,36 @@ namespace Google.ProtocolBuffers private void AssertPackedExtensions(TestPackedExtensionsLite copy) { - Assert.AreEqual(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 0)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 0)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 0)); - - Assert.AreEqual(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 1)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 1)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 1)); - Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 1)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 1)); - Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 1)); + Assert.Equal(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 0)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 0)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 0)); + + Assert.Equal(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 1)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 1)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 1)); + Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 1)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 1)); + Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 1)); } - [TestMethod] + [Fact] public void ExtensionWriterTestPacked() { TestPackedExtensionsLite msg = BuildPackedExtensions(); @@ -336,12 +335,12 @@ namespace Google.ProtocolBuffers TestPackedExtensionsLite.CreateBuilder().MergeFrom(msg.ToByteArray(), registry); TestPackedExtensionsLite copy = copyBuilder.Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); AssertPackedExtensions(copy); } - [TestMethod] + [Fact] public void TestUnpackedAndPackedExtensions() { TestPackedExtensionsLite original = BuildPackedExtensions(); @@ -355,19 +354,19 @@ namespace Google.ProtocolBuffers TestPackedExtensionsLite packed = TestPackedExtensionsLite.ParseFrom(unpacked.ToByteArray(), registry); - Assert.AreEqual(original, packed); - TestUtil.AssertBytesEqual(original.ToByteArray(), packed.ToByteArray()); + Assert.Equal(original, packed); + Assert.Equal(original.ToByteArray(), packed.ToByteArray()); AssertPackedExtensions(packed); } - [TestMethod] + [Fact] public void TestUnpackedFromPackedInput() { byte[] packedData = BuildPackedExtensions().ToByteArray(); TestUnpackedTypesLite unpacked = TestUnpackedTypesLite.ParseFrom(packedData); TestPackedTypesLite packed = TestPackedTypesLite.ParseFrom(unpacked.ToByteArray()); - TestUtil.AssertBytesEqual(packedData, packed.ToByteArray()); + Assert.Equal(packedData, packed.ToByteArray()); unpacked = TestUnpackedTypesLite.ParseFrom(packed.ToByteArray()); diff --git a/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs index 0640a445..7feb0448 100644 --- a/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs @@ -35,31 +35,28 @@ #endregion using System; -using System.Collections.Generic; -using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class InteropLiteTest { - [TestMethod] + [Fact] public void TestConvertFromFullMinimal() { TestInteropPerson person = TestInteropPerson.CreateBuilder() .SetId(123) .SetName("abc") .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray()); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestConvertFromFullComplete() { TestInteropPerson person = TestInteropPerson.CreateBuilder() @@ -75,7 +72,7 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasFull.EmployeeId, TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasLite.RegisterAllExtensions(registry); @@ -84,24 +81,24 @@ namespace Google.ProtocolBuffers TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(fullBytes, registry); byte[] liteBytes = copy.ToByteArray(); - TestUtil.AssertBytesEqual(fullBytes, liteBytes); + Assert.Equal(fullBytes, liteBytes); } - [TestMethod] + [Fact] public void TestConvertFromLiteMinimal() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() .SetId(123) .SetName("abc") .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray()); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestConvertFromLiteComplete() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() @@ -117,14 +114,14 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasLite.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); } public ByteString AllBytes @@ -138,7 +135,7 @@ namespace Google.ProtocolBuffers } } - [TestMethod] + [Fact] public void TestCompareStringValues() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() @@ -156,14 +153,14 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasLite.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); TestInteropPerson.Builder copyBuilder = TestInteropPerson.CreateBuilder(); TextFormat.Merge( @@ -171,7 +168,7 @@ namespace Google.ProtocolBuffers "[protobuf_unittest_extra.employee_id]"), registry, copyBuilder); copy = copyBuilder.Build(); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); string liteText = person.ToString().TrimEnd().Replace("\r", ""); string fullText = copy.ToString().TrimEnd().Replace("\r", ""); @@ -179,10 +176,10 @@ namespace Google.ProtocolBuffers liteText = liteText.Replace("[protobuf_unittest_extra.employee_id_lite]", "[protobuf_unittest_extra.employee_id]"); //lite version does not indent - while (fullText.IndexOf("\n ") >= 0) + while (fullText.IndexOf("\n ", StringComparison.Ordinal) >= 0) fullText = fullText.Replace("\n ", "\n"); - Assert.AreEqual(fullText, liteText); + Assert.Equal(fullText, liteText); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs index 9ef5cc84..8ffd3ee2 100644 --- a/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs @@ -34,12 +34,8 @@ #endregion -using System; -using System.Collections.Generic; -using System.IO; -using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { @@ -47,10 +43,9 @@ namespace Google.ProtocolBuffers /// Miscellaneous tests for message operations that apply to both /// generated and dynamic messages. /// - [TestClass] public class LiteTest { - [TestMethod] + [Fact] public void TestLite() { // Since lite messages are a subset of regular messages, we can mostly @@ -73,13 +68,13 @@ namespace Google.ProtocolBuffers TestAllTypesLite message2 = TestAllTypesLite.ParseFrom(data); - Assert.AreEqual(123, message2.OptionalInt32); - Assert.AreEqual(1, message2.RepeatedStringCount); - Assert.AreEqual("hello", message2.RepeatedStringList[0]); - Assert.AreEqual(7, message2.OptionalNestedMessage.Bb); + Assert.Equal(123, message2.OptionalInt32); + Assert.Equal(1, message2.RepeatedStringCount); + Assert.Equal("hello", message2.RepeatedStringList[0]); + Assert.Equal(7, message2.OptionalNestedMessage.Bb); } - [TestMethod] + [Fact] public void TestLiteExtensions() { // TODO(kenton): Unlike other features of the lite library, extensions are @@ -101,17 +96,17 @@ namespace Google.ProtocolBuffers // writing, parsing hasn't been implemented yet. TestAllExtensionsLite message2 = message.ToBuilder().Build(); - Assert.AreEqual(123, (int) message2.GetExtension( + Assert.Equal(123, (int) message2.GetExtension( UnittestLite.OptionalInt32ExtensionLite)); - Assert.AreEqual(1, message2.GetExtensionCount( + Assert.Equal(1, message2.GetExtensionCount( UnittestLite.RepeatedStringExtensionLite)); - Assert.AreEqual(1, message2.GetExtension( + Assert.Equal(1, message2.GetExtension( UnittestLite.RepeatedStringExtensionLite).Count); - Assert.AreEqual("hello", message2.GetExtension( + Assert.Equal("hello", message2.GetExtension( UnittestLite.RepeatedStringExtensionLite, 0)); - Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.BAZ, message2.GetExtension( + Assert.Equal(TestAllTypesLite.Types.NestedEnum.BAZ, message2.GetExtension( UnittestLite.OptionalNestedEnumExtensionLite)); - Assert.AreEqual(7, message2.GetExtension( + Assert.Equal(7, message2.GetExtension( UnittestLite.OptionalNestedMessageExtensionLite).Bb); } } diff --git a/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs b/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs index b70635d5..b9680e68 100644 --- a/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs @@ -34,17 +34,14 @@ #endregion -using System.IO; -using Microsoft.VisualStudio.TestTools.UnitTesting; -using System.Collections.Generic; using Google.ProtocolBuffers.TestProtos; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class MissingFieldAndExtensionTest { - [TestMethod] + [Fact] public void TestRecoverMissingExtensions() { const int optionalInt32 = 12345678; @@ -55,42 +52,42 @@ namespace Google.ProtocolBuffers builder.AddExtension(Unittest.RepeatedDoubleExtension, 1.3); TestAllExtensions msg = builder.Build(); - Assert.IsTrue(msg.HasExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(3, msg.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.True(msg.HasExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(3, msg.GetExtensionCount(Unittest.RepeatedDoubleExtension)); byte[] bits = msg.ToByteArray(); TestAllExtensions copy = TestAllExtensions.ParseFrom(bits); - Assert.IsFalse(copy.HasExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(0, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.AreNotEqual(msg, copy); + Assert.False(copy.HasExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(0, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.NotEqual(msg, copy); //Even though copy does not understand the typees they serialize correctly byte[] copybits = copy.ToByteArray(); - TestUtil.AssertBytesEqual(bits, copybits); + Assert.Equal(bits, copybits); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); Unittest.RegisterAllExtensions(registry); //Now we can take those copy bits and restore the full message with extensions copy = TestAllExtensions.ParseFrom(copybits, registry); - Assert.IsTrue(copy.HasExtension(Unittest.OptionalInt32Extension)); - Assert.AreEqual(3, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.True(copy.HasExtension(Unittest.OptionalInt32Extension)); + Assert.Equal(3, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.AreEqual(msg, copy); - TestUtil.AssertBytesEqual(bits, copy.ToByteArray()); + Assert.Equal(msg, copy); + Assert.Equal(bits, copy.ToByteArray()); //If we modify the object this should all continue to work as before copybits = copy.ToBuilder().Build().ToByteArray(); - TestUtil.AssertBytesEqual(bits, copybits); + Assert.Equal(bits, copybits); //If we replace extension the object this should all continue to work as before copybits = copy.ToBuilder() .SetExtension(Unittest.OptionalInt32Extension, optionalInt32) .Build().ToByteArray(); - TestUtil.AssertBytesEqual(bits, copybits); + Assert.Equal(bits, copybits); } - [TestMethod] + [Fact] public void TestRecoverMissingFields() { TestMissingFieldsA msga = TestMissingFieldsA.CreateBuilder() @@ -101,53 +98,53 @@ namespace Google.ProtocolBuffers //serialize to type B and verify all fields exist TestMissingFieldsB msgb = TestMissingFieldsB.ParseFrom(msga.ToByteArray()); - Assert.AreEqual(1001, msgb.Id); - Assert.AreEqual("Name", msgb.Name); - Assert.IsFalse(msgb.HasWebsite); - Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); - Assert.AreEqual("missing@field.value", + Assert.Equal(1001, msgb.Id); + Assert.Equal("Name", msgb.Name); + Assert.False(msgb.HasWebsite); + Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.Equal("missing@field.value", msgb.UnknownFields[TestMissingFieldsA.EmailFieldNumber].LengthDelimitedList[0].ToStringUtf8()); //serializes exactly the same (at least for this simple example) - TestUtil.AssertBytesEqual(msga.ToByteArray(), msgb.ToByteArray()); - Assert.AreEqual(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); + Assert.Equal(msga.ToByteArray(), msgb.ToByteArray()); + Assert.Equal(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); //now re-create an exact copy of A from serialized B TestMissingFieldsA copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.AreEqual(msga, copya); - Assert.AreEqual(1001, copya.Id); - Assert.AreEqual("Name", copya.Name); - Assert.AreEqual("missing@field.value", copya.Email); + Assert.Equal(msga, copya); + Assert.Equal(1001, copya.Id); + Assert.Equal("Name", copya.Name); + Assert.Equal("missing@field.value", copya.Email); //Now we modify B... and try again msgb = msgb.ToBuilder().SetWebsite("http://new.missing.field").Build(); //Does B still have the missing field? - Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); //Convert back to A and see if all fields are there? copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.AreNotEqual(msga, copya); - Assert.AreEqual(1001, copya.Id); - Assert.AreEqual("Name", copya.Name); - Assert.AreEqual("missing@field.value", copya.Email); - Assert.AreEqual(1, copya.UnknownFields.FieldDictionary.Count); - Assert.AreEqual("http://new.missing.field", + Assert.NotEqual(msga, copya); + Assert.Equal(1001, copya.Id); + Assert.Equal("Name", copya.Name); + Assert.Equal("missing@field.value", copya.Email); + Assert.Equal(1, copya.UnknownFields.FieldDictionary.Count); + Assert.Equal("http://new.missing.field", copya.UnknownFields[TestMissingFieldsB.WebsiteFieldNumber].LengthDelimitedList[0]. ToStringUtf8()); //Lastly we can even still trip back to type B and see all fields: TestMissingFieldsB copyb = TestMissingFieldsB.ParseFrom(copya.ToByteArray()); - Assert.AreEqual(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. - Assert.AreEqual(1001, copyb.Id); - Assert.AreEqual("Name", copyb.Name); - Assert.AreEqual("http://new.missing.field", copyb.Website); - Assert.AreEqual(1, copyb.UnknownFields.FieldDictionary.Count); - Assert.AreEqual("missing@field.value", + Assert.Equal(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. + Assert.Equal(1001, copyb.Id); + Assert.Equal("Name", copyb.Name); + Assert.Equal("http://new.missing.field", copyb.Website); + Assert.Equal(1, copyb.UnknownFields.FieldDictionary.Count); + Assert.Equal("missing@field.value", copyb.UnknownFields[TestMissingFieldsA.EmailFieldNumber].LengthDelimitedList[0].ToStringUtf8 ()); } - [TestMethod] + [Fact] public void TestRecoverMissingMessage() { TestMissingFieldsA.Types.SubA suba = @@ -161,52 +158,52 @@ namespace Google.ProtocolBuffers //serialize to type B and verify all fields exist TestMissingFieldsB msgb = TestMissingFieldsB.ParseFrom(msga.ToByteArray()); - Assert.AreEqual(1001, msgb.Id); - Assert.AreEqual("Name", msgb.Name); - Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); - Assert.AreEqual(suba.ToString(), + Assert.Equal(1001, msgb.Id); + Assert.Equal("Name", msgb.Name); + Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.Equal(suba.ToString(), TestMissingFieldsA.Types.SubA.ParseFrom( msgb.UnknownFields[TestMissingFieldsA.TestAFieldNumber].LengthDelimitedList[0]).ToString ()); //serializes exactly the same (at least for this simple example) - TestUtil.AssertBytesEqual(msga.ToByteArray(), msgb.ToByteArray()); - Assert.AreEqual(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); + Assert.Equal(msga.ToByteArray(), msgb.ToByteArray()); + Assert.Equal(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); //now re-create an exact copy of A from serialized B TestMissingFieldsA copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.AreEqual(msga, copya); - Assert.AreEqual(1001, copya.Id); - Assert.AreEqual("Name", copya.Name); - Assert.AreEqual(suba, copya.TestA); + Assert.Equal(msga, copya); + Assert.Equal(1001, copya.Id); + Assert.Equal("Name", copya.Name); + Assert.Equal(suba, copya.TestA); //Now we modify B... and try again TestMissingFieldsB.Types.SubB subb = TestMissingFieldsB.Types.SubB.CreateBuilder().AddValues("test-b").Build(); msgb = msgb.ToBuilder().SetTestB(subb).Build(); //Does B still have the missing field? - Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); //Convert back to A and see if all fields are there? copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.AreNotEqual(msga, copya); - Assert.AreEqual(1001, copya.Id); - Assert.AreEqual("Name", copya.Name); - Assert.AreEqual(suba, copya.TestA); - Assert.AreEqual(1, copya.UnknownFields.FieldDictionary.Count); - TestUtil.AssertBytesEqual(subb.ToByteArray(), + Assert.NotEqual(msga, copya); + Assert.Equal(1001, copya.Id); + Assert.Equal("Name", copya.Name); + Assert.Equal(suba, copya.TestA); + Assert.Equal(1, copya.UnknownFields.FieldDictionary.Count); + Assert.Equal(subb.ToByteArray(), copya.UnknownFields[TestMissingFieldsB.TestBFieldNumber].LengthDelimitedList[0].ToByteArray()); //Lastly we can even still trip back to type B and see all fields: TestMissingFieldsB copyb = TestMissingFieldsB.ParseFrom(copya.ToByteArray()); - Assert.AreEqual(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. - Assert.AreEqual(1001, copyb.Id); - Assert.AreEqual("Name", copyb.Name); - Assert.AreEqual(subb, copyb.TestB); - Assert.AreEqual(1, copyb.UnknownFields.FieldDictionary.Count); + Assert.Equal(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. + Assert.Equal(1001, copyb.Id); + Assert.Equal("Name", copyb.Name); + Assert.Equal(subb, copyb.TestB); + Assert.Equal(1, copyb.UnknownFields.FieldDictionary.Count); } - [TestMethod] + [Fact] public void TestRestoreFromOtherType() { TestInteropPerson person = TestInteropPerson.CreateBuilder() @@ -222,19 +219,19 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasFull.EmployeeId, TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.IsTrue(person.IsInitialized); + Assert.True(person.IsInitialized); TestEmptyMessage temp = TestEmptyMessage.ParseFrom(person.ToByteArray()); - Assert.AreEqual(7, temp.UnknownFields.FieldDictionary.Count); + Assert.Equal(7, temp.UnknownFields.FieldDictionary.Count); temp = temp.ToBuilder().Build(); - Assert.AreEqual(7, temp.UnknownFields.FieldDictionary.Count); + Assert.Equal(7, temp.UnknownFields.FieldDictionary.Count); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(temp.ToByteArray(), registry); - Assert.AreEqual(person, copy); - TestUtil.AssertBytesEqual(person.ToByteArray(), copy.ToByteArray()); + Assert.Equal(person, copy); + Assert.Equal(person.ToByteArray(), copy.ToByteArray()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 12315442..8acc1fb1 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -1,9 +1,8 @@  + + - CLIENTPROFILE - NET35 - TEST Debug AnyCPU 9.0.30729 @@ -13,12 +12,13 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffersLite.Test - v4.0 + v4.5 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 - Client + + true @@ -32,6 +32,7 @@ true true Off + false pdbonly @@ -44,32 +45,23 @@ true true Off + false - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - - Microsoft.VisualStudio.TestTools.cs - Properties\AssemblyInfo.cs @@ -83,7 +75,6 @@ - @@ -96,7 +87,9 @@ True - + + + - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index f7772f39..5f1a7ba3 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -1,9 +1,8 @@  + + - CLIENTPROFILE - NET35 - TEST Debug AnyCPU 9.0.30729 @@ -13,12 +12,13 @@ Properties Google.ProtocolBuffers Google.ProtocolBuffersMixedLite.Test - v4.0 + v4.5 512 true ..\..\keys\Google.ProtocolBuffers.snk 3.5 - Client + + true @@ -32,6 +32,7 @@ true true Off + false pdbonly @@ -44,32 +45,23 @@ true true Off + false - - - - False - ..\..\lib\NUnit\lib\nunit.framework.dll + + ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.Silverlight.Testing.dll + + ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll - - False - ..\..\lib\Microsoft.Silverlight.Testing\April2010\Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll + + ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll - - Microsoft.VisualStudio.TestTools.cs - Properties\AssemblyInfo.cs @@ -90,7 +82,6 @@ - @@ -98,7 +89,9 @@ ProtocolBuffers - + + + - - Program - $(ProjectDir)..\..\lib\NUnit\tools\nunit-console.exe - /nologo /noshadow /labels /wait $(AssemblyName).dll - $(ProjectDir)$(OutputPath) - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs b/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs index e44a72a8..e4f9acff 100644 --- a/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs +++ b/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs @@ -35,67 +35,66 @@ #endregion using Google.ProtocolBuffers.TestProtos; -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Xunit; namespace Google.ProtocolBuffers { - [TestClass] public class TestLiteByApi { - [TestMethod] + [Fact] public void TestAllTypesEquality() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; TestAllTypesLite copy = msg.ToBuilder().Build(); - Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsTrue(msg.Equals(copy)); + Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); + Assert.True(msg.Equals(copy)); msg = msg.ToBuilder().SetOptionalString("Hi").Build(); - Assert.AreNotEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsFalse(msg.Equals(copy)); + Assert.NotEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.False(msg.Equals(copy)); copy = copy.ToBuilder().SetOptionalString("Hi").Build(); - Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsTrue(msg.Equals(copy)); + Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); + Assert.True(msg.Equals(copy)); } - [TestMethod] + [Fact] public void TestEqualityOnExtensions() { TestAllExtensionsLite msg = TestAllExtensionsLite.DefaultInstance; TestAllExtensionsLite copy = msg.ToBuilder().Build(); - Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsTrue(msg.Equals(copy)); + Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); + Assert.True(msg.Equals(copy)); msg = msg.ToBuilder().SetExtension(UnittestLite.OptionalStringExtensionLite, "Hi").Build(); - Assert.AreNotEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsFalse(msg.Equals(copy)); + Assert.NotEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.False(msg.Equals(copy)); copy = copy.ToBuilder().SetExtension(UnittestLite.OptionalStringExtensionLite, "Hi").Build(); - Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.IsTrue(msg.Equals(copy)); + Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); + Assert.True(msg.Equals(copy)); } - [TestMethod] + [Fact] public void TestAllTypesToString() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; TestAllTypesLite copy = msg.ToBuilder().Build(); - Assert.AreEqual(msg.ToString(), copy.ToString()); - Assert.AreEqual(0, msg.ToString().Length); + Assert.Equal(msg.ToString(), copy.ToString()); + Assert.Equal(0, msg.ToString().Length); msg = msg.ToBuilder().SetOptionalInt32(-1).Build(); - Assert.AreEqual("optional_int32: -1", msg.ToString().TrimEnd()); + Assert.Equal("optional_int32: -1", msg.ToString().TrimEnd()); msg = msg.ToBuilder().SetOptionalString("abc123").Build(); - Assert.AreEqual("optional_int32: -1\noptional_string: \"abc123\"", + Assert.Equal("optional_int32: -1\noptional_string: \"abc123\"", msg.ToString().Replace("\r", "").TrimEnd()); } - [TestMethod] + [Fact] public void TestAllTypesDefaultedRoundTrip() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; - Assert.IsTrue(msg.IsInitialized); + Assert.True(msg.IsInitialized); TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } - [TestMethod] + [Fact] public void TestAllTypesModifiedRoundTrip() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; @@ -115,7 +114,7 @@ namespace Google.ProtocolBuffers .AddRepeatedGroup(TestAllTypesLite.Types.RepeatedGroup.CreateBuilder().SetA('A').Build()) ; TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build(); - TestUtil.AssertBytesEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/TestUtil.cs b/csharp/src/ProtocolBuffersLite.Test/TestUtil.cs deleted file mode 100644 index 44c09b9c..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/TestUtil.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Google.ProtocolBuffers -{ - class TestUtil - { - internal static void AssertBytesEqual(byte[] a, byte[] b) - { - if (a == null || b == null) - { - Assert.AreEqual(a, b); - } - else - { - Assert.AreEqual(a.Length, b.Length, "The byte[] is not of the expected length."); - - for (int i = 0; i < a.Length; i++) - { - if (a[i] != b[i]) - { - Assert.AreEqual(a[i], b[i], "Byte[] differs at index " + i); - } - } - } - } - - } -} diff --git a/csharp/src/ProtocolBuffersLite.Test/packages.config b/csharp/src/ProtocolBuffersLite.Test/packages.config new file mode 100644 index 00000000..6f1fb7f5 --- /dev/null +++ b/csharp/src/ProtocolBuffersLite.Test/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/csharp/src/packages/repositories.config b/csharp/src/packages/repositories.config new file mode 100644 index 00000000..0117aa7c --- /dev/null +++ b/csharp/src/packages/repositories.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file -- cgit v1.2.3 From 6e1ec5f6eaf79563aba0d220e36547afe15f0dd6 Mon Sep 17 00:00:00 2001 From: Jie Luo Date: Thu, 30 Apr 2015 18:19:50 -0700 Subject: fix commends from Jon Skeet --- csharp/src/AddressBook/AddressBook.csproj | 20 + csharp/src/AddressBook/app.config | 15 +- .../src/ProtocolBuffers.Test/FieldPresenceTest.cs | 46 +- .../TestProtos/FieldPresence.cs | 783 +++++++++++++++++++++ .../TestProtos/FieldPresense.cs | 783 --------------------- .../ProtocolBuffers/Descriptors/FileDescriptor.cs | 11 +- .../FieldAccess/FieldAccessorTable.cs | 6 +- .../FieldAccess/SinglePrimitiveAccessor.cs | 12 +- 8 files changed, 845 insertions(+), 831 deletions(-) create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresense.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/AddressBook/AddressBook.csproj b/csharp/src/AddressBook/AddressBook.csproj index 52b82a8f..5140e1eb 100644 --- a/csharp/src/AddressBook/AddressBook.csproj +++ b/csharp/src/AddressBook/AddressBook.csproj @@ -1,5 +1,6 @@  + Debug AnyCPU @@ -14,6 +15,8 @@ 512 Google.ProtocolBuffers.Examples.AddressBook.Program Client + + true @@ -45,6 +48,14 @@ + + ..\packages\xunit.1.9.2\lib\net20\xunit.dll + True + + + ..\packages\xunit.should.1.1\lib\net35\xunit.should.dll + True + @@ -62,8 +73,17 @@ + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs b/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs index 5fa22fef..bd1d2c65 100644 --- a/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs +++ b/csharp/src/ProtocolBuffers.Test/ReflectionTester.cs @@ -37,7 +37,7 @@ using System; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; #pragma warning disable 618 // Disable warning about obsolete use miss-matched assert arguments @@ -97,7 +97,7 @@ namespace Google.ProtocolBuffers this.extensionRegistry = extensionRegistry; this.file = baseDescriptor.File; - Assert.Equal(1, file.Dependencies.Count); + Assert.AreEqual(1, file.Dependencies.Count); this.importFile = file.Dependencies[0]; MessageDescriptor testAllTypes; @@ -449,199 +449,199 @@ namespace Google.ProtocolBuffers /// public void AssertAllFieldsSetViaReflection(IMessage message) { - Assert.True(message.HasField(f("optional_int32"))); - Assert.True(message.HasField(f("optional_int64"))); - Assert.True(message.HasField(f("optional_uint32"))); - Assert.True(message.HasField(f("optional_uint64"))); - Assert.True(message.HasField(f("optional_sint32"))); - Assert.True(message.HasField(f("optional_sint64"))); - Assert.True(message.HasField(f("optional_fixed32"))); - Assert.True(message.HasField(f("optional_fixed64"))); - Assert.True(message.HasField(f("optional_sfixed32"))); - Assert.True(message.HasField(f("optional_sfixed64"))); - Assert.True(message.HasField(f("optional_float"))); - Assert.True(message.HasField(f("optional_double"))); - Assert.True(message.HasField(f("optional_bool"))); - Assert.True(message.HasField(f("optional_string"))); - Assert.True(message.HasField(f("optional_bytes"))); - - Assert.True(message.HasField(f("optionalgroup"))); - Assert.True(message.HasField(f("optional_nested_message"))); - Assert.True(message.HasField(f("optional_foreign_message"))); - Assert.True(message.HasField(f("optional_import_message"))); - - Assert.True(((IMessage) message[f("optionalgroup")]).HasField(groupA)); - Assert.True(((IMessage) message[f("optional_nested_message")]).HasField(nestedB)); - Assert.True(((IMessage) message[f("optional_foreign_message")]).HasField(foreignC)); - Assert.True(((IMessage) message[f("optional_import_message")]).HasField(importD)); - - Assert.True(message.HasField(f("optional_nested_enum"))); - Assert.True(message.HasField(f("optional_foreign_enum"))); - Assert.True(message.HasField(f("optional_import_enum"))); - - Assert.True(message.HasField(f("optional_string_piece"))); - Assert.True(message.HasField(f("optional_cord"))); - - Assert.Equal(101, message[f("optional_int32")]); - Assert.Equal(102L, message[f("optional_int64")]); - Assert.Equal(103u, message[f("optional_uint32")]); - Assert.Equal(104UL, message[f("optional_uint64")]); - Assert.Equal(105, message[f("optional_sint32")]); - Assert.Equal(106L, message[f("optional_sint64")]); - Assert.Equal(107U, message[f("optional_fixed32")]); - Assert.Equal(108UL, message[f("optional_fixed64")]); - Assert.Equal(109, message[f("optional_sfixed32")]); - Assert.Equal(110L, message[f("optional_sfixed64")]); - Assert.Equal(111F, message[f("optional_float")]); - Assert.Equal(112D, message[f("optional_double")]); - Assert.Equal(true, message[f("optional_bool")]); - Assert.Equal("115", message[f("optional_string")]); - Assert.Equal(TestUtil.ToBytes("116"), message[f("optional_bytes")]); - - Assert.Equal(117, ((IMessage) message[f("optionalgroup")])[groupA]); - Assert.Equal(118, ((IMessage) message[f("optional_nested_message")])[nestedB]); - Assert.Equal(119, ((IMessage) message[f("optional_foreign_message")])[foreignC]); - Assert.Equal(120, ((IMessage) message[f("optional_import_message")])[importD]); - - Assert.Equal(nestedBaz, message[f("optional_nested_enum")]); - Assert.Equal(foreignBaz, message[f("optional_foreign_enum")]); - Assert.Equal(importBaz, message[f("optional_import_enum")]); - - Assert.Equal("124", message[f("optional_string_piece")]); - Assert.Equal("125", message[f("optional_cord")]); + Assert.IsTrue(message.HasField(f("optional_int32"))); + Assert.IsTrue(message.HasField(f("optional_int64"))); + Assert.IsTrue(message.HasField(f("optional_uint32"))); + Assert.IsTrue(message.HasField(f("optional_uint64"))); + Assert.IsTrue(message.HasField(f("optional_sint32"))); + Assert.IsTrue(message.HasField(f("optional_sint64"))); + Assert.IsTrue(message.HasField(f("optional_fixed32"))); + Assert.IsTrue(message.HasField(f("optional_fixed64"))); + Assert.IsTrue(message.HasField(f("optional_sfixed32"))); + Assert.IsTrue(message.HasField(f("optional_sfixed64"))); + Assert.IsTrue(message.HasField(f("optional_float"))); + Assert.IsTrue(message.HasField(f("optional_double"))); + Assert.IsTrue(message.HasField(f("optional_bool"))); + Assert.IsTrue(message.HasField(f("optional_string"))); + Assert.IsTrue(message.HasField(f("optional_bytes"))); + + Assert.IsTrue(message.HasField(f("optionalgroup"))); + Assert.IsTrue(message.HasField(f("optional_nested_message"))); + Assert.IsTrue(message.HasField(f("optional_foreign_message"))); + Assert.IsTrue(message.HasField(f("optional_import_message"))); + + Assert.IsTrue(((IMessage) message[f("optionalgroup")]).HasField(groupA)); + Assert.IsTrue(((IMessage) message[f("optional_nested_message")]).HasField(nestedB)); + Assert.IsTrue(((IMessage) message[f("optional_foreign_message")]).HasField(foreignC)); + Assert.IsTrue(((IMessage) message[f("optional_import_message")]).HasField(importD)); + + Assert.IsTrue(message.HasField(f("optional_nested_enum"))); + Assert.IsTrue(message.HasField(f("optional_foreign_enum"))); + Assert.IsTrue(message.HasField(f("optional_import_enum"))); + + Assert.IsTrue(message.HasField(f("optional_string_piece"))); + Assert.IsTrue(message.HasField(f("optional_cord"))); + + Assert.AreEqual(101, message[f("optional_int32")]); + Assert.AreEqual(102L, message[f("optional_int64")]); + Assert.AreEqual(103u, message[f("optional_uint32")]); + Assert.AreEqual(104UL, message[f("optional_uint64")]); + Assert.AreEqual(105, message[f("optional_sint32")]); + Assert.AreEqual(106L, message[f("optional_sint64")]); + Assert.AreEqual(107U, message[f("optional_fixed32")]); + Assert.AreEqual(108UL, message[f("optional_fixed64")]); + Assert.AreEqual(109, message[f("optional_sfixed32")]); + Assert.AreEqual(110L, message[f("optional_sfixed64")]); + Assert.AreEqual(111F, message[f("optional_float")]); + Assert.AreEqual(112D, message[f("optional_double")]); + Assert.AreEqual(true, message[f("optional_bool")]); + Assert.AreEqual("115", message[f("optional_string")]); + Assert.AreEqual(TestUtil.ToBytes("116"), message[f("optional_bytes")]); + + Assert.AreEqual(117, ((IMessage) message[f("optionalgroup")])[groupA]); + Assert.AreEqual(118, ((IMessage) message[f("optional_nested_message")])[nestedB]); + Assert.AreEqual(119, ((IMessage) message[f("optional_foreign_message")])[foreignC]); + Assert.AreEqual(120, ((IMessage) message[f("optional_import_message")])[importD]); + + Assert.AreEqual(nestedBaz, message[f("optional_nested_enum")]); + Assert.AreEqual(foreignBaz, message[f("optional_foreign_enum")]); + Assert.AreEqual(importBaz, message[f("optional_import_enum")]); + + Assert.AreEqual("124", message[f("optional_string_piece")]); + Assert.AreEqual("125", message[f("optional_cord")]); // ----------------------------------------------------------------- - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_cord"))); - - Assert.Equal(201, message[f("repeated_int32"), 0]); - Assert.Equal(202L, message[f("repeated_int64"), 0]); - Assert.Equal(203U, message[f("repeated_uint32"), 0]); - Assert.Equal(204UL, message[f("repeated_uint64"), 0]); - Assert.Equal(205, message[f("repeated_sint32"), 0]); - Assert.Equal(206L, message[f("repeated_sint64"), 0]); - Assert.Equal(207U, message[f("repeated_fixed32"), 0]); - Assert.Equal(208UL, message[f("repeated_fixed64"), 0]); - Assert.Equal(209, message[f("repeated_sfixed32"), 0]); - Assert.Equal(210L, message[f("repeated_sfixed64"), 0]); - Assert.Equal(211F, message[f("repeated_float"), 0]); - Assert.Equal(212D, message[f("repeated_double"), 0]); - Assert.Equal(true, message[f("repeated_bool"), 0]); - Assert.Equal("215", message[f("repeated_string"), 0]); - Assert.Equal(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); - - Assert.Equal(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); - Assert.Equal(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); - Assert.Equal(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); - Assert.Equal(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); - - Assert.Equal(nestedBar, message[f("repeated_nested_enum"), 0]); - Assert.Equal(foreignBar, message[f("repeated_foreign_enum"), 0]); - Assert.Equal(importBar, message[f("repeated_import_enum"), 0]); - - Assert.Equal("224", message[f("repeated_string_piece"), 0]); - Assert.Equal("225", message[f("repeated_cord"), 0]); - - Assert.Equal(301, message[f("repeated_int32"), 1]); - Assert.Equal(302L, message[f("repeated_int64"), 1]); - Assert.Equal(303U, message[f("repeated_uint32"), 1]); - Assert.Equal(304UL, message[f("repeated_uint64"), 1]); - Assert.Equal(305, message[f("repeated_sint32"), 1]); - Assert.Equal(306L, message[f("repeated_sint64"), 1]); - Assert.Equal(307U, message[f("repeated_fixed32"), 1]); - Assert.Equal(308UL, message[f("repeated_fixed64"), 1]); - Assert.Equal(309, message[f("repeated_sfixed32"), 1]); - Assert.Equal(310L, message[f("repeated_sfixed64"), 1]); - Assert.Equal(311F, message[f("repeated_float"), 1]); - Assert.Equal(312D, message[f("repeated_double"), 1]); - Assert.Equal(false, message[f("repeated_bool"), 1]); - Assert.Equal("315", message[f("repeated_string"), 1]); - Assert.Equal(TestUtil.ToBytes("316"), message[f("repeated_bytes"), 1]); - - Assert.Equal(317, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); - Assert.Equal(318, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); - Assert.Equal(319, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); - Assert.Equal(320, ((IMessage) message[f("repeated_import_message"), 1])[importD]); - - Assert.Equal(nestedBaz, message[f("repeated_nested_enum"), 1]); - Assert.Equal(foreignBaz, message[f("repeated_foreign_enum"), 1]); - Assert.Equal(importBaz, message[f("repeated_import_enum"), 1]); - - Assert.Equal("324", message[f("repeated_string_piece"), 1]); - Assert.Equal("325", message[f("repeated_cord"), 1]); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_cord"))); + + Assert.AreEqual(201, message[f("repeated_int32"), 0]); + Assert.AreEqual(202L, message[f("repeated_int64"), 0]); + Assert.AreEqual(203U, message[f("repeated_uint32"), 0]); + Assert.AreEqual(204UL, message[f("repeated_uint64"), 0]); + Assert.AreEqual(205, message[f("repeated_sint32"), 0]); + Assert.AreEqual(206L, message[f("repeated_sint64"), 0]); + Assert.AreEqual(207U, message[f("repeated_fixed32"), 0]); + Assert.AreEqual(208UL, message[f("repeated_fixed64"), 0]); + Assert.AreEqual(209, message[f("repeated_sfixed32"), 0]); + Assert.AreEqual(210L, message[f("repeated_sfixed64"), 0]); + Assert.AreEqual(211F, message[f("repeated_float"), 0]); + Assert.AreEqual(212D, message[f("repeated_double"), 0]); + Assert.AreEqual(true, message[f("repeated_bool"), 0]); + Assert.AreEqual("215", message[f("repeated_string"), 0]); + Assert.AreEqual(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); + + Assert.AreEqual(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); + Assert.AreEqual(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); + Assert.AreEqual(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); + Assert.AreEqual(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); + + Assert.AreEqual(nestedBar, message[f("repeated_nested_enum"), 0]); + Assert.AreEqual(foreignBar, message[f("repeated_foreign_enum"), 0]); + Assert.AreEqual(importBar, message[f("repeated_import_enum"), 0]); + + Assert.AreEqual("224", message[f("repeated_string_piece"), 0]); + Assert.AreEqual("225", message[f("repeated_cord"), 0]); + + Assert.AreEqual(301, message[f("repeated_int32"), 1]); + Assert.AreEqual(302L, message[f("repeated_int64"), 1]); + Assert.AreEqual(303U, message[f("repeated_uint32"), 1]); + Assert.AreEqual(304UL, message[f("repeated_uint64"), 1]); + Assert.AreEqual(305, message[f("repeated_sint32"), 1]); + Assert.AreEqual(306L, message[f("repeated_sint64"), 1]); + Assert.AreEqual(307U, message[f("repeated_fixed32"), 1]); + Assert.AreEqual(308UL, message[f("repeated_fixed64"), 1]); + Assert.AreEqual(309, message[f("repeated_sfixed32"), 1]); + Assert.AreEqual(310L, message[f("repeated_sfixed64"), 1]); + Assert.AreEqual(311F, message[f("repeated_float"), 1]); + Assert.AreEqual(312D, message[f("repeated_double"), 1]); + Assert.AreEqual(false, message[f("repeated_bool"), 1]); + Assert.AreEqual("315", message[f("repeated_string"), 1]); + Assert.AreEqual(TestUtil.ToBytes("316"), message[f("repeated_bytes"), 1]); + + Assert.AreEqual(317, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); + Assert.AreEqual(318, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); + Assert.AreEqual(319, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); + Assert.AreEqual(320, ((IMessage) message[f("repeated_import_message"), 1])[importD]); + + Assert.AreEqual(nestedBaz, message[f("repeated_nested_enum"), 1]); + Assert.AreEqual(foreignBaz, message[f("repeated_foreign_enum"), 1]); + Assert.AreEqual(importBaz, message[f("repeated_import_enum"), 1]); + + Assert.AreEqual("324", message[f("repeated_string_piece"), 1]); + Assert.AreEqual("325", message[f("repeated_cord"), 1]); // ----------------------------------------------------------------- - Assert.True(message.HasField(f("default_int32"))); - Assert.True(message.HasField(f("default_int64"))); - Assert.True(message.HasField(f("default_uint32"))); - Assert.True(message.HasField(f("default_uint64"))); - Assert.True(message.HasField(f("default_sint32"))); - Assert.True(message.HasField(f("default_sint64"))); - Assert.True(message.HasField(f("default_fixed32"))); - Assert.True(message.HasField(f("default_fixed64"))); - Assert.True(message.HasField(f("default_sfixed32"))); - Assert.True(message.HasField(f("default_sfixed64"))); - Assert.True(message.HasField(f("default_float"))); - Assert.True(message.HasField(f("default_double"))); - Assert.True(message.HasField(f("default_bool"))); - Assert.True(message.HasField(f("default_string"))); - Assert.True(message.HasField(f("default_bytes"))); - - Assert.True(message.HasField(f("default_nested_enum"))); - Assert.True(message.HasField(f("default_foreign_enum"))); - Assert.True(message.HasField(f("default_import_enum"))); - - Assert.True(message.HasField(f("default_string_piece"))); - Assert.True(message.HasField(f("default_cord"))); - - Assert.Equal(401, message[f("default_int32")]); - Assert.Equal(402L, message[f("default_int64")]); - Assert.Equal(403U, message[f("default_uint32")]); - Assert.Equal(404UL, message[f("default_uint64")]); - Assert.Equal(405, message[f("default_sint32")]); - Assert.Equal(406L, message[f("default_sint64")]); - Assert.Equal(407U, message[f("default_fixed32")]); - Assert.Equal(408UL, message[f("default_fixed64")]); - Assert.Equal(409, message[f("default_sfixed32")]); - Assert.Equal(410L, message[f("default_sfixed64")]); - Assert.Equal(411F, message[f("default_float")]); - Assert.Equal(412D, message[f("default_double")]); - Assert.Equal(false, message[f("default_bool")]); - Assert.Equal("415", message[f("default_string")]); - Assert.Equal(TestUtil.ToBytes("416"), message[f("default_bytes")]); - - Assert.Equal(nestedFoo, message[f("default_nested_enum")]); - Assert.Equal(foreignFoo, message[f("default_foreign_enum")]); - Assert.Equal(importFoo, message[f("default_import_enum")]); - - Assert.Equal("424", message[f("default_string_piece")]); - Assert.Equal("425", message[f("default_cord")]); + Assert.IsTrue(message.HasField(f("default_int32"))); + Assert.IsTrue(message.HasField(f("default_int64"))); + Assert.IsTrue(message.HasField(f("default_uint32"))); + Assert.IsTrue(message.HasField(f("default_uint64"))); + Assert.IsTrue(message.HasField(f("default_sint32"))); + Assert.IsTrue(message.HasField(f("default_sint64"))); + Assert.IsTrue(message.HasField(f("default_fixed32"))); + Assert.IsTrue(message.HasField(f("default_fixed64"))); + Assert.IsTrue(message.HasField(f("default_sfixed32"))); + Assert.IsTrue(message.HasField(f("default_sfixed64"))); + Assert.IsTrue(message.HasField(f("default_float"))); + Assert.IsTrue(message.HasField(f("default_double"))); + Assert.IsTrue(message.HasField(f("default_bool"))); + Assert.IsTrue(message.HasField(f("default_string"))); + Assert.IsTrue(message.HasField(f("default_bytes"))); + + Assert.IsTrue(message.HasField(f("default_nested_enum"))); + Assert.IsTrue(message.HasField(f("default_foreign_enum"))); + Assert.IsTrue(message.HasField(f("default_import_enum"))); + + Assert.IsTrue(message.HasField(f("default_string_piece"))); + Assert.IsTrue(message.HasField(f("default_cord"))); + + Assert.AreEqual(401, message[f("default_int32")]); + Assert.AreEqual(402L, message[f("default_int64")]); + Assert.AreEqual(403U, message[f("default_uint32")]); + Assert.AreEqual(404UL, message[f("default_uint64")]); + Assert.AreEqual(405, message[f("default_sint32")]); + Assert.AreEqual(406L, message[f("default_sint64")]); + Assert.AreEqual(407U, message[f("default_fixed32")]); + Assert.AreEqual(408UL, message[f("default_fixed64")]); + Assert.AreEqual(409, message[f("default_sfixed32")]); + Assert.AreEqual(410L, message[f("default_sfixed64")]); + Assert.AreEqual(411F, message[f("default_float")]); + Assert.AreEqual(412D, message[f("default_double")]); + Assert.AreEqual(false, message[f("default_bool")]); + Assert.AreEqual("415", message[f("default_string")]); + Assert.AreEqual(TestUtil.ToBytes("416"), message[f("default_bytes")]); + + Assert.AreEqual(nestedFoo, message[f("default_nested_enum")]); + Assert.AreEqual(foreignFoo, message[f("default_foreign_enum")]); + Assert.AreEqual(importFoo, message[f("default_import_enum")]); + + Assert.AreEqual("424", message[f("default_string_piece")]); + Assert.AreEqual("425", message[f("default_cord")]); } /// @@ -651,148 +651,148 @@ namespace Google.ProtocolBuffers public void AssertClearViaReflection(IMessage message) { // has_blah() should initially be false for all optional fields. - Assert.False(message.HasField(f("optional_int32"))); - Assert.False(message.HasField(f("optional_int64"))); - Assert.False(message.HasField(f("optional_uint32"))); - Assert.False(message.HasField(f("optional_uint64"))); - Assert.False(message.HasField(f("optional_sint32"))); - Assert.False(message.HasField(f("optional_sint64"))); - Assert.False(message.HasField(f("optional_fixed32"))); - Assert.False(message.HasField(f("optional_fixed64"))); - Assert.False(message.HasField(f("optional_sfixed32"))); - Assert.False(message.HasField(f("optional_sfixed64"))); - Assert.False(message.HasField(f("optional_float"))); - Assert.False(message.HasField(f("optional_double"))); - Assert.False(message.HasField(f("optional_bool"))); - Assert.False(message.HasField(f("optional_string"))); - Assert.False(message.HasField(f("optional_bytes"))); - - Assert.False(message.HasField(f("optionalgroup"))); - Assert.False(message.HasField(f("optional_nested_message"))); - Assert.False(message.HasField(f("optional_foreign_message"))); - Assert.False(message.HasField(f("optional_import_message"))); - - Assert.False(message.HasField(f("optional_nested_enum"))); - Assert.False(message.HasField(f("optional_foreign_enum"))); - Assert.False(message.HasField(f("optional_import_enum"))); - - Assert.False(message.HasField(f("optional_string_piece"))); - Assert.False(message.HasField(f("optional_cord"))); + Assert.IsFalse(message.HasField(f("optional_int32"))); + Assert.IsFalse(message.HasField(f("optional_int64"))); + Assert.IsFalse(message.HasField(f("optional_uint32"))); + Assert.IsFalse(message.HasField(f("optional_uint64"))); + Assert.IsFalse(message.HasField(f("optional_sint32"))); + Assert.IsFalse(message.HasField(f("optional_sint64"))); + Assert.IsFalse(message.HasField(f("optional_fixed32"))); + Assert.IsFalse(message.HasField(f("optional_fixed64"))); + Assert.IsFalse(message.HasField(f("optional_sfixed32"))); + Assert.IsFalse(message.HasField(f("optional_sfixed64"))); + Assert.IsFalse(message.HasField(f("optional_float"))); + Assert.IsFalse(message.HasField(f("optional_double"))); + Assert.IsFalse(message.HasField(f("optional_bool"))); + Assert.IsFalse(message.HasField(f("optional_string"))); + Assert.IsFalse(message.HasField(f("optional_bytes"))); + + Assert.IsFalse(message.HasField(f("optionalgroup"))); + Assert.IsFalse(message.HasField(f("optional_nested_message"))); + Assert.IsFalse(message.HasField(f("optional_foreign_message"))); + Assert.IsFalse(message.HasField(f("optional_import_message"))); + + Assert.IsFalse(message.HasField(f("optional_nested_enum"))); + Assert.IsFalse(message.HasField(f("optional_foreign_enum"))); + Assert.IsFalse(message.HasField(f("optional_import_enum"))); + + Assert.IsFalse(message.HasField(f("optional_string_piece"))); + Assert.IsFalse(message.HasField(f("optional_cord"))); // Optional fields without defaults are set to zero or something like it. - Assert.Equal(0, message[f("optional_int32")]); - Assert.Equal(0L, message[f("optional_int64")]); - Assert.Equal(0U, message[f("optional_uint32")]); - Assert.Equal(0UL, message[f("optional_uint64")]); - Assert.Equal(0, message[f("optional_sint32")]); - Assert.Equal(0L, message[f("optional_sint64")]); - Assert.Equal(0U, message[f("optional_fixed32")]); - Assert.Equal(0UL, message[f("optional_fixed64")]); - Assert.Equal(0, message[f("optional_sfixed32")]); - Assert.Equal(0L, message[f("optional_sfixed64")]); - Assert.Equal(0F, message[f("optional_float")]); - Assert.Equal(0D, message[f("optional_double")]); - Assert.Equal(false, message[f("optional_bool")]); - Assert.Equal("", message[f("optional_string")]); - Assert.Equal(ByteString.Empty, message[f("optional_bytes")]); + Assert.AreEqual(0, message[f("optional_int32")]); + Assert.AreEqual(0L, message[f("optional_int64")]); + Assert.AreEqual(0U, message[f("optional_uint32")]); + Assert.AreEqual(0UL, message[f("optional_uint64")]); + Assert.AreEqual(0, message[f("optional_sint32")]); + Assert.AreEqual(0L, message[f("optional_sint64")]); + Assert.AreEqual(0U, message[f("optional_fixed32")]); + Assert.AreEqual(0UL, message[f("optional_fixed64")]); + Assert.AreEqual(0, message[f("optional_sfixed32")]); + Assert.AreEqual(0L, message[f("optional_sfixed64")]); + Assert.AreEqual(0F, message[f("optional_float")]); + Assert.AreEqual(0D, message[f("optional_double")]); + Assert.AreEqual(false, message[f("optional_bool")]); + Assert.AreEqual("", message[f("optional_string")]); + Assert.AreEqual(ByteString.Empty, message[f("optional_bytes")]); // Embedded messages should also be clear. - Assert.False(((IMessage) message[f("optionalgroup")]).HasField(groupA)); - Assert.False(((IMessage) message[f("optional_nested_message")]) + Assert.IsFalse(((IMessage) message[f("optionalgroup")]).HasField(groupA)); + Assert.IsFalse(((IMessage) message[f("optional_nested_message")]) .HasField(nestedB)); - Assert.False(((IMessage) message[f("optional_foreign_message")]) + Assert.IsFalse(((IMessage) message[f("optional_foreign_message")]) .HasField(foreignC)); - Assert.False(((IMessage) message[f("optional_import_message")]) + Assert.IsFalse(((IMessage) message[f("optional_import_message")]) .HasField(importD)); - Assert.Equal(0, ((IMessage) message[f("optionalgroup")])[groupA]); - Assert.Equal(0, ((IMessage) message[f("optional_nested_message")])[nestedB]); - Assert.Equal(0, ((IMessage) message[f("optional_foreign_message")])[foreignC]); - Assert.Equal(0, ((IMessage) message[f("optional_import_message")])[importD]); + Assert.AreEqual(0, ((IMessage) message[f("optionalgroup")])[groupA]); + Assert.AreEqual(0, ((IMessage) message[f("optional_nested_message")])[nestedB]); + Assert.AreEqual(0, ((IMessage) message[f("optional_foreign_message")])[foreignC]); + Assert.AreEqual(0, ((IMessage) message[f("optional_import_message")])[importD]); // Enums without defaults are set to the first value in the enum. - Assert.Equal(nestedFoo, message[f("optional_nested_enum")]); - Assert.Equal(foreignFoo, message[f("optional_foreign_enum")]); - Assert.Equal(importFoo, message[f("optional_import_enum")]); + Assert.AreEqual(nestedFoo, message[f("optional_nested_enum")]); + Assert.AreEqual(foreignFoo, message[f("optional_foreign_enum")]); + Assert.AreEqual(importFoo, message[f("optional_import_enum")]); - Assert.Equal("", message[f("optional_string_piece")]); - Assert.Equal("", message[f("optional_cord")]); + Assert.AreEqual("", message[f("optional_string_piece")]); + Assert.AreEqual("", message[f("optional_cord")]); // Repeated fields are empty. - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.Equal(0, message.GetRepeatedFieldCount(f("repeated_cord"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.AreEqual(0, message.GetRepeatedFieldCount(f("repeated_cord"))); // has_blah() should also be false for all default fields. - Assert.False(message.HasField(f("default_int32"))); - Assert.False(message.HasField(f("default_int64"))); - Assert.False(message.HasField(f("default_uint32"))); - Assert.False(message.HasField(f("default_uint64"))); - Assert.False(message.HasField(f("default_sint32"))); - Assert.False(message.HasField(f("default_sint64"))); - Assert.False(message.HasField(f("default_fixed32"))); - Assert.False(message.HasField(f("default_fixed64"))); - Assert.False(message.HasField(f("default_sfixed32"))); - Assert.False(message.HasField(f("default_sfixed64"))); - Assert.False(message.HasField(f("default_float"))); - Assert.False(message.HasField(f("default_double"))); - Assert.False(message.HasField(f("default_bool"))); - Assert.False(message.HasField(f("default_string"))); - Assert.False(message.HasField(f("default_bytes"))); - - Assert.False(message.HasField(f("default_nested_enum"))); - Assert.False(message.HasField(f("default_foreign_enum"))); - Assert.False(message.HasField(f("default_import_enum"))); - - Assert.False(message.HasField(f("default_string_piece"))); - Assert.False(message.HasField(f("default_cord"))); + Assert.IsFalse(message.HasField(f("default_int32"))); + Assert.IsFalse(message.HasField(f("default_int64"))); + Assert.IsFalse(message.HasField(f("default_uint32"))); + Assert.IsFalse(message.HasField(f("default_uint64"))); + Assert.IsFalse(message.HasField(f("default_sint32"))); + Assert.IsFalse(message.HasField(f("default_sint64"))); + Assert.IsFalse(message.HasField(f("default_fixed32"))); + Assert.IsFalse(message.HasField(f("default_fixed64"))); + Assert.IsFalse(message.HasField(f("default_sfixed32"))); + Assert.IsFalse(message.HasField(f("default_sfixed64"))); + Assert.IsFalse(message.HasField(f("default_float"))); + Assert.IsFalse(message.HasField(f("default_double"))); + Assert.IsFalse(message.HasField(f("default_bool"))); + Assert.IsFalse(message.HasField(f("default_string"))); + Assert.IsFalse(message.HasField(f("default_bytes"))); + + Assert.IsFalse(message.HasField(f("default_nested_enum"))); + Assert.IsFalse(message.HasField(f("default_foreign_enum"))); + Assert.IsFalse(message.HasField(f("default_import_enum"))); + + Assert.IsFalse(message.HasField(f("default_string_piece"))); + Assert.IsFalse(message.HasField(f("default_cord"))); // Fields with defaults have their default values (duh). - Assert.Equal(41, message[f("default_int32")]); - Assert.Equal(42L, message[f("default_int64")]); - Assert.Equal(43U, message[f("default_uint32")]); - Assert.Equal(44UL, message[f("default_uint64")]); - Assert.Equal(-45, message[f("default_sint32")]); - Assert.Equal(46L, message[f("default_sint64")]); - Assert.Equal(47U, message[f("default_fixed32")]); - Assert.Equal(48UL, message[f("default_fixed64")]); - Assert.Equal(49, message[f("default_sfixed32")]); - Assert.Equal(-50L, message[f("default_sfixed64")]); - Assert.Equal(51.5F, message[f("default_float")]); - Assert.Equal(52e3D, message[f("default_double")]); - Assert.Equal(true, message[f("default_bool")]); - Assert.Equal("hello", message[f("default_string")]); - Assert.Equal(TestUtil.ToBytes("world"), message[f("default_bytes")]); - - Assert.Equal(nestedBar, message[f("default_nested_enum")]); - Assert.Equal(foreignBar, message[f("default_foreign_enum")]); - Assert.Equal(importBar, message[f("default_import_enum")]); - - Assert.Equal("abc", message[f("default_string_piece")]); - Assert.Equal("123", message[f("default_cord")]); + Assert.AreEqual(41, message[f("default_int32")]); + Assert.AreEqual(42L, message[f("default_int64")]); + Assert.AreEqual(43U, message[f("default_uint32")]); + Assert.AreEqual(44UL, message[f("default_uint64")]); + Assert.AreEqual(-45, message[f("default_sint32")]); + Assert.AreEqual(46L, message[f("default_sint64")]); + Assert.AreEqual(47U, message[f("default_fixed32")]); + Assert.AreEqual(48UL, message[f("default_fixed64")]); + Assert.AreEqual(49, message[f("default_sfixed32")]); + Assert.AreEqual(-50L, message[f("default_sfixed64")]); + Assert.AreEqual(51.5F, message[f("default_float")]); + Assert.AreEqual(52e3D, message[f("default_double")]); + Assert.AreEqual(true, message[f("default_bool")]); + Assert.AreEqual("hello", message[f("default_string")]); + Assert.AreEqual(TestUtil.ToBytes("world"), message[f("default_bytes")]); + + Assert.AreEqual(nestedBar, message[f("default_nested_enum")]); + Assert.AreEqual(foreignBar, message[f("default_foreign_enum")]); + Assert.AreEqual(importBar, message[f("default_import_enum")]); + + Assert.AreEqual("abc", message[f("default_string_piece")]); + Assert.AreEqual("123", message[f("default_cord")]); } // --------------------------------------------------------------- @@ -802,88 +802,88 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_int64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_float"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_double"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bool"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); - - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); - - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("repeated_cord"))); - - Assert.Equal(201, message[f("repeated_int32"), 0]); - Assert.Equal(202L, message[f("repeated_int64"), 0]); - Assert.Equal(203U, message[f("repeated_uint32"), 0]); - Assert.Equal(204UL, message[f("repeated_uint64"), 0]); - Assert.Equal(205, message[f("repeated_sint32"), 0]); - Assert.Equal(206L, message[f("repeated_sint64"), 0]); - Assert.Equal(207U, message[f("repeated_fixed32"), 0]); - Assert.Equal(208UL, message[f("repeated_fixed64"), 0]); - Assert.Equal(209, message[f("repeated_sfixed32"), 0]); - Assert.Equal(210L, message[f("repeated_sfixed64"), 0]); - Assert.Equal(211F, message[f("repeated_float"), 0]); - Assert.Equal(212D, message[f("repeated_double"), 0]); - Assert.Equal(true, message[f("repeated_bool"), 0]); - Assert.Equal("215", message[f("repeated_string"), 0]); - Assert.Equal(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); - - Assert.Equal(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); - Assert.Equal(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); - Assert.Equal(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); - Assert.Equal(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); - - Assert.Equal(nestedBar, message[f("repeated_nested_enum"), 0]); - Assert.Equal(foreignBar, message[f("repeated_foreign_enum"), 0]); - Assert.Equal(importBar, message[f("repeated_import_enum"), 0]); - - Assert.Equal("224", message[f("repeated_string_piece"), 0]); - Assert.Equal("225", message[f("repeated_cord"), 0]); - - Assert.Equal(501, message[f("repeated_int32"), 1]); - Assert.Equal(502L, message[f("repeated_int64"), 1]); - Assert.Equal(503U, message[f("repeated_uint32"), 1]); - Assert.Equal(504UL, message[f("repeated_uint64"), 1]); - Assert.Equal(505, message[f("repeated_sint32"), 1]); - Assert.Equal(506L, message[f("repeated_sint64"), 1]); - Assert.Equal(507U, message[f("repeated_fixed32"), 1]); - Assert.Equal(508UL, message[f("repeated_fixed64"), 1]); - Assert.Equal(509, message[f("repeated_sfixed32"), 1]); - Assert.Equal(510L, message[f("repeated_sfixed64"), 1]); - Assert.Equal(511F, message[f("repeated_float"), 1]); - Assert.Equal(512D, message[f("repeated_double"), 1]); - Assert.Equal(true, message[f("repeated_bool"), 1]); - Assert.Equal("515", message[f("repeated_string"), 1]); - Assert.Equal(TestUtil.ToBytes("516"), message[f("repeated_bytes"), 1]); - - Assert.Equal(517, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); - Assert.Equal(518, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); - Assert.Equal(519, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); - Assert.Equal(520, ((IMessage) message[f("repeated_import_message"), 1])[importD]); - - Assert.Equal(nestedFoo, message[f("repeated_nested_enum"), 1]); - Assert.Equal(foreignFoo, message[f("repeated_foreign_enum"), 1]); - Assert.Equal(importFoo, message[f("repeated_import_enum"), 1]); - - Assert.Equal("524", message[f("repeated_string_piece"), 1]); - Assert.Equal("525", message[f("repeated_cord"), 1]); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_int64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_uint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_fixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_sfixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_float"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_double"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bool"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_bytes"))); + + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeatedgroup"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_message"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_nested_enum"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_foreign_enum"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_import_enum"))); + + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_string_piece"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("repeated_cord"))); + + Assert.AreEqual(201, message[f("repeated_int32"), 0]); + Assert.AreEqual(202L, message[f("repeated_int64"), 0]); + Assert.AreEqual(203U, message[f("repeated_uint32"), 0]); + Assert.AreEqual(204UL, message[f("repeated_uint64"), 0]); + Assert.AreEqual(205, message[f("repeated_sint32"), 0]); + Assert.AreEqual(206L, message[f("repeated_sint64"), 0]); + Assert.AreEqual(207U, message[f("repeated_fixed32"), 0]); + Assert.AreEqual(208UL, message[f("repeated_fixed64"), 0]); + Assert.AreEqual(209, message[f("repeated_sfixed32"), 0]); + Assert.AreEqual(210L, message[f("repeated_sfixed64"), 0]); + Assert.AreEqual(211F, message[f("repeated_float"), 0]); + Assert.AreEqual(212D, message[f("repeated_double"), 0]); + Assert.AreEqual(true, message[f("repeated_bool"), 0]); + Assert.AreEqual("215", message[f("repeated_string"), 0]); + Assert.AreEqual(TestUtil.ToBytes("216"), message[f("repeated_bytes"), 0]); + + Assert.AreEqual(217, ((IMessage) message[f("repeatedgroup"), 0])[repeatedGroupA]); + Assert.AreEqual(218, ((IMessage) message[f("repeated_nested_message"), 0])[nestedB]); + Assert.AreEqual(219, ((IMessage) message[f("repeated_foreign_message"), 0])[foreignC]); + Assert.AreEqual(220, ((IMessage) message[f("repeated_import_message"), 0])[importD]); + + Assert.AreEqual(nestedBar, message[f("repeated_nested_enum"), 0]); + Assert.AreEqual(foreignBar, message[f("repeated_foreign_enum"), 0]); + Assert.AreEqual(importBar, message[f("repeated_import_enum"), 0]); + + Assert.AreEqual("224", message[f("repeated_string_piece"), 0]); + Assert.AreEqual("225", message[f("repeated_cord"), 0]); + + Assert.AreEqual(501, message[f("repeated_int32"), 1]); + Assert.AreEqual(502L, message[f("repeated_int64"), 1]); + Assert.AreEqual(503U, message[f("repeated_uint32"), 1]); + Assert.AreEqual(504UL, message[f("repeated_uint64"), 1]); + Assert.AreEqual(505, message[f("repeated_sint32"), 1]); + Assert.AreEqual(506L, message[f("repeated_sint64"), 1]); + Assert.AreEqual(507U, message[f("repeated_fixed32"), 1]); + Assert.AreEqual(508UL, message[f("repeated_fixed64"), 1]); + Assert.AreEqual(509, message[f("repeated_sfixed32"), 1]); + Assert.AreEqual(510L, message[f("repeated_sfixed64"), 1]); + Assert.AreEqual(511F, message[f("repeated_float"), 1]); + Assert.AreEqual(512D, message[f("repeated_double"), 1]); + Assert.AreEqual(true, message[f("repeated_bool"), 1]); + Assert.AreEqual("515", message[f("repeated_string"), 1]); + Assert.AreEqual(TestUtil.ToBytes("516"), message[f("repeated_bytes"), 1]); + + Assert.AreEqual(517, ((IMessage) message[f("repeatedgroup"), 1])[repeatedGroupA]); + Assert.AreEqual(518, ((IMessage) message[f("repeated_nested_message"), 1])[nestedB]); + Assert.AreEqual(519, ((IMessage) message[f("repeated_foreign_message"), 1])[foreignC]); + Assert.AreEqual(520, ((IMessage) message[f("repeated_import_message"), 1])[importD]); + + Assert.AreEqual(nestedFoo, message[f("repeated_nested_enum"), 1]); + Assert.AreEqual(foreignFoo, message[f("repeated_foreign_enum"), 1]); + Assert.AreEqual(importFoo, message[f("repeated_import_enum"), 1]); + + Assert.AreEqual("524", message[f("repeated_string_piece"), 1]); + Assert.AreEqual("525", message[f("repeated_cord"), 1]); } /// @@ -955,50 +955,50 @@ namespace Google.ProtocolBuffers public void AssertPackedFieldsSetViaReflection(IMessage message) { - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_int32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_int64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_uint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_uint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sint32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sint64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_fixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_fixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sfixed32"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_sfixed64"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_float"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_double"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_bool"))); - Assert.Equal(2, message.GetRepeatedFieldCount(f("packed_enum"))); - - Assert.Equal(601, message[f("packed_int32"), 0]); - Assert.Equal(602L, message[f("packed_int64"), 0]); - Assert.Equal(603u, message[f("packed_uint32"), 0]); - Assert.Equal(604uL, message[f("packed_uint64"), 0]); - Assert.Equal(605, message[f("packed_sint32"), 0]); - Assert.Equal(606L, message[f("packed_sint64"), 0]); - Assert.Equal(607u, message[f("packed_fixed32"), 0]); - Assert.Equal(608uL, message[f("packed_fixed64"), 0]); - Assert.Equal(609, message[f("packed_sfixed32"), 0]); - Assert.Equal(610L, message[f("packed_sfixed64"), 0]); - Assert.Equal(611F, message[f("packed_float"), 0]); - Assert.Equal(612D, message[f("packed_double"), 0]); - Assert.Equal(true, message[f("packed_bool"), 0]); - Assert.Equal(foreignBar, message[f("packed_enum"), 0]); - - Assert.Equal(701, message[f("packed_int32"), 1]); - Assert.Equal(702L, message[f("packed_int64"), 1]); - Assert.Equal(703u, message[f("packed_uint32"), 1]); - Assert.Equal(704uL, message[f("packed_uint64"), 1]); - Assert.Equal(705, message[f("packed_sint32"), 1]); - Assert.Equal(706L, message[f("packed_sint64"), 1]); - Assert.Equal(707u, message[f("packed_fixed32"), 1]); - Assert.Equal(708uL, message[f("packed_fixed64"), 1]); - Assert.Equal(709, message[f("packed_sfixed32"), 1]); - Assert.Equal(710L, message[f("packed_sfixed64"), 1]); - Assert.Equal(711F, message[f("packed_float"), 1]); - Assert.Equal(712D, message[f("packed_double"), 1]); - Assert.Equal(false, message[f("packed_bool"), 1]); - Assert.Equal(foreignBaz, message[f("packed_enum"), 1]); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_int32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_int64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_uint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_uint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sint32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sint64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_fixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_fixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sfixed32"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_sfixed64"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_float"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_double"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_bool"))); + Assert.AreEqual(2, message.GetRepeatedFieldCount(f("packed_enum"))); + + Assert.AreEqual(601, message[f("packed_int32"), 0]); + Assert.AreEqual(602L, message[f("packed_int64"), 0]); + Assert.AreEqual(603u, message[f("packed_uint32"), 0]); + Assert.AreEqual(604uL, message[f("packed_uint64"), 0]); + Assert.AreEqual(605, message[f("packed_sint32"), 0]); + Assert.AreEqual(606L, message[f("packed_sint64"), 0]); + Assert.AreEqual(607u, message[f("packed_fixed32"), 0]); + Assert.AreEqual(608uL, message[f("packed_fixed64"), 0]); + Assert.AreEqual(609, message[f("packed_sfixed32"), 0]); + Assert.AreEqual(610L, message[f("packed_sfixed64"), 0]); + Assert.AreEqual(611F, message[f("packed_float"), 0]); + Assert.AreEqual(612D, message[f("packed_double"), 0]); + Assert.AreEqual(true, message[f("packed_bool"), 0]); + Assert.AreEqual(foreignBar, message[f("packed_enum"), 0]); + + Assert.AreEqual(701, message[f("packed_int32"), 1]); + Assert.AreEqual(702L, message[f("packed_int64"), 1]); + Assert.AreEqual(703u, message[f("packed_uint32"), 1]); + Assert.AreEqual(704uL, message[f("packed_uint64"), 1]); + Assert.AreEqual(705, message[f("packed_sint32"), 1]); + Assert.AreEqual(706L, message[f("packed_sint64"), 1]); + Assert.AreEqual(707u, message[f("packed_fixed32"), 1]); + Assert.AreEqual(708uL, message[f("packed_fixed64"), 1]); + Assert.AreEqual(709, message[f("packed_sfixed32"), 1]); + Assert.AreEqual(710L, message[f("packed_sfixed64"), 1]); + Assert.AreEqual(711F, message[f("packed_float"), 1]); + Assert.AreEqual(712D, message[f("packed_double"), 1]); + Assert.AreEqual(false, message[f("packed_bool"), 1]); + Assert.AreEqual(foreignBaz, message[f("packed_enum"), 1]); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs b/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs index e6b6a1b3..4f25a5ab 100644 --- a/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs +++ b/csharp/src/ProtocolBuffers.Test/ReusableBuilderTest.cs @@ -2,14 +2,14 @@ using Google.ProtocolBuffers.Collections; using Google.ProtocolBuffers.TestProtos; using UnitTest.Issues.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class ReusableBuilderTest { //Issue 28: Circular message dependencies result in null defaults for DefaultInstance - [Fact] + [Test] public void EnsureStaticCicularReference() { MyMessageAReferenceB ab = MyMessageAReferenceB.DefaultInstance; @@ -20,24 +20,24 @@ namespace Google.ProtocolBuffers Assert.NotNull(ba.Value); } - [Fact] + [Test] public void TestModifyDefaultInstance() { //verify that the default instance has correctly been marked as read-only - Assert.Equal(typeof(PopsicleList), TestAllTypes.DefaultInstance.RepeatedBoolList.GetType()); + Assert.AreEqual(typeof(PopsicleList), TestAllTypes.DefaultInstance.RepeatedBoolList.GetType()); PopsicleList list = (PopsicleList)TestAllTypes.DefaultInstance.RepeatedBoolList; - Assert.True(list.IsReadOnly); + Assert.IsTrue(list.IsReadOnly); } - [Fact] + [Test] public void TestUnmodifiedDefaultInstance() { //Simply calling ToBuilder().Build() no longer creates a copy of the message TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void BuildMultipleWithoutChange() { //Calling Build() or BuildPartial() does not require a copy of the message @@ -46,31 +46,31 @@ namespace Google.ProtocolBuffers TestAllTypes first = builder.BuildPartial(); //Still the same instance? - Assert.True(ReferenceEquals(first, builder.Build())); + Assert.IsTrue(ReferenceEquals(first, builder.Build())); //Still the same instance? - Assert.True(ReferenceEquals(first, builder.BuildPartial().ToBuilder().Build())); + Assert.IsTrue(ReferenceEquals(first, builder.BuildPartial().ToBuilder().Build())); } - [Fact] + [Test] public void MergeFromDefaultInstance() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.MergeFrom(TestAllTypes.DefaultInstance); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void BuildNewBuilderIsDefaultInstance() { - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, new TestAllTypes.Builder().Build())); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, new TestAllTypes.Builder().Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().Build())); //last test, if you clear a builder it reverts to default instance - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, TestAllTypes.CreateBuilder().SetOptionalBool(true).Build().ToBuilder().Clear().Build())); } - [Fact] + [Test] public void BuildModifyAndRebuild() { TestAllTypes.Builder b1 = new TestAllTypes.Builder(); @@ -86,80 +86,80 @@ namespace Google.ProtocolBuffers TestAllTypes m2 = b1.Build(); - Assert.Equal("{\"optional_foreign_message\":{},\"repeated_int32\":[2],\"default_int32\":1}", Extensions.ToJson(m1)); - Assert.Equal("{\"optional_foreign_message\":{\"c\":7},\"repeated_int32\":[2,6],\"default_int32\":5}", Extensions.ToJson(m2)); + Assert.AreEqual("{\"optional_foreign_message\":{},\"repeated_int32\":[2],\"default_int32\":1}", Extensions.ToJson(m1)); + Assert.AreEqual("{\"optional_foreign_message\":{\"c\":7},\"repeated_int32\":[2,6],\"default_int32\":5}", Extensions.ToJson(m2)); } - [Fact] + [Test] public void CloneOnChangePrimitive() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetDefaultBool(true); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnAddRepeatedBool() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.AddRepeatedBool(true); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnGetRepeatedBoolList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedBoolList); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnChangeMessage() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetOptionalForeignMessage(new ForeignMessage.Builder()); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnClearMessage() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.ClearOptionalForeignMessage(); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnGetRepeatedForeignMessageList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedForeignMessageList); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnChangeEnumValue() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); builder.SetOptionalForeignEnum(ForeignEnum.FOREIGN_BAR); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } - [Fact] + [Test] public void CloneOnGetRepeatedForeignEnumList() { TestAllTypes.Builder builder = TestAllTypes.DefaultInstance.ToBuilder(); - Assert.True(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsTrue(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); GC.KeepAlive(builder.RepeatedForeignEnumList); - Assert.False(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); + Assert.IsFalse(ReferenceEquals(TestAllTypes.DefaultInstance, builder.Build())); } } diff --git a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs b/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs index 5bec24f1..b60e7fae 100644 --- a/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs +++ b/csharp/src/ProtocolBuffers.Test/TestCornerCases.cs @@ -1,11 +1,11 @@ using UnitTest.Issues.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class TestCornerCases { - [Fact] + [Test] public void TestRoundTripNegativeEnums() { NegativeEnumMessage msg = NegativeEnumMessage.CreateBuilder() @@ -19,16 +19,16 @@ namespace Google.ProtocolBuffers .AddPackedValues(NegativeEnum.FiveBelow) //10 .Build(); - Assert.Equal(58, msg.SerializedSize); + Assert.AreEqual(58, msg.SerializedSize); byte[] bytes = new byte[58]; CodedOutputStream output = CodedOutputStream.CreateInstance(bytes); msg.WriteTo(output); - Assert.Equal(0, output.SpaceLeft); + Assert.AreEqual(0, output.SpaceLeft); NegativeEnumMessage copy = NegativeEnumMessage.ParseFrom(bytes); - Assert.Equal(msg, copy); + Assert.AreEqual(msg, copy); } } } diff --git a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs index 5caa2e23..da0d9eef 100644 --- a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs +++ b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs @@ -5,7 +5,7 @@ using System.Text; using Google.ProtocolBuffers.Serialization; using Google.ProtocolBuffers.Serialization.Http; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -16,91 +16,91 @@ namespace Google.ProtocolBuffers readonly IEnumerable XmlTypes = new string[] { "text/xml", "application/xml" }; readonly IEnumerable ProtobufTypes = new string[] { "application/binary", "application/x-protobuf", "application/vnd.google.protobuf" }; - [Fact] + [Test] public void TestReadJsonMimeTypes() { foreach (string type in JsonTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is JsonFormatReader); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/json" }, null, Stream.Null) is JsonFormatReader); } - [Fact] + [Test] public void TestWriteJsonMimeTypes() { foreach (string type in JsonTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is JsonFormatWriter); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/json" }, null, Stream.Null) is JsonFormatWriter); } - [Fact] + [Test] public void TestReadXmlMimeTypes() { foreach (string type in XmlTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is XmlFormatReader); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/xml" }, null, Stream.Null) is XmlFormatReader); } - [Fact] + [Test] public void TestWriteXmlMimeTypes() { foreach (string type in XmlTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is XmlFormatWriter); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/xml" }, null, Stream.Null) is XmlFormatWriter); } - [Fact] + [Test] public void TestReadProtoMimeTypes() { foreach (string type in ProtobufTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions(), type, Stream.Null) is CodedInputStream); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateInputStream(new MessageFormatOptions() { DefaultContentType = "application/vnd.google.protobuf" }, null, Stream.Null) is CodedInputStream); } - [Fact] + [Test] public void TestWriteProtoMimeTypes() { foreach (string type in ProtobufTypes) { - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions(), type, Stream.Null) is CodedOutputStream); } - Assert.True( + Assert.IsTrue( MessageFormatFactory.CreateOutputStream(new MessageFormatOptions() { DefaultContentType = "application/vnd.google.protobuf" }, null, Stream.Null) is CodedOutputStream); } - [Fact] + [Test] public void TestMergeFromJsonType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -108,11 +108,11 @@ namespace Google.ProtocolBuffers Extensions.ToJson(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) ))) .Build(); - Assert.Equal("a", msg.Text); - Assert.Equal(1, msg.Number); + Assert.AreEqual("a", msg.Text); + Assert.AreEqual(1, msg.Number); } - [Fact] + [Test] public void TestMergeFromXmlType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -120,10 +120,10 @@ namespace Google.ProtocolBuffers Extensions.ToXml(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) ))) .Build(); - Assert.Equal("a", msg.Text); - Assert.Equal(1, msg.Number); + Assert.AreEqual("a", msg.Text); + Assert.AreEqual(1, msg.Number); } - [Fact] + [Test] public void TestMergeFromProtoType() { TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), @@ -131,30 +131,30 @@ namespace Google.ProtocolBuffers TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build().ToByteArray() )) .Build(); - Assert.Equal("a", msg.Text); - Assert.Equal(1, msg.Number); + Assert.AreEqual("a", msg.Text); + Assert.AreEqual(1, msg.Number); } - [Fact] + [Test] public void TestWriteToJsonType() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions(), "application/json", ms); - Assert.Equal(@"{""text"":""a"",""number"":1}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.AreEqual(@"{""text"":""a"",""number"":1}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [Fact] + [Test] public void TestWriteToXmlType() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions(), "application/xml", ms); - Assert.Equal("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.AreEqual("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [Fact] + [Test] public void TestWriteToProtoType() { MemoryStream ms = new MemoryStream(); @@ -162,10 +162,10 @@ namespace Google.ProtocolBuffers new MessageFormatOptions(), "application/vnd.google.protobuf", ms); byte[] bytes = TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build().ToByteArray(); - Assert.Equal(bytes, ms.ToArray()); + Assert.AreEqual(bytes, ms.ToArray()); } - [Fact] + [Test] public void TestXmlReaderOptions() { MemoryStream ms = new MemoryStream(); @@ -184,13 +184,13 @@ namespace Google.ProtocolBuffers options, "application/xml", ms) .Build(); - Assert.Equal("a", msg.Text); - Assert.Equal(1, msg.NumbersList[0]); - Assert.Equal(2, msg.NumbersList[1]); + Assert.AreEqual("a", msg.Text); + Assert.AreEqual(1, msg.NumbersList[0]); + Assert.AreEqual(2, msg.NumbersList[1]); } - [Fact] + [Test] public void TestXmlWriterOptions() { TestXmlMessage message = TestXmlMessage.CreateBuilder().SetText("a").AddNumbers(1).AddNumbers(2).Build(); @@ -209,32 +209,32 @@ namespace Google.ProtocolBuffers .SetOptions(XmlReaderOptions.ReadNestedArrays) .Merge("root-node", builder); - Assert.Equal("a", builder.Text); - Assert.Equal(1, builder.NumbersList[0]); - Assert.Equal(2, builder.NumbersList[1]); + Assert.AreEqual("a", builder.Text); + Assert.AreEqual(1, builder.NumbersList[0]); + Assert.AreEqual(2, builder.NumbersList[1]); } - [Fact] + [Test] public void TestJsonFormatted() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions() { FormattedOutput = true }, "application/json", ms); - Assert.Equal("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.AreEqual("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [Fact] + [Test] public void TestXmlFormatted() { MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions() { FormattedOutput = true }, "application/xml", ms); - Assert.Equal("\r\n a\r\n 1\r\n", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.AreEqual("\r\n a\r\n 1\r\n", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } - [Fact] + [Test] public void TestReadCustomMimeTypes() { var options = new MessageFormatOptions(); @@ -242,7 +242,7 @@ namespace Google.ProtocolBuffers options.MimeInputTypes.Clear(); //Add our own options.MimeInputTypes.Add("-custom-XML-mime-type-", XmlFormatReader.CreateInstance); - Assert.Equal(1, options.MimeInputTypes.Count); + Assert.AreEqual(1, options.MimeInputTypes.Count); Stream xmlStream = new MemoryStream(Encoding.UTF8.GetBytes( Extensions.ToXml(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build()) @@ -251,11 +251,11 @@ namespace Google.ProtocolBuffers TestXmlMessage msg = Extensions.MergeFrom(new TestXmlMessage.Builder(), options, "-custom-XML-mime-type-", xmlStream) .Build(); - Assert.Equal("a", msg.Text); - Assert.Equal(1, msg.Number); + Assert.AreEqual("a", msg.Text); + Assert.AreEqual(1, msg.Number); } - [Fact] + [Test] public void TestWriteToCustomType() { var options = new MessageFormatOptions(); @@ -264,13 +264,13 @@ namespace Google.ProtocolBuffers //Add our own options.MimeOutputTypes.Add("-custom-XML-mime-type-", XmlFormatWriter.CreateInstance); - Assert.Equal(1, options.MimeOutputTypes.Count); + Assert.AreEqual(1, options.MimeOutputTypes.Count); MemoryStream ms = new MemoryStream(); Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), options, "-custom-XML-mime-type-", ms); - Assert.Equal("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + Assert.AreEqual("a1", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs index b262667a..f1d2bfad 100644 --- a/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs +++ b/csharp/src/ProtocolBuffers.Test/TestReaderForUrlEncoded.cs @@ -3,13 +3,13 @@ using System.IO; using System.Text; using Google.ProtocolBuffers.TestProtos; using Google.ProtocolBuffers.Serialization.Http; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class TestReaderForUrlEncoded { - [Fact] + [Test] public void Example_FromQueryString() { Uri sampleUri = new Uri("http://sample.com/Path/File.ext?text=two+three%20four&valid=true&numbers=1&numbers=2", UriKind.Absolute); @@ -20,14 +20,14 @@ namespace Google.ProtocolBuffers builder.MergeFrom(input); TestXmlMessage message = builder.Build(); - Assert.Equal(true, message.Valid); - Assert.Equal("two three four", message.Text); - Assert.Equal(2, message.NumbersCount); - Assert.Equal(1, message.NumbersList[0]); - Assert.Equal(2, message.NumbersList[1]); + Assert.AreEqual(true, message.Valid); + Assert.AreEqual("two three four", message.Text); + Assert.AreEqual(2, message.NumbersCount); + Assert.AreEqual(1, message.NumbersList[0]); + Assert.AreEqual(2, message.NumbersList[1]); } - [Fact] + [Test] public void Example_FromFormData() { Stream rawPost = new MemoryStream(Encoding.UTF8.GetBytes("text=two+three%20four&valid=true&numbers=1&numbers=2"), false); @@ -38,42 +38,42 @@ namespace Google.ProtocolBuffers builder.MergeFrom(input); TestXmlMessage message = builder.Build(); - Assert.Equal(true, message.Valid); - Assert.Equal("two three four", message.Text); - Assert.Equal(2, message.NumbersCount); - Assert.Equal(1, message.NumbersList[0]); - Assert.Equal(2, message.NumbersList[1]); + Assert.AreEqual(true, message.Valid); + Assert.AreEqual("two three four", message.Text); + Assert.AreEqual(2, message.NumbersCount); + Assert.AreEqual(1, message.NumbersList[0]); + Assert.AreEqual(2, message.NumbersList[1]); } - [Fact] + [Test] public void TestEmptyValues() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text=&numbers=1"); TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(input); - Assert.True(builder.Valid); - Assert.True(builder.HasText); - Assert.Equal("", builder.Text); - Assert.Equal(1, builder.NumbersCount); - Assert.Equal(1, builder.NumbersList[0]); + Assert.IsTrue(builder.Valid); + Assert.IsTrue(builder.HasText); + Assert.AreEqual("", builder.Text); + Assert.AreEqual(1, builder.NumbersCount); + Assert.AreEqual(1, builder.NumbersList[0]); } - [Fact] + [Test] public void TestNoValue() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("valid=true&text&numbers=1"); TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(input); - Assert.True(builder.Valid); - Assert.True(builder.HasText); - Assert.Equal("", builder.Text); - Assert.Equal(1, builder.NumbersCount); - Assert.Equal(1, builder.NumbersList[0]); + Assert.IsTrue(builder.Valid); + Assert.IsTrue(builder.HasText); + Assert.AreEqual("", builder.Text); + Assert.AreEqual(1, builder.NumbersCount); + Assert.AreEqual(1, builder.NumbersList[0]); } - [Fact] + [Test] public void FormUrlEncodedReaderDoesNotSupportChildren() { ICodedInputStream input = FormUrlEncodedReader.CreateInstance("child=uh0"); diff --git a/csharp/src/ProtocolBuffers.Test/TestUtil.cs b/csharp/src/ProtocolBuffers.Test/TestUtil.cs index 83509c18..583e8090 100644 --- a/csharp/src/ProtocolBuffers.Test/TestUtil.cs +++ b/csharp/src/ProtocolBuffers.Test/TestUtil.cs @@ -41,7 +41,7 @@ using System.IO; using System.Text; using System.Threading; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -324,343 +324,343 @@ namespace Google.ProtocolBuffers /// internal static void AssertAllFieldsSet(TestAllTypes message) { - Assert.True(message.HasOptionalInt32); - Assert.True(message.HasOptionalInt64); - Assert.True(message.HasOptionalUint32); - Assert.True(message.HasOptionalUint64); - Assert.True(message.HasOptionalSint32); - Assert.True(message.HasOptionalSint64); - Assert.True(message.HasOptionalFixed32); - Assert.True(message.HasOptionalFixed64); - Assert.True(message.HasOptionalSfixed32); - Assert.True(message.HasOptionalSfixed64); - Assert.True(message.HasOptionalFloat); - Assert.True(message.HasOptionalDouble); - Assert.True(message.HasOptionalBool); - Assert.True(message.HasOptionalString); - Assert.True(message.HasOptionalBytes); - - Assert.True(message.HasOptionalGroup); - Assert.True(message.HasOptionalNestedMessage); - Assert.True(message.HasOptionalForeignMessage); - Assert.True(message.HasOptionalImportMessage); - - Assert.True(message.OptionalGroup.HasA); - Assert.True(message.OptionalNestedMessage.HasBb); - Assert.True(message.OptionalForeignMessage.HasC); - Assert.True(message.OptionalImportMessage.HasD); - - Assert.True(message.HasOptionalNestedEnum); - Assert.True(message.HasOptionalForeignEnum); - Assert.True(message.HasOptionalImportEnum); - - Assert.True(message.HasOptionalStringPiece); - Assert.True(message.HasOptionalCord); - - Assert.Equal(101, message.OptionalInt32); - Assert.Equal(102, message.OptionalInt64); - Assert.Equal(103u, message.OptionalUint32); - Assert.Equal(104u, message.OptionalUint64); - Assert.Equal(105, message.OptionalSint32); - Assert.Equal(106, message.OptionalSint64); - Assert.Equal(107u, message.OptionalFixed32); - Assert.Equal(108u, message.OptionalFixed64); - Assert.Equal(109, message.OptionalSfixed32); - Assert.Equal(110, message.OptionalSfixed64); - Assert.Equal(111, message.OptionalFloat); - Assert.Equal(112, message.OptionalDouble); - Assert.Equal(true, message.OptionalBool); - Assert.Equal("115", message.OptionalString); - Assert.Equal(ToBytes("116"), message.OptionalBytes); - - Assert.Equal(117, message.OptionalGroup.A); - Assert.Equal(118, message.OptionalNestedMessage.Bb); - Assert.Equal(119, message.OptionalForeignMessage.C); - Assert.Equal(120, message.OptionalImportMessage.D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.OptionalNestedEnum); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.OptionalForeignEnum); - Assert.Equal(ImportEnum.IMPORT_BAZ, message.OptionalImportEnum); - - Assert.Equal("124", message.OptionalStringPiece); - Assert.Equal("125", message.OptionalCord); + Assert.IsTrue(message.HasOptionalInt32); + Assert.IsTrue(message.HasOptionalInt64); + Assert.IsTrue(message.HasOptionalUint32); + Assert.IsTrue(message.HasOptionalUint64); + Assert.IsTrue(message.HasOptionalSint32); + Assert.IsTrue(message.HasOptionalSint64); + Assert.IsTrue(message.HasOptionalFixed32); + Assert.IsTrue(message.HasOptionalFixed64); + Assert.IsTrue(message.HasOptionalSfixed32); + Assert.IsTrue(message.HasOptionalSfixed64); + Assert.IsTrue(message.HasOptionalFloat); + Assert.IsTrue(message.HasOptionalDouble); + Assert.IsTrue(message.HasOptionalBool); + Assert.IsTrue(message.HasOptionalString); + Assert.IsTrue(message.HasOptionalBytes); + + Assert.IsTrue(message.HasOptionalGroup); + Assert.IsTrue(message.HasOptionalNestedMessage); + Assert.IsTrue(message.HasOptionalForeignMessage); + Assert.IsTrue(message.HasOptionalImportMessage); + + Assert.IsTrue(message.OptionalGroup.HasA); + Assert.IsTrue(message.OptionalNestedMessage.HasBb); + Assert.IsTrue(message.OptionalForeignMessage.HasC); + Assert.IsTrue(message.OptionalImportMessage.HasD); + + Assert.IsTrue(message.HasOptionalNestedEnum); + Assert.IsTrue(message.HasOptionalForeignEnum); + Assert.IsTrue(message.HasOptionalImportEnum); + + Assert.IsTrue(message.HasOptionalStringPiece); + Assert.IsTrue(message.HasOptionalCord); + + Assert.AreEqual(101, message.OptionalInt32); + Assert.AreEqual(102, message.OptionalInt64); + Assert.AreEqual(103u, message.OptionalUint32); + Assert.AreEqual(104u, message.OptionalUint64); + Assert.AreEqual(105, message.OptionalSint32); + Assert.AreEqual(106, message.OptionalSint64); + Assert.AreEqual(107u, message.OptionalFixed32); + Assert.AreEqual(108u, message.OptionalFixed64); + Assert.AreEqual(109, message.OptionalSfixed32); + Assert.AreEqual(110, message.OptionalSfixed64); + Assert.AreEqual(111, message.OptionalFloat); + Assert.AreEqual(112, message.OptionalDouble); + Assert.AreEqual(true, message.OptionalBool); + Assert.AreEqual("115", message.OptionalString); + Assert.AreEqual(ToBytes("116"), message.OptionalBytes); + + Assert.AreEqual(117, message.OptionalGroup.A); + Assert.AreEqual(118, message.OptionalNestedMessage.Bb); + Assert.AreEqual(119, message.OptionalForeignMessage.C); + Assert.AreEqual(120, message.OptionalImportMessage.D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.OptionalNestedEnum); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.OptionalForeignEnum); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.OptionalImportEnum); + + Assert.AreEqual("124", message.OptionalStringPiece); + Assert.AreEqual("125", message.OptionalCord); // ----------------------------------------------------------------- - Assert.Equal(2, message.RepeatedInt32Count); - Assert.Equal(2, message.RepeatedInt64Count); - Assert.Equal(2, message.RepeatedUint32Count); - Assert.Equal(2, message.RepeatedUint64Count); - Assert.Equal(2, message.RepeatedSint32Count); - Assert.Equal(2, message.RepeatedSint64Count); - Assert.Equal(2, message.RepeatedFixed32Count); - Assert.Equal(2, message.RepeatedFixed64Count); - Assert.Equal(2, message.RepeatedSfixed32Count); - Assert.Equal(2, message.RepeatedSfixed64Count); - Assert.Equal(2, message.RepeatedFloatCount); - Assert.Equal(2, message.RepeatedDoubleCount); - Assert.Equal(2, message.RepeatedBoolCount); - Assert.Equal(2, message.RepeatedStringCount); - Assert.Equal(2, message.RepeatedBytesCount); - - Assert.Equal(2, message.RepeatedGroupCount); - Assert.Equal(2, message.RepeatedNestedMessageCount); - Assert.Equal(2, message.RepeatedForeignMessageCount); - Assert.Equal(2, message.RepeatedImportMessageCount); - Assert.Equal(2, message.RepeatedNestedEnumCount); - Assert.Equal(2, message.RepeatedForeignEnumCount); - Assert.Equal(2, message.RepeatedImportEnumCount); - - Assert.Equal(2, message.RepeatedStringPieceCount); - Assert.Equal(2, message.RepeatedCordCount); - - Assert.Equal(201, message.GetRepeatedInt32(0)); - Assert.Equal(202, message.GetRepeatedInt64(0)); - Assert.Equal(203u, message.GetRepeatedUint32(0)); - Assert.Equal(204u, message.GetRepeatedUint64(0)); - Assert.Equal(205, message.GetRepeatedSint32(0)); - Assert.Equal(206, message.GetRepeatedSint64(0)); - Assert.Equal(207u, message.GetRepeatedFixed32(0)); - Assert.Equal(208u, message.GetRepeatedFixed64(0)); - Assert.Equal(209, message.GetRepeatedSfixed32(0)); - Assert.Equal(210, message.GetRepeatedSfixed64(0)); - Assert.Equal(211, message.GetRepeatedFloat(0)); - Assert.Equal(212, message.GetRepeatedDouble(0)); - Assert.Equal(true, message.GetRepeatedBool(0)); - Assert.Equal("215", message.GetRepeatedString(0)); - Assert.Equal(ToBytes("216"), message.GetRepeatedBytes(0)); - - Assert.Equal(217, message.GetRepeatedGroup(0).A); - Assert.Equal(218, message.GetRepeatedNestedMessage(0).Bb); - Assert.Equal(219, message.GetRepeatedForeignMessage(0).C); - Assert.Equal(220, message.GetRepeatedImportMessage(0).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); - Assert.Equal(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); - - Assert.Equal("224", message.GetRepeatedStringPiece(0)); - Assert.Equal("225", message.GetRepeatedCord(0)); - - Assert.Equal(301, message.GetRepeatedInt32(1)); - Assert.Equal(302, message.GetRepeatedInt64(1)); - Assert.Equal(303u, message.GetRepeatedUint32(1)); - Assert.Equal(304u, message.GetRepeatedUint64(1)); - Assert.Equal(305, message.GetRepeatedSint32(1)); - Assert.Equal(306, message.GetRepeatedSint64(1)); - Assert.Equal(307u, message.GetRepeatedFixed32(1)); - Assert.Equal(308u, message.GetRepeatedFixed64(1)); - Assert.Equal(309, message.GetRepeatedSfixed32(1)); - Assert.Equal(310, message.GetRepeatedSfixed64(1)); - Assert.Equal(311f, message.GetRepeatedFloat(1)); - Assert.Equal(312d, message.GetRepeatedDouble(1)); - Assert.Equal(false, message.GetRepeatedBool(1)); - Assert.Equal("315", message.GetRepeatedString(1)); - Assert.Equal(ToBytes("316"), message.GetRepeatedBytes(1)); - - Assert.Equal(317, message.GetRepeatedGroup(1).A); - Assert.Equal(318, message.GetRepeatedNestedMessage(1).Bb); - Assert.Equal(319, message.GetRepeatedForeignMessage(1).C); - Assert.Equal(320, message.GetRepeatedImportMessage(1).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, message.GetRepeatedNestedEnum(1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetRepeatedForeignEnum(1)); - Assert.Equal(ImportEnum.IMPORT_BAZ, message.GetRepeatedImportEnum(1)); - - Assert.Equal("324", message.GetRepeatedStringPiece(1)); - Assert.Equal("325", message.GetRepeatedCord(1)); + Assert.AreEqual(2, message.RepeatedInt32Count); + Assert.AreEqual(2, message.RepeatedInt64Count); + Assert.AreEqual(2, message.RepeatedUint32Count); + Assert.AreEqual(2, message.RepeatedUint64Count); + Assert.AreEqual(2, message.RepeatedSint32Count); + Assert.AreEqual(2, message.RepeatedSint64Count); + Assert.AreEqual(2, message.RepeatedFixed32Count); + Assert.AreEqual(2, message.RepeatedFixed64Count); + Assert.AreEqual(2, message.RepeatedSfixed32Count); + Assert.AreEqual(2, message.RepeatedSfixed64Count); + Assert.AreEqual(2, message.RepeatedFloatCount); + Assert.AreEqual(2, message.RepeatedDoubleCount); + Assert.AreEqual(2, message.RepeatedBoolCount); + Assert.AreEqual(2, message.RepeatedStringCount); + Assert.AreEqual(2, message.RepeatedBytesCount); + + Assert.AreEqual(2, message.RepeatedGroupCount); + Assert.AreEqual(2, message.RepeatedNestedMessageCount); + Assert.AreEqual(2, message.RepeatedForeignMessageCount); + Assert.AreEqual(2, message.RepeatedImportMessageCount); + Assert.AreEqual(2, message.RepeatedNestedEnumCount); + Assert.AreEqual(2, message.RepeatedForeignEnumCount); + Assert.AreEqual(2, message.RepeatedImportEnumCount); + + Assert.AreEqual(2, message.RepeatedStringPieceCount); + Assert.AreEqual(2, message.RepeatedCordCount); + + Assert.AreEqual(201, message.GetRepeatedInt32(0)); + Assert.AreEqual(202, message.GetRepeatedInt64(0)); + Assert.AreEqual(203u, message.GetRepeatedUint32(0)); + Assert.AreEqual(204u, message.GetRepeatedUint64(0)); + Assert.AreEqual(205, message.GetRepeatedSint32(0)); + Assert.AreEqual(206, message.GetRepeatedSint64(0)); + Assert.AreEqual(207u, message.GetRepeatedFixed32(0)); + Assert.AreEqual(208u, message.GetRepeatedFixed64(0)); + Assert.AreEqual(209, message.GetRepeatedSfixed32(0)); + Assert.AreEqual(210, message.GetRepeatedSfixed64(0)); + Assert.AreEqual(211, message.GetRepeatedFloat(0)); + Assert.AreEqual(212, message.GetRepeatedDouble(0)); + Assert.AreEqual(true, message.GetRepeatedBool(0)); + Assert.AreEqual("215", message.GetRepeatedString(0)); + Assert.AreEqual(ToBytes("216"), message.GetRepeatedBytes(0)); + + Assert.AreEqual(217, message.GetRepeatedGroup(0).A); + Assert.AreEqual(218, message.GetRepeatedNestedMessage(0).Bb); + Assert.AreEqual(219, message.GetRepeatedForeignMessage(0).C); + Assert.AreEqual(220, message.GetRepeatedImportMessage(0).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); + + Assert.AreEqual("224", message.GetRepeatedStringPiece(0)); + Assert.AreEqual("225", message.GetRepeatedCord(0)); + + Assert.AreEqual(301, message.GetRepeatedInt32(1)); + Assert.AreEqual(302, message.GetRepeatedInt64(1)); + Assert.AreEqual(303u, message.GetRepeatedUint32(1)); + Assert.AreEqual(304u, message.GetRepeatedUint64(1)); + Assert.AreEqual(305, message.GetRepeatedSint32(1)); + Assert.AreEqual(306, message.GetRepeatedSint64(1)); + Assert.AreEqual(307u, message.GetRepeatedFixed32(1)); + Assert.AreEqual(308u, message.GetRepeatedFixed64(1)); + Assert.AreEqual(309, message.GetRepeatedSfixed32(1)); + Assert.AreEqual(310, message.GetRepeatedSfixed64(1)); + Assert.AreEqual(311f, message.GetRepeatedFloat(1)); + Assert.AreEqual(312d, message.GetRepeatedDouble(1)); + Assert.AreEqual(false, message.GetRepeatedBool(1)); + Assert.AreEqual("315", message.GetRepeatedString(1)); + Assert.AreEqual(ToBytes("316"), message.GetRepeatedBytes(1)); + + Assert.AreEqual(317, message.GetRepeatedGroup(1).A); + Assert.AreEqual(318, message.GetRepeatedNestedMessage(1).Bb); + Assert.AreEqual(319, message.GetRepeatedForeignMessage(1).C); + Assert.AreEqual(320, message.GetRepeatedImportMessage(1).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.GetRepeatedNestedEnum(1)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetRepeatedForeignEnum(1)); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.GetRepeatedImportEnum(1)); + + Assert.AreEqual("324", message.GetRepeatedStringPiece(1)); + Assert.AreEqual("325", message.GetRepeatedCord(1)); // ----------------------------------------------------------------- - Assert.True(message.HasDefaultInt32); - Assert.True(message.HasDefaultInt64); - Assert.True(message.HasDefaultUint32); - Assert.True(message.HasDefaultUint64); - Assert.True(message.HasDefaultSint32); - Assert.True(message.HasDefaultSint64); - Assert.True(message.HasDefaultFixed32); - Assert.True(message.HasDefaultFixed64); - Assert.True(message.HasDefaultSfixed32); - Assert.True(message.HasDefaultSfixed64); - Assert.True(message.HasDefaultFloat); - Assert.True(message.HasDefaultDouble); - Assert.True(message.HasDefaultBool); - Assert.True(message.HasDefaultString); - Assert.True(message.HasDefaultBytes); - - Assert.True(message.HasDefaultNestedEnum); - Assert.True(message.HasDefaultForeignEnum); - Assert.True(message.HasDefaultImportEnum); - - Assert.True(message.HasDefaultStringPiece); - Assert.True(message.HasDefaultCord); - - Assert.Equal(401, message.DefaultInt32); - Assert.Equal(402, message.DefaultInt64); - Assert.Equal(403u, message.DefaultUint32); - Assert.Equal(404u, message.DefaultUint64); - Assert.Equal(405, message.DefaultSint32); - Assert.Equal(406, message.DefaultSint64); - Assert.Equal(407u, message.DefaultFixed32); - Assert.Equal(408u, message.DefaultFixed64); - Assert.Equal(409, message.DefaultSfixed32); - Assert.Equal(410, message.DefaultSfixed64); - Assert.Equal(411, message.DefaultFloat); - Assert.Equal(412, message.DefaultDouble); - Assert.Equal(false, message.DefaultBool); - Assert.Equal("415", message.DefaultString); - Assert.Equal(ToBytes("416"), message.DefaultBytes); - - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.DefaultNestedEnum); - Assert.Equal(ForeignEnum.FOREIGN_FOO, message.DefaultForeignEnum); - Assert.Equal(ImportEnum.IMPORT_FOO, message.DefaultImportEnum); - - Assert.Equal("424", message.DefaultStringPiece); - Assert.Equal("425", message.DefaultCord); + Assert.IsTrue(message.HasDefaultInt32); + Assert.IsTrue(message.HasDefaultInt64); + Assert.IsTrue(message.HasDefaultUint32); + Assert.IsTrue(message.HasDefaultUint64); + Assert.IsTrue(message.HasDefaultSint32); + Assert.IsTrue(message.HasDefaultSint64); + Assert.IsTrue(message.HasDefaultFixed32); + Assert.IsTrue(message.HasDefaultFixed64); + Assert.IsTrue(message.HasDefaultSfixed32); + Assert.IsTrue(message.HasDefaultSfixed64); + Assert.IsTrue(message.HasDefaultFloat); + Assert.IsTrue(message.HasDefaultDouble); + Assert.IsTrue(message.HasDefaultBool); + Assert.IsTrue(message.HasDefaultString); + Assert.IsTrue(message.HasDefaultBytes); + + Assert.IsTrue(message.HasDefaultNestedEnum); + Assert.IsTrue(message.HasDefaultForeignEnum); + Assert.IsTrue(message.HasDefaultImportEnum); + + Assert.IsTrue(message.HasDefaultStringPiece); + Assert.IsTrue(message.HasDefaultCord); + + Assert.AreEqual(401, message.DefaultInt32); + Assert.AreEqual(402, message.DefaultInt64); + Assert.AreEqual(403u, message.DefaultUint32); + Assert.AreEqual(404u, message.DefaultUint64); + Assert.AreEqual(405, message.DefaultSint32); + Assert.AreEqual(406, message.DefaultSint64); + Assert.AreEqual(407u, message.DefaultFixed32); + Assert.AreEqual(408u, message.DefaultFixed64); + Assert.AreEqual(409, message.DefaultSfixed32); + Assert.AreEqual(410, message.DefaultSfixed64); + Assert.AreEqual(411, message.DefaultFloat); + Assert.AreEqual(412, message.DefaultDouble); + Assert.AreEqual(false, message.DefaultBool); + Assert.AreEqual("415", message.DefaultString); + Assert.AreEqual(ToBytes("416"), message.DefaultBytes); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.DefaultNestedEnum); + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.DefaultForeignEnum); + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.DefaultImportEnum); + + Assert.AreEqual("424", message.DefaultStringPiece); + Assert.AreEqual("425", message.DefaultCord); } internal static void AssertClear(TestAllTypes message) { // HasBlah() should initially be false for all optional fields. - Assert.False(message.HasOptionalInt32); - Assert.False(message.HasOptionalInt64); - Assert.False(message.HasOptionalUint32); - Assert.False(message.HasOptionalUint64); - Assert.False(message.HasOptionalSint32); - Assert.False(message.HasOptionalSint64); - Assert.False(message.HasOptionalFixed32); - Assert.False(message.HasOptionalFixed64); - Assert.False(message.HasOptionalSfixed32); - Assert.False(message.HasOptionalSfixed64); - Assert.False(message.HasOptionalFloat); - Assert.False(message.HasOptionalDouble); - Assert.False(message.HasOptionalBool); - Assert.False(message.HasOptionalString); - Assert.False(message.HasOptionalBytes); - - Assert.False(message.HasOptionalGroup); - Assert.False(message.HasOptionalNestedMessage); - Assert.False(message.HasOptionalForeignMessage); - Assert.False(message.HasOptionalImportMessage); - - Assert.False(message.HasOptionalNestedEnum); - Assert.False(message.HasOptionalForeignEnum); - Assert.False(message.HasOptionalImportEnum); - - Assert.False(message.HasOptionalStringPiece); - Assert.False(message.HasOptionalCord); + Assert.IsFalse(message.HasOptionalInt32); + Assert.IsFalse(message.HasOptionalInt64); + Assert.IsFalse(message.HasOptionalUint32); + Assert.IsFalse(message.HasOptionalUint64); + Assert.IsFalse(message.HasOptionalSint32); + Assert.IsFalse(message.HasOptionalSint64); + Assert.IsFalse(message.HasOptionalFixed32); + Assert.IsFalse(message.HasOptionalFixed64); + Assert.IsFalse(message.HasOptionalSfixed32); + Assert.IsFalse(message.HasOptionalSfixed64); + Assert.IsFalse(message.HasOptionalFloat); + Assert.IsFalse(message.HasOptionalDouble); + Assert.IsFalse(message.HasOptionalBool); + Assert.IsFalse(message.HasOptionalString); + Assert.IsFalse(message.HasOptionalBytes); + + Assert.IsFalse(message.HasOptionalGroup); + Assert.IsFalse(message.HasOptionalNestedMessage); + Assert.IsFalse(message.HasOptionalForeignMessage); + Assert.IsFalse(message.HasOptionalImportMessage); + + Assert.IsFalse(message.HasOptionalNestedEnum); + Assert.IsFalse(message.HasOptionalForeignEnum); + Assert.IsFalse(message.HasOptionalImportEnum); + + Assert.IsFalse(message.HasOptionalStringPiece); + Assert.IsFalse(message.HasOptionalCord); // Optional fields without defaults are set to zero or something like it. - Assert.Equal(0, message.OptionalInt32); - Assert.Equal(0, message.OptionalInt64); - Assert.Equal(0u, message.OptionalUint32); - Assert.Equal(0u, message.OptionalUint64); - Assert.Equal(0, message.OptionalSint32); - Assert.Equal(0, message.OptionalSint64); - Assert.Equal(0u, message.OptionalFixed32); - Assert.Equal(0u, message.OptionalFixed64); - Assert.Equal(0, message.OptionalSfixed32); - Assert.Equal(0, message.OptionalSfixed64); - Assert.Equal(0, message.OptionalFloat); - Assert.Equal(0, message.OptionalDouble); - Assert.Equal(false, message.OptionalBool); - Assert.Equal("", message.OptionalString); - Assert.Equal(ByteString.Empty, message.OptionalBytes); + Assert.AreEqual(0, message.OptionalInt32); + Assert.AreEqual(0, message.OptionalInt64); + Assert.AreEqual(0u, message.OptionalUint32); + Assert.AreEqual(0u, message.OptionalUint64); + Assert.AreEqual(0, message.OptionalSint32); + Assert.AreEqual(0, message.OptionalSint64); + Assert.AreEqual(0u, message.OptionalFixed32); + Assert.AreEqual(0u, message.OptionalFixed64); + Assert.AreEqual(0, message.OptionalSfixed32); + Assert.AreEqual(0, message.OptionalSfixed64); + Assert.AreEqual(0, message.OptionalFloat); + Assert.AreEqual(0, message.OptionalDouble); + Assert.AreEqual(false, message.OptionalBool); + Assert.AreEqual("", message.OptionalString); + Assert.AreEqual(ByteString.Empty, message.OptionalBytes); // Embedded messages should also be clear. - Assert.False(message.OptionalGroup.HasA); - Assert.False(message.OptionalNestedMessage.HasBb); - Assert.False(message.OptionalForeignMessage.HasC); - Assert.False(message.OptionalImportMessage.HasD); + Assert.IsFalse(message.OptionalGroup.HasA); + Assert.IsFalse(message.OptionalNestedMessage.HasBb); + Assert.IsFalse(message.OptionalForeignMessage.HasC); + Assert.IsFalse(message.OptionalImportMessage.HasD); - Assert.Equal(0, message.OptionalGroup.A); - Assert.Equal(0, message.OptionalNestedMessage.Bb); - Assert.Equal(0, message.OptionalForeignMessage.C); - Assert.Equal(0, message.OptionalImportMessage.D); + Assert.AreEqual(0, message.OptionalGroup.A); + Assert.AreEqual(0, message.OptionalNestedMessage.Bb); + Assert.AreEqual(0, message.OptionalForeignMessage.C); + Assert.AreEqual(0, message.OptionalImportMessage.D); // Enums without defaults are set to the first value in the enum. - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); - Assert.Equal(ForeignEnum.FOREIGN_FOO, message.OptionalForeignEnum); - Assert.Equal(ImportEnum.IMPORT_FOO, message.OptionalImportEnum); + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.OptionalForeignEnum); + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.OptionalImportEnum); - Assert.Equal("", message.OptionalStringPiece); - Assert.Equal("", message.OptionalCord); + Assert.AreEqual("", message.OptionalStringPiece); + Assert.AreEqual("", message.OptionalCord); // Repeated fields are empty. - Assert.Equal(0, message.RepeatedInt32Count); - Assert.Equal(0, message.RepeatedInt64Count); - Assert.Equal(0, message.RepeatedUint32Count); - Assert.Equal(0, message.RepeatedUint64Count); - Assert.Equal(0, message.RepeatedSint32Count); - Assert.Equal(0, message.RepeatedSint64Count); - Assert.Equal(0, message.RepeatedFixed32Count); - Assert.Equal(0, message.RepeatedFixed64Count); - Assert.Equal(0, message.RepeatedSfixed32Count); - Assert.Equal(0, message.RepeatedSfixed64Count); - Assert.Equal(0, message.RepeatedFloatCount); - Assert.Equal(0, message.RepeatedDoubleCount); - Assert.Equal(0, message.RepeatedBoolCount); - Assert.Equal(0, message.RepeatedStringCount); - Assert.Equal(0, message.RepeatedBytesCount); - - Assert.Equal(0, message.RepeatedGroupCount); - Assert.Equal(0, message.RepeatedNestedMessageCount); - Assert.Equal(0, message.RepeatedForeignMessageCount); - Assert.Equal(0, message.RepeatedImportMessageCount); - Assert.Equal(0, message.RepeatedNestedEnumCount); - Assert.Equal(0, message.RepeatedForeignEnumCount); - Assert.Equal(0, message.RepeatedImportEnumCount); - - Assert.Equal(0, message.RepeatedStringPieceCount); - Assert.Equal(0, message.RepeatedCordCount); + Assert.AreEqual(0, message.RepeatedInt32Count); + Assert.AreEqual(0, message.RepeatedInt64Count); + Assert.AreEqual(0, message.RepeatedUint32Count); + Assert.AreEqual(0, message.RepeatedUint64Count); + Assert.AreEqual(0, message.RepeatedSint32Count); + Assert.AreEqual(0, message.RepeatedSint64Count); + Assert.AreEqual(0, message.RepeatedFixed32Count); + Assert.AreEqual(0, message.RepeatedFixed64Count); + Assert.AreEqual(0, message.RepeatedSfixed32Count); + Assert.AreEqual(0, message.RepeatedSfixed64Count); + Assert.AreEqual(0, message.RepeatedFloatCount); + Assert.AreEqual(0, message.RepeatedDoubleCount); + Assert.AreEqual(0, message.RepeatedBoolCount); + Assert.AreEqual(0, message.RepeatedStringCount); + Assert.AreEqual(0, message.RepeatedBytesCount); + + Assert.AreEqual(0, message.RepeatedGroupCount); + Assert.AreEqual(0, message.RepeatedNestedMessageCount); + Assert.AreEqual(0, message.RepeatedForeignMessageCount); + Assert.AreEqual(0, message.RepeatedImportMessageCount); + Assert.AreEqual(0, message.RepeatedNestedEnumCount); + Assert.AreEqual(0, message.RepeatedForeignEnumCount); + Assert.AreEqual(0, message.RepeatedImportEnumCount); + + Assert.AreEqual(0, message.RepeatedStringPieceCount); + Assert.AreEqual(0, message.RepeatedCordCount); // HasBlah() should also be false for all default fields. - Assert.False(message.HasDefaultInt32); - Assert.False(message.HasDefaultInt64); - Assert.False(message.HasDefaultUint32); - Assert.False(message.HasDefaultUint64); - Assert.False(message.HasDefaultSint32); - Assert.False(message.HasDefaultSint64); - Assert.False(message.HasDefaultFixed32); - Assert.False(message.HasDefaultFixed64); - Assert.False(message.HasDefaultSfixed32); - Assert.False(message.HasDefaultSfixed64); - Assert.False(message.HasDefaultFloat); - Assert.False(message.HasDefaultDouble); - Assert.False(message.HasDefaultBool); - Assert.False(message.HasDefaultString); - Assert.False(message.HasDefaultBytes); - - Assert.False(message.HasDefaultNestedEnum); - Assert.False(message.HasDefaultForeignEnum); - Assert.False(message.HasDefaultImportEnum); - - Assert.False(message.HasDefaultStringPiece); - Assert.False(message.HasDefaultCord); + Assert.IsFalse(message.HasDefaultInt32); + Assert.IsFalse(message.HasDefaultInt64); + Assert.IsFalse(message.HasDefaultUint32); + Assert.IsFalse(message.HasDefaultUint64); + Assert.IsFalse(message.HasDefaultSint32); + Assert.IsFalse(message.HasDefaultSint64); + Assert.IsFalse(message.HasDefaultFixed32); + Assert.IsFalse(message.HasDefaultFixed64); + Assert.IsFalse(message.HasDefaultSfixed32); + Assert.IsFalse(message.HasDefaultSfixed64); + Assert.IsFalse(message.HasDefaultFloat); + Assert.IsFalse(message.HasDefaultDouble); + Assert.IsFalse(message.HasDefaultBool); + Assert.IsFalse(message.HasDefaultString); + Assert.IsFalse(message.HasDefaultBytes); + + Assert.IsFalse(message.HasDefaultNestedEnum); + Assert.IsFalse(message.HasDefaultForeignEnum); + Assert.IsFalse(message.HasDefaultImportEnum); + + Assert.IsFalse(message.HasDefaultStringPiece); + Assert.IsFalse(message.HasDefaultCord); // Fields with defaults have their default values (duh). - Assert.Equal(41, message.DefaultInt32); - Assert.Equal(42, message.DefaultInt64); - Assert.Equal(43u, message.DefaultUint32); - Assert.Equal(44u, message.DefaultUint64); - Assert.Equal(-45, message.DefaultSint32); - Assert.Equal(46, message.DefaultSint64); - Assert.Equal(47u, message.DefaultFixed32); - Assert.Equal(48u, message.DefaultFixed64); - Assert.Equal(49, message.DefaultSfixed32); - Assert.Equal(-50, message.DefaultSfixed64); - Assert.Equal(51.5f, message.DefaultFloat); - Assert.Equal(52e3d, message.DefaultDouble); - Assert.Equal(true, message.DefaultBool); - Assert.Equal("hello", message.DefaultString); - Assert.Equal(ToBytes("world"), message.DefaultBytes); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.DefaultNestedEnum); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.DefaultForeignEnum); - Assert.Equal(ImportEnum.IMPORT_BAR, message.DefaultImportEnum); - - Assert.Equal("abc", message.DefaultStringPiece); - Assert.Equal("123", message.DefaultCord); + Assert.AreEqual(41, message.DefaultInt32); + Assert.AreEqual(42, message.DefaultInt64); + Assert.AreEqual(43u, message.DefaultUint32); + Assert.AreEqual(44u, message.DefaultUint64); + Assert.AreEqual(-45, message.DefaultSint32); + Assert.AreEqual(46, message.DefaultSint64); + Assert.AreEqual(47u, message.DefaultFixed32); + Assert.AreEqual(48u, message.DefaultFixed64); + Assert.AreEqual(49, message.DefaultSfixed32); + Assert.AreEqual(-50, message.DefaultSfixed64); + Assert.AreEqual(51.5f, message.DefaultFloat); + Assert.AreEqual(52e3d, message.DefaultDouble); + Assert.AreEqual(true, message.DefaultBool); + Assert.AreEqual("hello", message.DefaultString); + Assert.AreEqual(ToBytes("world"), message.DefaultBytes); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.DefaultNestedEnum); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.DefaultForeignEnum); + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.DefaultImportEnum); + + Assert.AreEqual("abc", message.DefaultStringPiece); + Assert.AreEqual("123", message.DefaultCord); } /// @@ -855,89 +855,89 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.Equal(2, message.RepeatedInt32Count); - Assert.Equal(2, message.RepeatedInt64Count); - Assert.Equal(2, message.RepeatedUint32Count); - Assert.Equal(2, message.RepeatedUint64Count); - Assert.Equal(2, message.RepeatedSint32Count); - Assert.Equal(2, message.RepeatedSint64Count); - Assert.Equal(2, message.RepeatedFixed32Count); - Assert.Equal(2, message.RepeatedFixed64Count); - Assert.Equal(2, message.RepeatedSfixed32Count); - Assert.Equal(2, message.RepeatedSfixed64Count); - Assert.Equal(2, message.RepeatedFloatCount); - Assert.Equal(2, message.RepeatedDoubleCount); - Assert.Equal(2, message.RepeatedBoolCount); - Assert.Equal(2, message.RepeatedStringCount); - Assert.Equal(2, message.RepeatedBytesCount); - - Assert.Equal(2, message.RepeatedGroupCount); - Assert.Equal(2, message.RepeatedNestedMessageCount); - Assert.Equal(2, message.RepeatedForeignMessageCount); - Assert.Equal(2, message.RepeatedImportMessageCount); - Assert.Equal(2, message.RepeatedNestedEnumCount); - Assert.Equal(2, message.RepeatedForeignEnumCount); - Assert.Equal(2, message.RepeatedImportEnumCount); - - Assert.Equal(2, message.RepeatedStringPieceCount); - Assert.Equal(2, message.RepeatedCordCount); - - Assert.Equal(201, message.GetRepeatedInt32(0)); - Assert.Equal(202L, message.GetRepeatedInt64(0)); - Assert.Equal(203U, message.GetRepeatedUint32(0)); - Assert.Equal(204UL, message.GetRepeatedUint64(0)); - Assert.Equal(205, message.GetRepeatedSint32(0)); - Assert.Equal(206L, message.GetRepeatedSint64(0)); - Assert.Equal(207U, message.GetRepeatedFixed32(0)); - Assert.Equal(208UL, message.GetRepeatedFixed64(0)); - Assert.Equal(209, message.GetRepeatedSfixed32(0)); - Assert.Equal(210L, message.GetRepeatedSfixed64(0)); - Assert.Equal(211F, message.GetRepeatedFloat(0)); - Assert.Equal(212D, message.GetRepeatedDouble(0)); - Assert.Equal(true, message.GetRepeatedBool(0)); - Assert.Equal("215", message.GetRepeatedString(0)); - Assert.Equal(ToBytes("216"), message.GetRepeatedBytes(0)); - - Assert.Equal(217, message.GetRepeatedGroup(0).A); - Assert.Equal(218, message.GetRepeatedNestedMessage(0).Bb); - Assert.Equal(219, message.GetRepeatedForeignMessage(0).C); - Assert.Equal(220, message.GetRepeatedImportMessage(0).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); - Assert.Equal(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); - - Assert.Equal("224", message.GetRepeatedStringPiece(0)); - Assert.Equal("225", message.GetRepeatedCord(0)); + Assert.AreEqual(2, message.RepeatedInt32Count); + Assert.AreEqual(2, message.RepeatedInt64Count); + Assert.AreEqual(2, message.RepeatedUint32Count); + Assert.AreEqual(2, message.RepeatedUint64Count); + Assert.AreEqual(2, message.RepeatedSint32Count); + Assert.AreEqual(2, message.RepeatedSint64Count); + Assert.AreEqual(2, message.RepeatedFixed32Count); + Assert.AreEqual(2, message.RepeatedFixed64Count); + Assert.AreEqual(2, message.RepeatedSfixed32Count); + Assert.AreEqual(2, message.RepeatedSfixed64Count); + Assert.AreEqual(2, message.RepeatedFloatCount); + Assert.AreEqual(2, message.RepeatedDoubleCount); + Assert.AreEqual(2, message.RepeatedBoolCount); + Assert.AreEqual(2, message.RepeatedStringCount); + Assert.AreEqual(2, message.RepeatedBytesCount); + + Assert.AreEqual(2, message.RepeatedGroupCount); + Assert.AreEqual(2, message.RepeatedNestedMessageCount); + Assert.AreEqual(2, message.RepeatedForeignMessageCount); + Assert.AreEqual(2, message.RepeatedImportMessageCount); + Assert.AreEqual(2, message.RepeatedNestedEnumCount); + Assert.AreEqual(2, message.RepeatedForeignEnumCount); + Assert.AreEqual(2, message.RepeatedImportEnumCount); + + Assert.AreEqual(2, message.RepeatedStringPieceCount); + Assert.AreEqual(2, message.RepeatedCordCount); + + Assert.AreEqual(201, message.GetRepeatedInt32(0)); + Assert.AreEqual(202L, message.GetRepeatedInt64(0)); + Assert.AreEqual(203U, message.GetRepeatedUint32(0)); + Assert.AreEqual(204UL, message.GetRepeatedUint64(0)); + Assert.AreEqual(205, message.GetRepeatedSint32(0)); + Assert.AreEqual(206L, message.GetRepeatedSint64(0)); + Assert.AreEqual(207U, message.GetRepeatedFixed32(0)); + Assert.AreEqual(208UL, message.GetRepeatedFixed64(0)); + Assert.AreEqual(209, message.GetRepeatedSfixed32(0)); + Assert.AreEqual(210L, message.GetRepeatedSfixed64(0)); + Assert.AreEqual(211F, message.GetRepeatedFloat(0)); + Assert.AreEqual(212D, message.GetRepeatedDouble(0)); + Assert.AreEqual(true, message.GetRepeatedBool(0)); + Assert.AreEqual("215", message.GetRepeatedString(0)); + Assert.AreEqual(ToBytes("216"), message.GetRepeatedBytes(0)); + + Assert.AreEqual(217, message.GetRepeatedGroup(0).A); + Assert.AreEqual(218, message.GetRepeatedNestedMessage(0).Bb); + Assert.AreEqual(219, message.GetRepeatedForeignMessage(0).C); + Assert.AreEqual(220, message.GetRepeatedImportMessage(0).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetRepeatedNestedEnum(0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetRepeatedForeignEnum(0)); + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetRepeatedImportEnum(0)); + + Assert.AreEqual("224", message.GetRepeatedStringPiece(0)); + Assert.AreEqual("225", message.GetRepeatedCord(0)); // Actually verify the second (modified) elements now. - Assert.Equal(501, message.GetRepeatedInt32(1)); - Assert.Equal(502L, message.GetRepeatedInt64(1)); - Assert.Equal(503U, message.GetRepeatedUint32(1)); - Assert.Equal(504UL, message.GetRepeatedUint64(1)); - Assert.Equal(505, message.GetRepeatedSint32(1)); - Assert.Equal(506L, message.GetRepeatedSint64(1)); - Assert.Equal(507U, message.GetRepeatedFixed32(1)); - Assert.Equal(508UL, message.GetRepeatedFixed64(1)); - Assert.Equal(509, message.GetRepeatedSfixed32(1)); - Assert.Equal(510L, message.GetRepeatedSfixed64(1)); - Assert.Equal(511F, message.GetRepeatedFloat(1)); - Assert.Equal(512D, message.GetRepeatedDouble(1)); - Assert.Equal(true, message.GetRepeatedBool(1)); - Assert.Equal("515", message.GetRepeatedString(1)); - Assert.Equal(ToBytes("516"), message.GetRepeatedBytes(1)); - - Assert.Equal(517, message.GetRepeatedGroup(1).A); - Assert.Equal(518, message.GetRepeatedNestedMessage(1).Bb); - Assert.Equal(519, message.GetRepeatedForeignMessage(1).C); - Assert.Equal(520, message.GetRepeatedImportMessage(1).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, message.GetRepeatedNestedEnum(1)); - Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetRepeatedForeignEnum(1)); - Assert.Equal(ImportEnum.IMPORT_FOO, message.GetRepeatedImportEnum(1)); - - Assert.Equal("524", message.GetRepeatedStringPiece(1)); - Assert.Equal("525", message.GetRepeatedCord(1)); + Assert.AreEqual(501, message.GetRepeatedInt32(1)); + Assert.AreEqual(502L, message.GetRepeatedInt64(1)); + Assert.AreEqual(503U, message.GetRepeatedUint32(1)); + Assert.AreEqual(504UL, message.GetRepeatedUint64(1)); + Assert.AreEqual(505, message.GetRepeatedSint32(1)); + Assert.AreEqual(506L, message.GetRepeatedSint64(1)); + Assert.AreEqual(507U, message.GetRepeatedFixed32(1)); + Assert.AreEqual(508UL, message.GetRepeatedFixed64(1)); + Assert.AreEqual(509, message.GetRepeatedSfixed32(1)); + Assert.AreEqual(510L, message.GetRepeatedSfixed64(1)); + Assert.AreEqual(511F, message.GetRepeatedFloat(1)); + Assert.AreEqual(512D, message.GetRepeatedDouble(1)); + Assert.AreEqual(true, message.GetRepeatedBool(1)); + Assert.AreEqual("515", message.GetRepeatedString(1)); + Assert.AreEqual(ToBytes("516"), message.GetRepeatedBytes(1)); + + Assert.AreEqual(517, message.GetRepeatedGroup(1).A); + Assert.AreEqual(518, message.GetRepeatedNestedMessage(1).Bb); + Assert.AreEqual(519, message.GetRepeatedForeignMessage(1).C); + Assert.AreEqual(520, message.GetRepeatedImportMessage(1).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.GetRepeatedNestedEnum(1)); + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetRepeatedForeignEnum(1)); + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetRepeatedImportEnum(1)); + + Assert.AreEqual("524", message.GetRepeatedStringPiece(1)); + Assert.AreEqual("525", message.GetRepeatedCord(1)); } /// @@ -949,222 +949,222 @@ namespace Google.ProtocolBuffers { foreach (T secondElement in second) { - Assert.True(firstEnumerator.MoveNext(), "First enumerator ran out of elements too early."); - Assert.Equal(firstEnumerator.Current, secondElement); + Assert.IsTrue(firstEnumerator.MoveNext(), "First enumerator ran out of elements too early."); + Assert.AreEqual(firstEnumerator.Current, secondElement); } - Assert.False(firstEnumerator.MoveNext(), "Second enumerator ran out of elements too early."); + Assert.IsFalse(firstEnumerator.MoveNext(), "Second enumerator ran out of elements too early."); } } internal static void AssertEqualBytes(byte[] expected, byte[] actual) { - Assert.Equal(ByteString.CopyFrom(expected), ByteString.CopyFrom(actual)); + Assert.AreEqual(ByteString.CopyFrom(expected), ByteString.CopyFrom(actual)); } internal static void AssertAllExtensionsSet(TestAllExtensions message) { - Assert.True(message.HasExtension(Unittest.OptionalInt32Extension)); - Assert.True(message.HasExtension(Unittest.OptionalInt64Extension)); - Assert.True(message.HasExtension(Unittest.OptionalUint32Extension)); - Assert.True(message.HasExtension(Unittest.OptionalUint64Extension)); - Assert.True(message.HasExtension(Unittest.OptionalSint32Extension)); - Assert.True(message.HasExtension(Unittest.OptionalSint64Extension)); - Assert.True(message.HasExtension(Unittest.OptionalFixed32Extension)); - Assert.True(message.HasExtension(Unittest.OptionalFixed64Extension)); - Assert.True(message.HasExtension(Unittest.OptionalSfixed32Extension)); - Assert.True(message.HasExtension(Unittest.OptionalSfixed64Extension)); - Assert.True(message.HasExtension(Unittest.OptionalFloatExtension)); - Assert.True(message.HasExtension(Unittest.OptionalDoubleExtension)); - Assert.True(message.HasExtension(Unittest.OptionalBoolExtension)); - Assert.True(message.HasExtension(Unittest.OptionalStringExtension)); - Assert.True(message.HasExtension(Unittest.OptionalBytesExtension)); - - Assert.True(message.HasExtension(Unittest.OptionalGroupExtension)); - Assert.True(message.HasExtension(Unittest.OptionalNestedMessageExtension)); - Assert.True(message.HasExtension(Unittest.OptionalForeignMessageExtension)); - Assert.True(message.HasExtension(Unittest.OptionalImportMessageExtension)); - - Assert.True(message.GetExtension(Unittest.OptionalGroupExtension).HasA); - Assert.True(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); - Assert.True(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); - Assert.True(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); - - Assert.True(message.HasExtension(Unittest.OptionalNestedEnumExtension)); - Assert.True(message.HasExtension(Unittest.OptionalForeignEnumExtension)); - Assert.True(message.HasExtension(Unittest.OptionalImportEnumExtension)); - - Assert.True(message.HasExtension(Unittest.OptionalStringPieceExtension)); - Assert.True(message.HasExtension(Unittest.OptionalCordExtension)); - - Assert.Equal(101, message.GetExtension(Unittest.OptionalInt32Extension)); - Assert.Equal(102L, message.GetExtension(Unittest.OptionalInt64Extension)); - Assert.Equal(103U, message.GetExtension(Unittest.OptionalUint32Extension)); - Assert.Equal(104UL, message.GetExtension(Unittest.OptionalUint64Extension)); - Assert.Equal(105, message.GetExtension(Unittest.OptionalSint32Extension)); - Assert.Equal(106L, message.GetExtension(Unittest.OptionalSint64Extension)); - Assert.Equal(107U, message.GetExtension(Unittest.OptionalFixed32Extension)); - Assert.Equal(108UL, message.GetExtension(Unittest.OptionalFixed64Extension)); - Assert.Equal(109, message.GetExtension(Unittest.OptionalSfixed32Extension)); - Assert.Equal(110L, message.GetExtension(Unittest.OptionalSfixed64Extension)); - Assert.Equal(111F, message.GetExtension(Unittest.OptionalFloatExtension)); - Assert.Equal(112D, message.GetExtension(Unittest.OptionalDoubleExtension)); - Assert.Equal(true, message.GetExtension(Unittest.OptionalBoolExtension)); - Assert.Equal("115", message.GetExtension(Unittest.OptionalStringExtension)); - Assert.Equal(ToBytes("116"), message.GetExtension(Unittest.OptionalBytesExtension)); - - Assert.Equal(117, message.GetExtension(Unittest.OptionalGroupExtension).A); - Assert.Equal(118, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); - Assert.Equal(119, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); - Assert.Equal(120, message.GetExtension(Unittest.OptionalImportMessageExtension).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, + Assert.IsTrue(message.HasExtension(Unittest.OptionalInt32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalInt64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalUint32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalUint64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalSint32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalSint64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalFixed32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalFixed64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalSfixed32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalSfixed64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalFloatExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalDoubleExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalBoolExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalStringExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalBytesExtension)); + + Assert.IsTrue(message.HasExtension(Unittest.OptionalGroupExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalNestedMessageExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalForeignMessageExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalImportMessageExtension)); + + Assert.IsTrue(message.GetExtension(Unittest.OptionalGroupExtension).HasA); + Assert.IsTrue(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); + Assert.IsTrue(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); + Assert.IsTrue(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); + + Assert.IsTrue(message.HasExtension(Unittest.OptionalNestedEnumExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalForeignEnumExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalImportEnumExtension)); + + Assert.IsTrue(message.HasExtension(Unittest.OptionalStringPieceExtension)); + Assert.IsTrue(message.HasExtension(Unittest.OptionalCordExtension)); + + Assert.AreEqual(101, message.GetExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(102L, message.GetExtension(Unittest.OptionalInt64Extension)); + Assert.AreEqual(103U, message.GetExtension(Unittest.OptionalUint32Extension)); + Assert.AreEqual(104UL, message.GetExtension(Unittest.OptionalUint64Extension)); + Assert.AreEqual(105, message.GetExtension(Unittest.OptionalSint32Extension)); + Assert.AreEqual(106L, message.GetExtension(Unittest.OptionalSint64Extension)); + Assert.AreEqual(107U, message.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.AreEqual(108UL, message.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.AreEqual(109, message.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.AreEqual(110L, message.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.AreEqual(111F, message.GetExtension(Unittest.OptionalFloatExtension)); + Assert.AreEqual(112D, message.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.AreEqual(true, message.GetExtension(Unittest.OptionalBoolExtension)); + Assert.AreEqual("115", message.GetExtension(Unittest.OptionalStringExtension)); + Assert.AreEqual(ToBytes("116"), message.GetExtension(Unittest.OptionalBytesExtension)); + + Assert.AreEqual(117, message.GetExtension(Unittest.OptionalGroupExtension).A); + Assert.AreEqual(118, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); + Assert.AreEqual(119, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); + Assert.AreEqual(120, message.GetExtension(Unittest.OptionalImportMessageExtension).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.GetExtension(Unittest.OptionalNestedEnumExtension)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.OptionalForeignEnumExtension)); - Assert.Equal(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.OptionalImportEnumExtension)); - Assert.Equal("124", message.GetExtension(Unittest.OptionalStringPieceExtension)); - Assert.Equal("125", message.GetExtension(Unittest.OptionalCordExtension)); + Assert.AreEqual("124", message.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.AreEqual("125", message.GetExtension(Unittest.OptionalCordExtension)); // ----------------------------------------------------------------- - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); - - Assert.Equal(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); - Assert.Equal(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); - Assert.Equal(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); - Assert.Equal(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); - Assert.Equal(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); - Assert.Equal(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); - Assert.Equal(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); - Assert.Equal(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); - Assert.Equal(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); - Assert.Equal(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); - Assert.Equal(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); - Assert.Equal(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); - Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); - Assert.Equal("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); - Assert.Equal(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); - - Assert.Equal(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); - Assert.Equal(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); - Assert.Equal(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); - Assert.Equal(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + + Assert.AreEqual(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.AreEqual(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); + Assert.AreEqual(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.AreEqual(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); + Assert.AreEqual(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.AreEqual(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.AreEqual(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.AreEqual(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.AreEqual(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.AreEqual(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.AreEqual(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); + Assert.AreEqual(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); + Assert.AreEqual("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.AreEqual(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); + + Assert.AreEqual(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); + Assert.AreEqual(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); + Assert.AreEqual(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); + Assert.AreEqual(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); - Assert.Equal(ImportEnum.IMPORT_BAR, + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); - Assert.Equal("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); - Assert.Equal("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); - - Assert.Equal(301, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); - Assert.Equal(302L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); - Assert.Equal(303U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); - Assert.Equal(304UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); - Assert.Equal(305, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); - Assert.Equal(306L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); - Assert.Equal(307U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); - Assert.Equal(308UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); - Assert.Equal(309, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); - Assert.Equal(310L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); - Assert.Equal(311F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); - Assert.Equal(312D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); - Assert.Equal(false, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); - Assert.Equal("315", message.GetExtension(Unittest.RepeatedStringExtension, 1)); - Assert.Equal(ToBytes("316"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); - - Assert.Equal(317, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); - Assert.Equal(318, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); - Assert.Equal(319, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); - Assert.Equal(320, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAZ, + Assert.AreEqual("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.AreEqual("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); + + Assert.AreEqual(301, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); + Assert.AreEqual(302L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); + Assert.AreEqual(303U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); + Assert.AreEqual(304UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); + Assert.AreEqual(305, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); + Assert.AreEqual(306L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); + Assert.AreEqual(307U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); + Assert.AreEqual(308UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); + Assert.AreEqual(309, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); + Assert.AreEqual(310L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); + Assert.AreEqual(311F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); + Assert.AreEqual(312D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); + Assert.AreEqual(false, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); + Assert.AreEqual("315", message.GetExtension(Unittest.RepeatedStringExtension, 1)); + Assert.AreEqual(ToBytes("316"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); + + Assert.AreEqual(317, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); + Assert.AreEqual(318, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); + Assert.AreEqual(319, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); + Assert.AreEqual(320, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAZ, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 1)); - Assert.Equal(ImportEnum.IMPORT_BAZ, + Assert.AreEqual(ImportEnum.IMPORT_BAZ, message.GetExtension(Unittest.RepeatedImportEnumExtension, 1)); - Assert.Equal("324", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); - Assert.Equal("325", message.GetExtension(Unittest.RepeatedCordExtension, 1)); + Assert.AreEqual("324", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); + Assert.AreEqual("325", message.GetExtension(Unittest.RepeatedCordExtension, 1)); // ----------------------------------------------------------------- - Assert.True(message.HasExtension(Unittest.DefaultInt32Extension)); - Assert.True(message.HasExtension(Unittest.DefaultInt64Extension)); - Assert.True(message.HasExtension(Unittest.DefaultUint32Extension)); - Assert.True(message.HasExtension(Unittest.DefaultUint64Extension)); - Assert.True(message.HasExtension(Unittest.DefaultSint32Extension)); - Assert.True(message.HasExtension(Unittest.DefaultSint64Extension)); - Assert.True(message.HasExtension(Unittest.DefaultFixed32Extension)); - Assert.True(message.HasExtension(Unittest.DefaultFixed64Extension)); - Assert.True(message.HasExtension(Unittest.DefaultSfixed32Extension)); - Assert.True(message.HasExtension(Unittest.DefaultSfixed64Extension)); - Assert.True(message.HasExtension(Unittest.DefaultFloatExtension)); - Assert.True(message.HasExtension(Unittest.DefaultDoubleExtension)); - Assert.True(message.HasExtension(Unittest.DefaultBoolExtension)); - Assert.True(message.HasExtension(Unittest.DefaultStringExtension)); - Assert.True(message.HasExtension(Unittest.DefaultBytesExtension)); - - Assert.True(message.HasExtension(Unittest.DefaultNestedEnumExtension)); - Assert.True(message.HasExtension(Unittest.DefaultForeignEnumExtension)); - Assert.True(message.HasExtension(Unittest.DefaultImportEnumExtension)); - - Assert.True(message.HasExtension(Unittest.DefaultStringPieceExtension)); - Assert.True(message.HasExtension(Unittest.DefaultCordExtension)); - - Assert.Equal(401, message.GetExtension(Unittest.DefaultInt32Extension)); - Assert.Equal(402L, message.GetExtension(Unittest.DefaultInt64Extension)); - Assert.Equal(403U, message.GetExtension(Unittest.DefaultUint32Extension)); - Assert.Equal(404UL, message.GetExtension(Unittest.DefaultUint64Extension)); - Assert.Equal(405, message.GetExtension(Unittest.DefaultSint32Extension)); - Assert.Equal(406L, message.GetExtension(Unittest.DefaultSint64Extension)); - Assert.Equal(407U, message.GetExtension(Unittest.DefaultFixed32Extension)); - Assert.Equal(408UL, message.GetExtension(Unittest.DefaultFixed64Extension)); - Assert.Equal(409, message.GetExtension(Unittest.DefaultSfixed32Extension)); - Assert.Equal(410L, message.GetExtension(Unittest.DefaultSfixed64Extension)); - Assert.Equal(411F, message.GetExtension(Unittest.DefaultFloatExtension)); - Assert.Equal(412D, message.GetExtension(Unittest.DefaultDoubleExtension)); - Assert.Equal(false, message.GetExtension(Unittest.DefaultBoolExtension)); - Assert.Equal("415", message.GetExtension(Unittest.DefaultStringExtension)); - Assert.Equal(ToBytes("416"), message.GetExtension(Unittest.DefaultBytesExtension)); - - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, + Assert.IsTrue(message.HasExtension(Unittest.DefaultInt32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultInt64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultUint32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultUint64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultSint32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultSint64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultFixed32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultFixed64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultSfixed32Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultSfixed64Extension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultFloatExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultDoubleExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultBoolExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultStringExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultBytesExtension)); + + Assert.IsTrue(message.HasExtension(Unittest.DefaultNestedEnumExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultForeignEnumExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultImportEnumExtension)); + + Assert.IsTrue(message.HasExtension(Unittest.DefaultStringPieceExtension)); + Assert.IsTrue(message.HasExtension(Unittest.DefaultCordExtension)); + + Assert.AreEqual(401, message.GetExtension(Unittest.DefaultInt32Extension)); + Assert.AreEqual(402L, message.GetExtension(Unittest.DefaultInt64Extension)); + Assert.AreEqual(403U, message.GetExtension(Unittest.DefaultUint32Extension)); + Assert.AreEqual(404UL, message.GetExtension(Unittest.DefaultUint64Extension)); + Assert.AreEqual(405, message.GetExtension(Unittest.DefaultSint32Extension)); + Assert.AreEqual(406L, message.GetExtension(Unittest.DefaultSint64Extension)); + Assert.AreEqual(407U, message.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.AreEqual(408UL, message.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.AreEqual(409, message.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.AreEqual(410L, message.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.AreEqual(411F, message.GetExtension(Unittest.DefaultFloatExtension)); + Assert.AreEqual(412D, message.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.AreEqual(false, message.GetExtension(Unittest.DefaultBoolExtension)); + Assert.AreEqual("415", message.GetExtension(Unittest.DefaultStringExtension)); + Assert.AreEqual(ToBytes("416"), message.GetExtension(Unittest.DefaultBytesExtension)); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.DefaultNestedEnumExtension)); - Assert.Equal(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.DefaultForeignEnumExtension)); - Assert.Equal(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.DefaultImportEnumExtension)); - Assert.Equal("424", message.GetExtension(Unittest.DefaultStringPieceExtension)); - Assert.Equal("425", message.GetExtension(Unittest.DefaultCordExtension)); + Assert.AreEqual("424", message.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.AreEqual("425", message.GetExtension(Unittest.DefaultCordExtension)); } /// @@ -1215,242 +1215,242 @@ namespace Google.ProtocolBuffers // ModifyRepeatedFields only sets the second repeated element of each // field. In addition to verifying this, we also verify that the first // element and size were *not* modified. - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); - - Assert.Equal(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); - Assert.Equal(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); - Assert.Equal(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); - Assert.Equal(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); - Assert.Equal(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); - Assert.Equal(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); - Assert.Equal(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); - Assert.Equal(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); - Assert.Equal(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); - Assert.Equal(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); - Assert.Equal(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); - Assert.Equal(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); - Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); - Assert.Equal("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); - Assert.Equal(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); - - Assert.Equal(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); - Assert.Equal(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); - Assert.Equal(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); - Assert.Equal(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + + Assert.AreEqual(201, message.GetExtension(Unittest.RepeatedInt32Extension, 0)); + Assert.AreEqual(202L, message.GetExtension(Unittest.RepeatedInt64Extension, 0)); + Assert.AreEqual(203U, message.GetExtension(Unittest.RepeatedUint32Extension, 0)); + Assert.AreEqual(204UL, message.GetExtension(Unittest.RepeatedUint64Extension, 0)); + Assert.AreEqual(205, message.GetExtension(Unittest.RepeatedSint32Extension, 0)); + Assert.AreEqual(206L, message.GetExtension(Unittest.RepeatedSint64Extension, 0)); + Assert.AreEqual(207U, message.GetExtension(Unittest.RepeatedFixed32Extension, 0)); + Assert.AreEqual(208UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 0)); + Assert.AreEqual(209, message.GetExtension(Unittest.RepeatedSfixed32Extension, 0)); + Assert.AreEqual(210L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 0)); + Assert.AreEqual(211F, message.GetExtension(Unittest.RepeatedFloatExtension, 0)); + Assert.AreEqual(212D, message.GetExtension(Unittest.RepeatedDoubleExtension, 0)); + Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 0)); + Assert.AreEqual("215", message.GetExtension(Unittest.RepeatedStringExtension, 0)); + Assert.AreEqual(ToBytes("216"), message.GetExtension(Unittest.RepeatedBytesExtension, 0)); + + Assert.AreEqual(217, message.GetExtension(Unittest.RepeatedGroupExtension, 0).A); + Assert.AreEqual(218, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 0).Bb); + Assert.AreEqual(219, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 0).C); + Assert.AreEqual(220, message.GetExtension(Unittest.RepeatedImportMessageExtension, 0).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 0)); - Assert.Equal(ImportEnum.IMPORT_BAR, + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.RepeatedImportEnumExtension, 0)); - Assert.Equal("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); - Assert.Equal("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); + Assert.AreEqual("224", message.GetExtension(Unittest.RepeatedStringPieceExtension, 0)); + Assert.AreEqual("225", message.GetExtension(Unittest.RepeatedCordExtension, 0)); // Actually verify the second (modified) elements now. - Assert.Equal(501, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); - Assert.Equal(502L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); - Assert.Equal(503U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); - Assert.Equal(504UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); - Assert.Equal(505, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); - Assert.Equal(506L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); - Assert.Equal(507U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); - Assert.Equal(508UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); - Assert.Equal(509, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); - Assert.Equal(510L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); - Assert.Equal(511F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); - Assert.Equal(512D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); - Assert.Equal(true, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); - Assert.Equal("515", message.GetExtension(Unittest.RepeatedStringExtension, 1)); - Assert.Equal(ToBytes("516"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); - - Assert.Equal(517, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); - Assert.Equal(518, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); - Assert.Equal(519, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); - Assert.Equal(520, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); - - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, + Assert.AreEqual(501, message.GetExtension(Unittest.RepeatedInt32Extension, 1)); + Assert.AreEqual(502L, message.GetExtension(Unittest.RepeatedInt64Extension, 1)); + Assert.AreEqual(503U, message.GetExtension(Unittest.RepeatedUint32Extension, 1)); + Assert.AreEqual(504UL, message.GetExtension(Unittest.RepeatedUint64Extension, 1)); + Assert.AreEqual(505, message.GetExtension(Unittest.RepeatedSint32Extension, 1)); + Assert.AreEqual(506L, message.GetExtension(Unittest.RepeatedSint64Extension, 1)); + Assert.AreEqual(507U, message.GetExtension(Unittest.RepeatedFixed32Extension, 1)); + Assert.AreEqual(508UL, message.GetExtension(Unittest.RepeatedFixed64Extension, 1)); + Assert.AreEqual(509, message.GetExtension(Unittest.RepeatedSfixed32Extension, 1)); + Assert.AreEqual(510L, message.GetExtension(Unittest.RepeatedSfixed64Extension, 1)); + Assert.AreEqual(511F, message.GetExtension(Unittest.RepeatedFloatExtension, 1)); + Assert.AreEqual(512D, message.GetExtension(Unittest.RepeatedDoubleExtension, 1)); + Assert.AreEqual(true, message.GetExtension(Unittest.RepeatedBoolExtension, 1)); + Assert.AreEqual("515", message.GetExtension(Unittest.RepeatedStringExtension, 1)); + Assert.AreEqual(ToBytes("516"), message.GetExtension(Unittest.RepeatedBytesExtension, 1)); + + Assert.AreEqual(517, message.GetExtension(Unittest.RepeatedGroupExtension, 1).A); + Assert.AreEqual(518, message.GetExtension(Unittest.RepeatedNestedMessageExtension, 1).Bb); + Assert.AreEqual(519, message.GetExtension(Unittest.RepeatedForeignMessageExtension, 1).C); + Assert.AreEqual(520, message.GetExtension(Unittest.RepeatedImportMessageExtension, 1).D); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.RepeatedNestedEnumExtension, 1)); - Assert.Equal(ForeignEnum.FOREIGN_FOO, + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.RepeatedForeignEnumExtension, 1)); - Assert.Equal(ImportEnum.IMPORT_FOO, + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.RepeatedImportEnumExtension, 1)); - Assert.Equal("524", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); - Assert.Equal("525", message.GetExtension(Unittest.RepeatedCordExtension, 1)); + Assert.AreEqual("524", message.GetExtension(Unittest.RepeatedStringPieceExtension, 1)); + Assert.AreEqual("525", message.GetExtension(Unittest.RepeatedCordExtension, 1)); } internal static void AssertExtensionsClear(TestAllExtensions message) { // HasBlah() should initially be false for all optional fields. - Assert.False(message.HasExtension(Unittest.OptionalInt32Extension)); - Assert.False(message.HasExtension(Unittest.OptionalInt64Extension)); - Assert.False(message.HasExtension(Unittest.OptionalUint32Extension)); - Assert.False(message.HasExtension(Unittest.OptionalUint64Extension)); - Assert.False(message.HasExtension(Unittest.OptionalSint32Extension)); - Assert.False(message.HasExtension(Unittest.OptionalSint64Extension)); - Assert.False(message.HasExtension(Unittest.OptionalFixed32Extension)); - Assert.False(message.HasExtension(Unittest.OptionalFixed64Extension)); - Assert.False(message.HasExtension(Unittest.OptionalSfixed32Extension)); - Assert.False(message.HasExtension(Unittest.OptionalSfixed64Extension)); - Assert.False(message.HasExtension(Unittest.OptionalFloatExtension)); - Assert.False(message.HasExtension(Unittest.OptionalDoubleExtension)); - Assert.False(message.HasExtension(Unittest.OptionalBoolExtension)); - Assert.False(message.HasExtension(Unittest.OptionalStringExtension)); - Assert.False(message.HasExtension(Unittest.OptionalBytesExtension)); - - Assert.False(message.HasExtension(Unittest.OptionalGroupExtension)); - Assert.False(message.HasExtension(Unittest.OptionalNestedMessageExtension)); - Assert.False(message.HasExtension(Unittest.OptionalForeignMessageExtension)); - Assert.False(message.HasExtension(Unittest.OptionalImportMessageExtension)); - - Assert.False(message.HasExtension(Unittest.OptionalNestedEnumExtension)); - Assert.False(message.HasExtension(Unittest.OptionalForeignEnumExtension)); - Assert.False(message.HasExtension(Unittest.OptionalImportEnumExtension)); - - Assert.False(message.HasExtension(Unittest.OptionalStringPieceExtension)); - Assert.False(message.HasExtension(Unittest.OptionalCordExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalInt32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalInt64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalUint32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalUint64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalSint32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalSint64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalFixed32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalFixed64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalSfixed32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalSfixed64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalFloatExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalDoubleExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalBoolExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalStringExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalBytesExtension)); + + Assert.IsFalse(message.HasExtension(Unittest.OptionalGroupExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalNestedMessageExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalForeignMessageExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalImportMessageExtension)); + + Assert.IsFalse(message.HasExtension(Unittest.OptionalNestedEnumExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalForeignEnumExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalImportEnumExtension)); + + Assert.IsFalse(message.HasExtension(Unittest.OptionalStringPieceExtension)); + Assert.IsFalse(message.HasExtension(Unittest.OptionalCordExtension)); // Optional fields without defaults are set to zero or something like it. - Assert.Equal(0, message.GetExtension(Unittest.OptionalInt32Extension)); - Assert.Equal(0L, message.GetExtension(Unittest.OptionalInt64Extension)); - Assert.Equal(0U, message.GetExtension(Unittest.OptionalUint32Extension)); - Assert.Equal(0UL, message.GetExtension(Unittest.OptionalUint64Extension)); - Assert.Equal(0, message.GetExtension(Unittest.OptionalSint32Extension)); - Assert.Equal(0L, message.GetExtension(Unittest.OptionalSint64Extension)); - Assert.Equal(0U, message.GetExtension(Unittest.OptionalFixed32Extension)); - Assert.Equal(0UL, message.GetExtension(Unittest.OptionalFixed64Extension)); - Assert.Equal(0, message.GetExtension(Unittest.OptionalSfixed32Extension)); - Assert.Equal(0L, message.GetExtension(Unittest.OptionalSfixed64Extension)); - Assert.Equal(0F, message.GetExtension(Unittest.OptionalFloatExtension)); - Assert.Equal(0D, message.GetExtension(Unittest.OptionalDoubleExtension)); - Assert.Equal(false, message.GetExtension(Unittest.OptionalBoolExtension)); - Assert.Equal("", message.GetExtension(Unittest.OptionalStringExtension)); - Assert.Equal(ByteString.Empty, message.GetExtension(Unittest.OptionalBytesExtension)); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalInt64Extension)); + Assert.AreEqual(0U, message.GetExtension(Unittest.OptionalUint32Extension)); + Assert.AreEqual(0UL, message.GetExtension(Unittest.OptionalUint64Extension)); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalSint32Extension)); + Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalSint64Extension)); + Assert.AreEqual(0U, message.GetExtension(Unittest.OptionalFixed32Extension)); + Assert.AreEqual(0UL, message.GetExtension(Unittest.OptionalFixed64Extension)); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalSfixed32Extension)); + Assert.AreEqual(0L, message.GetExtension(Unittest.OptionalSfixed64Extension)); + Assert.AreEqual(0F, message.GetExtension(Unittest.OptionalFloatExtension)); + Assert.AreEqual(0D, message.GetExtension(Unittest.OptionalDoubleExtension)); + Assert.AreEqual(false, message.GetExtension(Unittest.OptionalBoolExtension)); + Assert.AreEqual("", message.GetExtension(Unittest.OptionalStringExtension)); + Assert.AreEqual(ByteString.Empty, message.GetExtension(Unittest.OptionalBytesExtension)); // Embedded messages should also be clear. - Assert.False(message.GetExtension(Unittest.OptionalGroupExtension).HasA); - Assert.False(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); - Assert.False(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); - Assert.False(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); + Assert.IsFalse(message.GetExtension(Unittest.OptionalGroupExtension).HasA); + Assert.IsFalse(message.GetExtension(Unittest.OptionalNestedMessageExtension).HasBb); + Assert.IsFalse(message.GetExtension(Unittest.OptionalForeignMessageExtension).HasC); + Assert.IsFalse(message.GetExtension(Unittest.OptionalImportMessageExtension).HasD); - Assert.Equal(0, message.GetExtension(Unittest.OptionalGroupExtension).A); - Assert.Equal(0, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); - Assert.Equal(0, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); - Assert.Equal(0, message.GetExtension(Unittest.OptionalImportMessageExtension).D); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalGroupExtension).A); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalNestedMessageExtension).Bb); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalForeignMessageExtension).C); + Assert.AreEqual(0, message.GetExtension(Unittest.OptionalImportMessageExtension).D); // Enums without defaults are set to the first value in the enum. - Assert.Equal(TestAllTypes.Types.NestedEnum.FOO, + Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.GetExtension(Unittest.OptionalNestedEnumExtension)); - Assert.Equal(ForeignEnum.FOREIGN_FOO, + Assert.AreEqual(ForeignEnum.FOREIGN_FOO, message.GetExtension(Unittest.OptionalForeignEnumExtension)); - Assert.Equal(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.OptionalImportEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_FOO, message.GetExtension(Unittest.OptionalImportEnumExtension)); - Assert.Equal("", message.GetExtension(Unittest.OptionalStringPieceExtension)); - Assert.Equal("", message.GetExtension(Unittest.OptionalCordExtension)); + Assert.AreEqual("", message.GetExtension(Unittest.OptionalStringPieceExtension)); + Assert.AreEqual("", message.GetExtension(Unittest.OptionalCordExtension)); // Repeated fields are empty. - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedStringExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); - - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); - - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); - Assert.Equal(0, message.GetExtensionCount(Unittest.RepeatedCordExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedInt32Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedInt64Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedUint32Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedUint64Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSint32Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSint64Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFixed32Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFixed64Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSfixed32Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedSfixed64Extension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedFloatExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedBoolExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedStringExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedBytesExtension)); + + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedGroupExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedNestedMessageExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedForeignMessageExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedImportMessageExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedNestedEnumExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedForeignEnumExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedImportEnumExtension)); + + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedStringPieceExtension)); + Assert.AreEqual(0, message.GetExtensionCount(Unittest.RepeatedCordExtension)); // HasBlah() should also be false for all default fields. - Assert.False(message.HasExtension(Unittest.DefaultInt32Extension)); - Assert.False(message.HasExtension(Unittest.DefaultInt64Extension)); - Assert.False(message.HasExtension(Unittest.DefaultUint32Extension)); - Assert.False(message.HasExtension(Unittest.DefaultUint64Extension)); - Assert.False(message.HasExtension(Unittest.DefaultSint32Extension)); - Assert.False(message.HasExtension(Unittest.DefaultSint64Extension)); - Assert.False(message.HasExtension(Unittest.DefaultFixed32Extension)); - Assert.False(message.HasExtension(Unittest.DefaultFixed64Extension)); - Assert.False(message.HasExtension(Unittest.DefaultSfixed32Extension)); - Assert.False(message.HasExtension(Unittest.DefaultSfixed64Extension)); - Assert.False(message.HasExtension(Unittest.DefaultFloatExtension)); - Assert.False(message.HasExtension(Unittest.DefaultDoubleExtension)); - Assert.False(message.HasExtension(Unittest.DefaultBoolExtension)); - Assert.False(message.HasExtension(Unittest.DefaultStringExtension)); - Assert.False(message.HasExtension(Unittest.DefaultBytesExtension)); - - Assert.False(message.HasExtension(Unittest.DefaultNestedEnumExtension)); - Assert.False(message.HasExtension(Unittest.DefaultForeignEnumExtension)); - Assert.False(message.HasExtension(Unittest.DefaultImportEnumExtension)); - - Assert.False(message.HasExtension(Unittest.DefaultStringPieceExtension)); - Assert.False(message.HasExtension(Unittest.DefaultCordExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultInt32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultInt64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultUint32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultUint64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultSint32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultSint64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultFixed32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultFixed64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultSfixed32Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultSfixed64Extension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultFloatExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultDoubleExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultBoolExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultStringExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultBytesExtension)); + + Assert.IsFalse(message.HasExtension(Unittest.DefaultNestedEnumExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultForeignEnumExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultImportEnumExtension)); + + Assert.IsFalse(message.HasExtension(Unittest.DefaultStringPieceExtension)); + Assert.IsFalse(message.HasExtension(Unittest.DefaultCordExtension)); // Fields with defaults have their default values (duh). - Assert.Equal(41, message.GetExtension(Unittest.DefaultInt32Extension)); - Assert.Equal(42L, message.GetExtension(Unittest.DefaultInt64Extension)); - Assert.Equal(43U, message.GetExtension(Unittest.DefaultUint32Extension)); - Assert.Equal(44UL, message.GetExtension(Unittest.DefaultUint64Extension)); - Assert.Equal(-45, message.GetExtension(Unittest.DefaultSint32Extension)); - Assert.Equal(46L, message.GetExtension(Unittest.DefaultSint64Extension)); - Assert.Equal(47U, message.GetExtension(Unittest.DefaultFixed32Extension)); - Assert.Equal(48UL, message.GetExtension(Unittest.DefaultFixed64Extension)); - Assert.Equal(49, message.GetExtension(Unittest.DefaultSfixed32Extension)); - Assert.Equal(-50L, message.GetExtension(Unittest.DefaultSfixed64Extension)); - Assert.Equal(51.5F, message.GetExtension(Unittest.DefaultFloatExtension)); - Assert.Equal(52e3D, message.GetExtension(Unittest.DefaultDoubleExtension)); - Assert.Equal(true, message.GetExtension(Unittest.DefaultBoolExtension)); - Assert.Equal("hello", message.GetExtension(Unittest.DefaultStringExtension)); - Assert.Equal(ToBytes("world"), message.GetExtension(Unittest.DefaultBytesExtension)); - - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, + Assert.AreEqual(41, message.GetExtension(Unittest.DefaultInt32Extension)); + Assert.AreEqual(42L, message.GetExtension(Unittest.DefaultInt64Extension)); + Assert.AreEqual(43U, message.GetExtension(Unittest.DefaultUint32Extension)); + Assert.AreEqual(44UL, message.GetExtension(Unittest.DefaultUint64Extension)); + Assert.AreEqual(-45, message.GetExtension(Unittest.DefaultSint32Extension)); + Assert.AreEqual(46L, message.GetExtension(Unittest.DefaultSint64Extension)); + Assert.AreEqual(47U, message.GetExtension(Unittest.DefaultFixed32Extension)); + Assert.AreEqual(48UL, message.GetExtension(Unittest.DefaultFixed64Extension)); + Assert.AreEqual(49, message.GetExtension(Unittest.DefaultSfixed32Extension)); + Assert.AreEqual(-50L, message.GetExtension(Unittest.DefaultSfixed64Extension)); + Assert.AreEqual(51.5F, message.GetExtension(Unittest.DefaultFloatExtension)); + Assert.AreEqual(52e3D, message.GetExtension(Unittest.DefaultDoubleExtension)); + Assert.AreEqual(true, message.GetExtension(Unittest.DefaultBoolExtension)); + Assert.AreEqual("hello", message.GetExtension(Unittest.DefaultStringExtension)); + Assert.AreEqual(ToBytes("world"), message.GetExtension(Unittest.DefaultBytesExtension)); + + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.DefaultNestedEnumExtension)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.DefaultForeignEnumExtension)); - Assert.Equal(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.DefaultImportEnumExtension)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.DefaultForeignEnumExtension)); + Assert.AreEqual(ImportEnum.IMPORT_BAR, message.GetExtension(Unittest.DefaultImportEnumExtension)); - Assert.Equal("abc", message.GetExtension(Unittest.DefaultStringPieceExtension)); - Assert.Equal("123", message.GetExtension(Unittest.DefaultCordExtension)); + Assert.AreEqual("abc", message.GetExtension(Unittest.DefaultStringPieceExtension)); + Assert.AreEqual("123", message.GetExtension(Unittest.DefaultCordExtension)); } /// @@ -1495,48 +1495,48 @@ namespace Google.ProtocolBuffers /// public static void AssertPackedFieldsSet(TestPackedTypes message) { - Assert.Equal(2, message.PackedInt32Count); - Assert.Equal(2, message.PackedInt64Count); - Assert.Equal(2, message.PackedUint32Count); - Assert.Equal(2, message.PackedUint64Count); - Assert.Equal(2, message.PackedSint32Count); - Assert.Equal(2, message.PackedSint64Count); - Assert.Equal(2, message.PackedFixed32Count); - Assert.Equal(2, message.PackedFixed64Count); - Assert.Equal(2, message.PackedSfixed32Count); - Assert.Equal(2, message.PackedSfixed64Count); - Assert.Equal(2, message.PackedFloatCount); - Assert.Equal(2, message.PackedDoubleCount); - Assert.Equal(2, message.PackedBoolCount); - Assert.Equal(2, message.PackedEnumCount); - Assert.Equal(601, message.GetPackedInt32(0)); - Assert.Equal(602, message.GetPackedInt64(0)); - Assert.Equal(603u, message.GetPackedUint32(0)); - Assert.Equal(604u, message.GetPackedUint64(0)); - Assert.Equal(605, message.GetPackedSint32(0)); - Assert.Equal(606, message.GetPackedSint64(0)); - Assert.Equal(607u, message.GetPackedFixed32(0)); - Assert.Equal(608u, message.GetPackedFixed64(0)); - Assert.Equal(609, message.GetPackedSfixed32(0)); - Assert.Equal(610, message.GetPackedSfixed64(0)); - Assert.Equal(611f, message.GetPackedFloat(0)); - Assert.Equal(612d, message.GetPackedDouble(0)); - Assert.Equal(true, message.GetPackedBool(0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetPackedEnum(0)); - Assert.Equal(701, message.GetPackedInt32(1)); - Assert.Equal(702, message.GetPackedInt64(1)); - Assert.Equal(703u, message.GetPackedUint32(1)); - Assert.Equal(704u, message.GetPackedUint64(1)); - Assert.Equal(705, message.GetPackedSint32(1)); - Assert.Equal(706, message.GetPackedSint64(1)); - Assert.Equal(707u, message.GetPackedFixed32(1)); - Assert.Equal(708u, message.GetPackedFixed64(1)); - Assert.Equal(709, message.GetPackedSfixed32(1)); - Assert.Equal(710, message.GetPackedSfixed64(1)); - Assert.Equal(711f, message.GetPackedFloat(1)); - Assert.Equal(712d, message.GetPackedDouble(1)); - Assert.Equal(false, message.GetPackedBool(1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetPackedEnum(1)); + Assert.AreEqual(2, message.PackedInt32Count); + Assert.AreEqual(2, message.PackedInt64Count); + Assert.AreEqual(2, message.PackedUint32Count); + Assert.AreEqual(2, message.PackedUint64Count); + Assert.AreEqual(2, message.PackedSint32Count); + Assert.AreEqual(2, message.PackedSint64Count); + Assert.AreEqual(2, message.PackedFixed32Count); + Assert.AreEqual(2, message.PackedFixed64Count); + Assert.AreEqual(2, message.PackedSfixed32Count); + Assert.AreEqual(2, message.PackedSfixed64Count); + Assert.AreEqual(2, message.PackedFloatCount); + Assert.AreEqual(2, message.PackedDoubleCount); + Assert.AreEqual(2, message.PackedBoolCount); + Assert.AreEqual(2, message.PackedEnumCount); + Assert.AreEqual(601, message.GetPackedInt32(0)); + Assert.AreEqual(602, message.GetPackedInt64(0)); + Assert.AreEqual(603u, message.GetPackedUint32(0)); + Assert.AreEqual(604u, message.GetPackedUint64(0)); + Assert.AreEqual(605, message.GetPackedSint32(0)); + Assert.AreEqual(606, message.GetPackedSint64(0)); + Assert.AreEqual(607u, message.GetPackedFixed32(0)); + Assert.AreEqual(608u, message.GetPackedFixed64(0)); + Assert.AreEqual(609, message.GetPackedSfixed32(0)); + Assert.AreEqual(610, message.GetPackedSfixed64(0)); + Assert.AreEqual(611f, message.GetPackedFloat(0)); + Assert.AreEqual(612d, message.GetPackedDouble(0)); + Assert.AreEqual(true, message.GetPackedBool(0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetPackedEnum(0)); + Assert.AreEqual(701, message.GetPackedInt32(1)); + Assert.AreEqual(702, message.GetPackedInt64(1)); + Assert.AreEqual(703u, message.GetPackedUint32(1)); + Assert.AreEqual(704u, message.GetPackedUint64(1)); + Assert.AreEqual(705, message.GetPackedSint32(1)); + Assert.AreEqual(706, message.GetPackedSint64(1)); + Assert.AreEqual(707u, message.GetPackedFixed32(1)); + Assert.AreEqual(708u, message.GetPackedFixed64(1)); + Assert.AreEqual(709, message.GetPackedSfixed32(1)); + Assert.AreEqual(710, message.GetPackedSfixed64(1)); + Assert.AreEqual(711f, message.GetPackedFloat(1)); + Assert.AreEqual(712d, message.GetPackedDouble(1)); + Assert.AreEqual(false, message.GetPackedBool(1)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetPackedEnum(1)); } /// /// Asserts that all the fields of the specified message are set to the values assigned @@ -1544,48 +1544,48 @@ namespace Google.ProtocolBuffers /// public static void AssertUnpackedFieldsSet(TestUnpackedTypes message) { - Assert.Equal(2, message.UnpackedInt32Count); - Assert.Equal(2, message.UnpackedInt64Count); - Assert.Equal(2, message.UnpackedUint32Count); - Assert.Equal(2, message.UnpackedUint64Count); - Assert.Equal(2, message.UnpackedSint32Count); - Assert.Equal(2, message.UnpackedSint64Count); - Assert.Equal(2, message.UnpackedFixed32Count); - Assert.Equal(2, message.UnpackedFixed64Count); - Assert.Equal(2, message.UnpackedSfixed32Count); - Assert.Equal(2, message.UnpackedSfixed64Count); - Assert.Equal(2, message.UnpackedFloatCount); - Assert.Equal(2, message.UnpackedDoubleCount); - Assert.Equal(2, message.UnpackedBoolCount); - Assert.Equal(2, message.UnpackedEnumCount); - Assert.Equal(601, message.GetUnpackedInt32(0)); - Assert.Equal(602, message.GetUnpackedInt64(0)); - Assert.Equal(603u, message.GetUnpackedUint32(0)); - Assert.Equal(604u, message.GetUnpackedUint64(0)); - Assert.Equal(605, message.GetUnpackedSint32(0)); - Assert.Equal(606, message.GetUnpackedSint64(0)); - Assert.Equal(607u, message.GetUnpackedFixed32(0)); - Assert.Equal(608u, message.GetUnpackedFixed64(0)); - Assert.Equal(609, message.GetUnpackedSfixed32(0)); - Assert.Equal(610, message.GetUnpackedSfixed64(0)); - Assert.Equal(611f, message.GetUnpackedFloat(0)); - Assert.Equal(612d, message.GetUnpackedDouble(0)); - Assert.Equal(true, message.GetUnpackedBool(0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetUnpackedEnum(0)); - Assert.Equal(701, message.GetUnpackedInt32(1)); - Assert.Equal(702, message.GetUnpackedInt64(1)); - Assert.Equal(703u, message.GetUnpackedUint32(1)); - Assert.Equal(704u, message.GetUnpackedUint64(1)); - Assert.Equal(705, message.GetUnpackedSint32(1)); - Assert.Equal(706, message.GetUnpackedSint64(1)); - Assert.Equal(707u, message.GetUnpackedFixed32(1)); - Assert.Equal(708u, message.GetUnpackedFixed64(1)); - Assert.Equal(709, message.GetUnpackedSfixed32(1)); - Assert.Equal(710, message.GetUnpackedSfixed64(1)); - Assert.Equal(711f, message.GetUnpackedFloat(1)); - Assert.Equal(712d, message.GetUnpackedDouble(1)); - Assert.Equal(false, message.GetUnpackedBool(1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetUnpackedEnum(1)); + Assert.AreEqual(2, message.UnpackedInt32Count); + Assert.AreEqual(2, message.UnpackedInt64Count); + Assert.AreEqual(2, message.UnpackedUint32Count); + Assert.AreEqual(2, message.UnpackedUint64Count); + Assert.AreEqual(2, message.UnpackedSint32Count); + Assert.AreEqual(2, message.UnpackedSint64Count); + Assert.AreEqual(2, message.UnpackedFixed32Count); + Assert.AreEqual(2, message.UnpackedFixed64Count); + Assert.AreEqual(2, message.UnpackedSfixed32Count); + Assert.AreEqual(2, message.UnpackedSfixed64Count); + Assert.AreEqual(2, message.UnpackedFloatCount); + Assert.AreEqual(2, message.UnpackedDoubleCount); + Assert.AreEqual(2, message.UnpackedBoolCount); + Assert.AreEqual(2, message.UnpackedEnumCount); + Assert.AreEqual(601, message.GetUnpackedInt32(0)); + Assert.AreEqual(602, message.GetUnpackedInt64(0)); + Assert.AreEqual(603u, message.GetUnpackedUint32(0)); + Assert.AreEqual(604u, message.GetUnpackedUint64(0)); + Assert.AreEqual(605, message.GetUnpackedSint32(0)); + Assert.AreEqual(606, message.GetUnpackedSint64(0)); + Assert.AreEqual(607u, message.GetUnpackedFixed32(0)); + Assert.AreEqual(608u, message.GetUnpackedFixed64(0)); + Assert.AreEqual(609, message.GetUnpackedSfixed32(0)); + Assert.AreEqual(610, message.GetUnpackedSfixed64(0)); + Assert.AreEqual(611f, message.GetUnpackedFloat(0)); + Assert.AreEqual(612d, message.GetUnpackedDouble(0)); + Assert.AreEqual(true, message.GetUnpackedBool(0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetUnpackedEnum(0)); + Assert.AreEqual(701, message.GetUnpackedInt32(1)); + Assert.AreEqual(702, message.GetUnpackedInt64(1)); + Assert.AreEqual(703u, message.GetUnpackedUint32(1)); + Assert.AreEqual(704u, message.GetUnpackedUint64(1)); + Assert.AreEqual(705, message.GetUnpackedSint32(1)); + Assert.AreEqual(706, message.GetUnpackedSint64(1)); + Assert.AreEqual(707u, message.GetUnpackedFixed32(1)); + Assert.AreEqual(708u, message.GetUnpackedFixed64(1)); + Assert.AreEqual(709, message.GetUnpackedSfixed32(1)); + Assert.AreEqual(710, message.GetUnpackedSfixed64(1)); + Assert.AreEqual(711f, message.GetUnpackedFloat(1)); + Assert.AreEqual(712d, message.GetUnpackedDouble(1)); + Assert.AreEqual(false, message.GetUnpackedBool(1)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetUnpackedEnum(1)); } public static void SetPackedExtensions(TestPackedExtensions.Builder message) @@ -1623,95 +1623,95 @@ namespace Google.ProtocolBuffers public static void AssertPackedExtensionsSet(TestPackedExtensions message) { - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedInt32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedInt64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedUint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedUint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSfixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedSfixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedFloatExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedDoubleExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedBoolExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.PackedEnumExtension)); - Assert.Equal(601, message.GetExtension(Unittest.PackedInt32Extension, 0)); - Assert.Equal(602L, message.GetExtension(Unittest.PackedInt64Extension, 0)); - Assert.Equal(603u, message.GetExtension(Unittest.PackedUint32Extension, 0)); - Assert.Equal(604uL, message.GetExtension(Unittest.PackedUint64Extension, 0)); - Assert.Equal(605, message.GetExtension(Unittest.PackedSint32Extension, 0)); - Assert.Equal(606L, message.GetExtension(Unittest.PackedSint64Extension, 0)); - Assert.Equal(607u, message.GetExtension(Unittest.PackedFixed32Extension, 0)); - Assert.Equal(608uL, message.GetExtension(Unittest.PackedFixed64Extension, 0)); - Assert.Equal(609, message.GetExtension(Unittest.PackedSfixed32Extension, 0)); - Assert.Equal(610L, message.GetExtension(Unittest.PackedSfixed64Extension, 0)); - Assert.Equal(611F, message.GetExtension(Unittest.PackedFloatExtension, 0)); - Assert.Equal(612D, message.GetExtension(Unittest.PackedDoubleExtension, 0)); - Assert.Equal(true, message.GetExtension(Unittest.PackedBoolExtension, 0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedInt32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedInt64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedUint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedUint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSfixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedSfixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedFloatExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedDoubleExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedBoolExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.PackedEnumExtension)); + Assert.AreEqual(601, message.GetExtension(Unittest.PackedInt32Extension, 0)); + Assert.AreEqual(602L, message.GetExtension(Unittest.PackedInt64Extension, 0)); + Assert.AreEqual(603u, message.GetExtension(Unittest.PackedUint32Extension, 0)); + Assert.AreEqual(604uL, message.GetExtension(Unittest.PackedUint64Extension, 0)); + Assert.AreEqual(605, message.GetExtension(Unittest.PackedSint32Extension, 0)); + Assert.AreEqual(606L, message.GetExtension(Unittest.PackedSint64Extension, 0)); + Assert.AreEqual(607u, message.GetExtension(Unittest.PackedFixed32Extension, 0)); + Assert.AreEqual(608uL, message.GetExtension(Unittest.PackedFixed64Extension, 0)); + Assert.AreEqual(609, message.GetExtension(Unittest.PackedSfixed32Extension, 0)); + Assert.AreEqual(610L, message.GetExtension(Unittest.PackedSfixed64Extension, 0)); + Assert.AreEqual(611F, message.GetExtension(Unittest.PackedFloatExtension, 0)); + Assert.AreEqual(612D, message.GetExtension(Unittest.PackedDoubleExtension, 0)); + Assert.AreEqual(true, message.GetExtension(Unittest.PackedBoolExtension, 0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.PackedEnumExtension, 0)); - Assert.Equal(701, message.GetExtension(Unittest.PackedInt32Extension, 1)); - Assert.Equal(702L, message.GetExtension(Unittest.PackedInt64Extension, 1)); - Assert.Equal(703u, message.GetExtension(Unittest.PackedUint32Extension, 1)); - Assert.Equal(704uL, message.GetExtension(Unittest.PackedUint64Extension, 1)); - Assert.Equal(705, message.GetExtension(Unittest.PackedSint32Extension, 1)); - Assert.Equal(706L, message.GetExtension(Unittest.PackedSint64Extension, 1)); - Assert.Equal(707u, message.GetExtension(Unittest.PackedFixed32Extension, 1)); - Assert.Equal(708uL, message.GetExtension(Unittest.PackedFixed64Extension, 1)); - Assert.Equal(709, message.GetExtension(Unittest.PackedSfixed32Extension, 1)); - Assert.Equal(710L, message.GetExtension(Unittest.PackedSfixed64Extension, 1)); - Assert.Equal(711F, message.GetExtension(Unittest.PackedFloatExtension, 1)); - Assert.Equal(712D, message.GetExtension(Unittest.PackedDoubleExtension, 1)); - Assert.Equal(false, message.GetExtension(Unittest.PackedBoolExtension, 1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.PackedEnumExtension, 1)); + Assert.AreEqual(701, message.GetExtension(Unittest.PackedInt32Extension, 1)); + Assert.AreEqual(702L, message.GetExtension(Unittest.PackedInt64Extension, 1)); + Assert.AreEqual(703u, message.GetExtension(Unittest.PackedUint32Extension, 1)); + Assert.AreEqual(704uL, message.GetExtension(Unittest.PackedUint64Extension, 1)); + Assert.AreEqual(705, message.GetExtension(Unittest.PackedSint32Extension, 1)); + Assert.AreEqual(706L, message.GetExtension(Unittest.PackedSint64Extension, 1)); + Assert.AreEqual(707u, message.GetExtension(Unittest.PackedFixed32Extension, 1)); + Assert.AreEqual(708uL, message.GetExtension(Unittest.PackedFixed64Extension, 1)); + Assert.AreEqual(709, message.GetExtension(Unittest.PackedSfixed32Extension, 1)); + Assert.AreEqual(710L, message.GetExtension(Unittest.PackedSfixed64Extension, 1)); + Assert.AreEqual(711F, message.GetExtension(Unittest.PackedFloatExtension, 1)); + Assert.AreEqual(712D, message.GetExtension(Unittest.PackedDoubleExtension, 1)); + Assert.AreEqual(false, message.GetExtension(Unittest.PackedBoolExtension, 1)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.PackedEnumExtension, 1)); } public static void AssertUnpackedExtensionsSet(TestUnpackedExtensions message) { - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedInt32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedInt64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedUint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedUint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSint32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSint64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSfixed32Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedSfixed64Extension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedFloatExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedDoubleExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedBoolExtension)); - Assert.Equal(2, message.GetExtensionCount(Unittest.UnpackedEnumExtension)); - Assert.Equal(601, message.GetExtension(Unittest.UnpackedInt32Extension, 0)); - Assert.Equal(602L, message.GetExtension(Unittest.UnpackedInt64Extension, 0)); - Assert.Equal(603u, message.GetExtension(Unittest.UnpackedUint32Extension, 0)); - Assert.Equal(604uL, message.GetExtension(Unittest.UnpackedUint64Extension, 0)); - Assert.Equal(605, message.GetExtension(Unittest.UnpackedSint32Extension, 0)); - Assert.Equal(606L, message.GetExtension(Unittest.UnpackedSint64Extension, 0)); - Assert.Equal(607u, message.GetExtension(Unittest.UnpackedFixed32Extension, 0)); - Assert.Equal(608uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 0)); - Assert.Equal(609, message.GetExtension(Unittest.UnpackedSfixed32Extension, 0)); - Assert.Equal(610L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 0)); - Assert.Equal(611F, message.GetExtension(Unittest.UnpackedFloatExtension, 0)); - Assert.Equal(612D, message.GetExtension(Unittest.UnpackedDoubleExtension, 0)); - Assert.Equal(true, message.GetExtension(Unittest.UnpackedBoolExtension, 0)); - Assert.Equal(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.UnpackedEnumExtension, 0)); - Assert.Equal(701, message.GetExtension(Unittest.UnpackedInt32Extension, 1)); - Assert.Equal(702L, message.GetExtension(Unittest.UnpackedInt64Extension, 1)); - Assert.Equal(703u, message.GetExtension(Unittest.UnpackedUint32Extension, 1)); - Assert.Equal(704uL, message.GetExtension(Unittest.UnpackedUint64Extension, 1)); - Assert.Equal(705, message.GetExtension(Unittest.UnpackedSint32Extension, 1)); - Assert.Equal(706L, message.GetExtension(Unittest.UnpackedSint64Extension, 1)); - Assert.Equal(707u, message.GetExtension(Unittest.UnpackedFixed32Extension, 1)); - Assert.Equal(708uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 1)); - Assert.Equal(709, message.GetExtension(Unittest.UnpackedSfixed32Extension, 1)); - Assert.Equal(710L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 1)); - Assert.Equal(711F, message.GetExtension(Unittest.UnpackedFloatExtension, 1)); - Assert.Equal(712D, message.GetExtension(Unittest.UnpackedDoubleExtension, 1)); - Assert.Equal(false, message.GetExtension(Unittest.UnpackedBoolExtension, 1)); - Assert.Equal(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.UnpackedEnumExtension, 1)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedInt32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedInt64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedUint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedUint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSint32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSint64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSfixed32Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedSfixed64Extension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedFloatExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedDoubleExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedBoolExtension)); + Assert.AreEqual(2, message.GetExtensionCount(Unittest.UnpackedEnumExtension)); + Assert.AreEqual(601, message.GetExtension(Unittest.UnpackedInt32Extension, 0)); + Assert.AreEqual(602L, message.GetExtension(Unittest.UnpackedInt64Extension, 0)); + Assert.AreEqual(603u, message.GetExtension(Unittest.UnpackedUint32Extension, 0)); + Assert.AreEqual(604uL, message.GetExtension(Unittest.UnpackedUint64Extension, 0)); + Assert.AreEqual(605, message.GetExtension(Unittest.UnpackedSint32Extension, 0)); + Assert.AreEqual(606L, message.GetExtension(Unittest.UnpackedSint64Extension, 0)); + Assert.AreEqual(607u, message.GetExtension(Unittest.UnpackedFixed32Extension, 0)); + Assert.AreEqual(608uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 0)); + Assert.AreEqual(609, message.GetExtension(Unittest.UnpackedSfixed32Extension, 0)); + Assert.AreEqual(610L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 0)); + Assert.AreEqual(611F, message.GetExtension(Unittest.UnpackedFloatExtension, 0)); + Assert.AreEqual(612D, message.GetExtension(Unittest.UnpackedDoubleExtension, 0)); + Assert.AreEqual(true, message.GetExtension(Unittest.UnpackedBoolExtension, 0)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAR, message.GetExtension(Unittest.UnpackedEnumExtension, 0)); + Assert.AreEqual(701, message.GetExtension(Unittest.UnpackedInt32Extension, 1)); + Assert.AreEqual(702L, message.GetExtension(Unittest.UnpackedInt64Extension, 1)); + Assert.AreEqual(703u, message.GetExtension(Unittest.UnpackedUint32Extension, 1)); + Assert.AreEqual(704uL, message.GetExtension(Unittest.UnpackedUint64Extension, 1)); + Assert.AreEqual(705, message.GetExtension(Unittest.UnpackedSint32Extension, 1)); + Assert.AreEqual(706L, message.GetExtension(Unittest.UnpackedSint64Extension, 1)); + Assert.AreEqual(707u, message.GetExtension(Unittest.UnpackedFixed32Extension, 1)); + Assert.AreEqual(708uL, message.GetExtension(Unittest.UnpackedFixed64Extension, 1)); + Assert.AreEqual(709, message.GetExtension(Unittest.UnpackedSfixed32Extension, 1)); + Assert.AreEqual(710L, message.GetExtension(Unittest.UnpackedSfixed64Extension, 1)); + Assert.AreEqual(711F, message.GetExtension(Unittest.UnpackedFloatExtension, 1)); + Assert.AreEqual(712D, message.GetExtension(Unittest.UnpackedDoubleExtension, 1)); + Assert.AreEqual(false, message.GetExtension(Unittest.UnpackedBoolExtension, 1)); + Assert.AreEqual(ForeignEnum.FOREIGN_BAZ, message.GetExtension(Unittest.UnpackedEnumExtension, 1)); } private static readonly string[] TestCultures = {"en-US", "en-GB", "fr-FR", "de-DE"}; diff --git a/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs b/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs index ad5c052e..c218deed 100644 --- a/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs +++ b/csharp/src/ProtocolBuffers.Test/TestWriterFormatJson.cs @@ -6,13 +6,13 @@ using EnumOptions = Google.ProtocolBuffers.TestProtos.EnumOptions; using Google.ProtocolBuffers.DescriptorProtos; using Google.ProtocolBuffers.Serialization; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class TestWriterFormatJson { - [Fact] + [Test] public void Example_FromJson() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -21,10 +21,10 @@ namespace Google.ProtocolBuffers Extensions.MergeFromJson(builder, @"{""valid"":true}"); TestXmlMessage message = builder.Build(); - Assert.Equal(true, message.Valid); + Assert.AreEqual(true, message.Valid); } - [Fact] + [Test] public void Example_ToJson() { TestXmlMessage message = @@ -35,10 +35,10 @@ namespace Google.ProtocolBuffers //3.5: string json = message.ToJson(); string json = Extensions.ToJson(message); - Assert.Equal(@"{""valid"":true}", json); + Assert.AreEqual(@"{""valid"":true}", json); } - [Fact] + [Test] public void Example_WriteJsonUsingICodedOutputStream() { TestXmlMessage message = @@ -52,20 +52,20 @@ namespace Google.ProtocolBuffers writer.WriteMessageStart(); //manually begin the message, output is '{' writer.Flush(); - Assert.Equal("{", output.ToString()); + Assert.AreEqual("{", output.ToString()); ICodedOutputStream stream = writer; message.WriteTo(stream); //write the message normally writer.Flush(); - Assert.Equal(@"{""valid"":true", output.ToString()); + Assert.AreEqual(@"{""valid"":true", output.ToString()); writer.WriteMessageEnd(); //manually write the end message '}' - Assert.Equal(@"{""valid"":true}", output.ToString()); + Assert.AreEqual(@"{""valid"":true}", output.ToString()); } } - [Fact] + [Test] public void Example_ReadJsonUsingICodedInputStream() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -94,37 +94,37 @@ namespace Google.ProtocolBuffers JsonFormatReader.CreateInstance(Content) .Merge(message.WeakCreateBuilderForType(), registry).WeakBuild(); - Assert.Equal(typeof(TMessage), copy.GetType()); - Assert.Equal(message, copy); + Assert.AreEqual(typeof(TMessage), copy.GetType()); + Assert.AreEqual(message, copy); foreach (string expect in expecting) { - Assert.True(Content.IndexOf(expect) >= 0); + Assert.IsTrue(Content.IndexOf(expect) >= 0); } } - [Fact] + [Test] public void TestToJsonParseFromJson() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string json = Extensions.ToJson(msg); - Assert.Equal("{\"default_bool\":true}", json); + Assert.AreEqual("{\"default_bool\":true}", json); TestAllTypes copy = Extensions.MergeFromJson(new TestAllTypes.Builder(), json).Build(); - Assert.True(copy.HasDefaultBool && copy.DefaultBool); - Assert.Equal(msg, copy); + Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); + Assert.AreEqual(msg, copy); } - [Fact] + [Test] public void TestToJsonParseFromJsonReader() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string json = Extensions.ToJson(msg); - Assert.Equal("{\"default_bool\":true}", json); + Assert.AreEqual("{\"default_bool\":true}", json); TestAllTypes copy = Extensions.MergeFromJson(new TestAllTypes.Builder(), new StringReader(json)).Build(); - Assert.True(copy.HasDefaultBool && copy.DefaultBool); - Assert.Equal(msg, copy); + Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); + Assert.AreEqual(msg, copy); } - [Fact] + [Test] public void TestJsonFormatted() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -144,10 +144,10 @@ namespace Google.ProtocolBuffers TestXmlMessage copy = JsonFormatReader.CreateInstance(json) .Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestEmptyMessage() { FormatterAssert( @@ -157,7 +157,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestRepeatedField() { FormatterAssert( @@ -169,7 +169,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestNestedEmptyMessage() { FormatterAssert( @@ -180,7 +180,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestNestedMessage() { FormatterAssert( @@ -191,7 +191,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestBooleanTypes() { FormatterAssert( @@ -202,7 +202,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestFullMessage() { FormatterAssert( @@ -232,7 +232,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestMessageWithXmlText() { FormatterAssert( @@ -243,7 +243,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestWithEscapeChars() { FormatterAssert( @@ -254,7 +254,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestWithExtensionText() { FormatterAssert( @@ -266,7 +266,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestWithExtensionNumber() { FormatterAssert( @@ -278,7 +278,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestWithExtensionArray() { FormatterAssert( @@ -291,7 +291,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestWithExtensionEnum() { FormatterAssert( @@ -302,7 +302,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestMessageWithExtensions() { FormatterAssert( @@ -325,7 +325,7 @@ namespace Google.ProtocolBuffers ); } - [Fact] + [Test] public void TestMessageMissingExtensions() { TestXmlMessage original = TestXmlMessage.CreateBuilder() @@ -353,23 +353,23 @@ namespace Google.ProtocolBuffers IMessageLite copy = JsonFormatReader.CreateInstance(Content) .Merge(message.CreateBuilderForType()).Build(); - Assert.NotEqual(original, message); - Assert.NotEqual(original, copy); - Assert.Equal(message, copy); + Assert.AreNotEqual(original, message); + Assert.AreNotEqual(original, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestMergeFields() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); builder.MergeFrom(JsonFormatReader.CreateInstance("\"valid\": true")); builder.MergeFrom(JsonFormatReader.CreateInstance("\"text\": \"text\", \"number\": \"411\"")); - Assert.Equal(true, builder.Valid); - Assert.Equal("text", builder.Text); - Assert.Equal(411, builder.Number); + Assert.AreEqual(true, builder.Valid); + Assert.AreEqual("text", builder.Text); + Assert.AreEqual(411, builder.Number); } - [Fact] + [Test] public void TestMessageArray() { JsonFormatWriter writer = JsonFormatWriter.CreateInstance().Formatted(); @@ -388,13 +388,13 @@ namespace Google.ProtocolBuffers foreach (JsonFormatReader r in reader.EnumerateArray()) { r.Merge(builder); - Assert.Equal(++ordinal, builder.Number); + Assert.AreEqual(++ordinal, builder.Number); } - Assert.Equal(3, ordinal); - Assert.Equal(3, builder.TextlinesCount); + Assert.AreEqual(3, ordinal); + Assert.AreEqual(3, builder.TextlinesCount); } - [Fact] + [Test] public void TestNestedMessageArray() { JsonFormatWriter writer = JsonFormatWriter.CreateInstance(); @@ -418,13 +418,13 @@ namespace Google.ProtocolBuffers foreach (JsonFormatReader r2 in r.EnumerateArray()) { r2.Merge(builder); - Assert.Equal(++ordinal, builder.Number); + Assert.AreEqual(++ordinal, builder.Number); } - Assert.Equal(3, ordinal); - Assert.Equal(3, builder.TextlinesCount); + Assert.AreEqual(3, ordinal); + Assert.AreEqual(3, builder.TextlinesCount); } - [Fact] + [Test] public void TestReadWriteJsonWithoutRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -439,15 +439,15 @@ namespace Google.ProtocolBuffers output.Flush(); Json = sw.ToString(); } - Assert.Equal(@"""text"":""abc"",""number"":123", Json); + Assert.AreEqual(@"""text"":""abc"",""number"":123", Json); ICodedInputStream input = JsonFormatReader.CreateInstance(Json); TestXmlMessage copy = TestXmlMessage.CreateBuilder().MergeFrom(input).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestRecursiveLimit() { StringBuilder sb = new StringBuilder(8192); @@ -458,32 +458,32 @@ namespace Google.ProtocolBuffers Assert.Throws(() => Extensions.MergeFromJson(new TestXmlRescursive.Builder(), sb.ToString()).Build()); } - [Fact] + [Test] public void FailWithEmptyText() { Assert.Throws(() => JsonFormatReader.CreateInstance("").Merge(TestXmlMessage.CreateBuilder())); } - [Fact] + [Test] public void FailWithUnexpectedValue() { Assert.Throws(() => JsonFormatReader.CreateInstance("{{}}").Merge(TestXmlMessage.CreateBuilder())); } - [Fact] + [Test] public void FailWithUnQuotedName() { Assert.Throws(() => JsonFormatReader.CreateInstance("{name:{}}").Merge(TestXmlMessage.CreateBuilder())); } - [Fact] + [Test] public void FailWithUnexpectedType() { Assert.Throws(() => JsonFormatReader.CreateInstance("{\"valid\":{}}").Merge(TestXmlMessage.CreateBuilder())); } // See issue 64 for background. - [Fact] + [Test] public void ToJsonRequiringBufferExpansion() { string s = new string('.', 4086); diff --git a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs index 78e6bb27..38d7ad18 100644 --- a/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs +++ b/csharp/src/ProtocolBuffers.Test/TestWriterFormatXml.cs @@ -4,13 +4,13 @@ using System.Text; using System.Xml; using Google.ProtocolBuffers.Serialization; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class TestWriterFormatXml { - [Fact] + [Test] public void Example_FromXml() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -20,10 +20,10 @@ namespace Google.ProtocolBuffers Extensions.MergeFromXml(builder, rdr); TestXmlMessage message = builder.Build(); - Assert.Equal(true, message.Valid); + Assert.AreEqual(true, message.Valid); } - [Fact] + [Test] public void Example_ToXml() { TestXmlMessage message = @@ -34,10 +34,10 @@ namespace Google.ProtocolBuffers //3.5: string Xml = message.ToXml(); string Xml = Extensions.ToXml(message); - Assert.Equal(@"true", Xml); + Assert.AreEqual(@"true", Xml); } - [Fact] + [Test] public void Example_WriteXmlUsingICodedOutputStream() { TestXmlMessage message = @@ -54,11 +54,11 @@ namespace Google.ProtocolBuffers message.WriteTo(stream); //write the message normally writer.WriteMessageEnd(); //manually write the end message '}' - Assert.Equal(@"true", output.ToString()); + Assert.AreEqual(@"true", output.ToString()); } } - [Fact] + [Test] public void Example_ReadXmlUsingICodedInputStream() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -71,29 +71,29 @@ namespace Google.ProtocolBuffers reader.ReadMessageEnd(); //manually read the end message '}' } - [Fact] + [Test] public void TestToXmlParseFromXml() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string xml = Extensions.ToXml(msg); - Assert.Equal("true", xml); + Assert.AreEqual("true", xml); TestAllTypes copy = Extensions.MergeFromXml(new TestAllTypes.Builder(), XmlReader.Create(new StringReader(xml))).Build(); - Assert.True(copy.HasDefaultBool && copy.DefaultBool); - Assert.Equal(msg, copy); + Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); + Assert.AreEqual(msg, copy); } - [Fact] + [Test] public void TestToXmlParseFromXmlWithRootName() { TestAllTypes msg = new TestAllTypes.Builder().SetDefaultBool(true).Build(); string xml = Extensions.ToXml(msg, "message"); - Assert.Equal("true", xml); + Assert.AreEqual("true", xml); TestAllTypes copy = Extensions.MergeFromXml(new TestAllTypes.Builder(), "message", XmlReader.Create(new StringReader(xml))).Build(); - Assert.True(copy.HasDefaultBool && copy.DefaultBool); - Assert.Equal(msg, copy); + Assert.IsTrue(copy.HasDefaultBool && copy.DefaultBool); + Assert.AreEqual(msg, copy); } - [Fact] + [Test] public void TestEmptyMessage() { TestXmlChild message = TestXmlChild.CreateBuilder() @@ -111,9 +111,9 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlChild copy = rdr.Merge(TestXmlChild.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestRepeatedField() { TestXmlChild message = TestXmlChild.CreateBuilder() @@ -128,10 +128,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlChild copy = rdr.Merge(TestXmlChild.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestNestedEmptyMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -144,10 +144,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestNestedMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -160,10 +160,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestBooleanTypes() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -176,10 +176,10 @@ namespace Google.ProtocolBuffers string xml = sw.ToString(); XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestFullMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -206,10 +206,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestFullMessageWithRichTypes() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -239,10 +239,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); rdr.Options = XmlReaderOptions.ReadNestedArrays; TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestFullMessageWithUnknownFields() { TestXmlMessage origial = TestXmlMessage.CreateBuilder() @@ -261,7 +261,7 @@ namespace Google.ProtocolBuffers .Build(); TestXmlNoFields message = TestXmlNoFields.CreateBuilder().MergeFrom(origial.ToByteArray()).Build(); - Assert.Equal(0, message.AllFields.Count); + Assert.AreEqual(0, message.AllFields.Count); StringWriter sw = new StringWriter(); XmlFormatWriter.CreateInstance(sw) @@ -273,9 +273,9 @@ namespace Google.ProtocolBuffers using (XmlReader x = XmlReader.Create(new StringReader(xml))) { x.MoveToContent(); - Assert.Equal(XmlNodeType.Element, x.NodeType); + Assert.AreEqual(XmlNodeType.Element, x.NodeType); //should always be empty - Assert.True(x.IsEmptyElement || + Assert.IsTrue(x.IsEmptyElement || (x.Read() && x.NodeType == XmlNodeType.EndElement) ); } @@ -283,10 +283,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); rdr.Options = XmlReaderOptions.ReadNestedArrays; TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(TestXmlMessage.DefaultInstance, copy); + Assert.AreEqual(TestXmlMessage.DefaultInstance, copy); } - [Fact] + [Test] public void TestMessageWithXmlText() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -299,10 +299,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlWithWhitespace() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -315,10 +315,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder()).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlWithExtensionText() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -335,10 +335,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlWithExtensionMessage() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -355,10 +355,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlWithExtensionArray() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -377,10 +377,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlWithExtensionEnum() { TestXmlMessage message = TestXmlMessage.CreateBuilder() @@ -397,10 +397,10 @@ namespace Google.ProtocolBuffers XmlFormatReader rdr = XmlFormatReader.CreateInstance(xml); TestXmlMessage copy = rdr.Merge(TestXmlMessage.CreateBuilder(), registry).Build(); - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestXmlReadEmptyRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -413,7 +413,7 @@ namespace Google.ProtocolBuffers reader.ReadMessageEnd(); //manually read the end message '}' } - [Fact] + [Test] public void TestXmlReadEmptyChild() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -422,11 +422,11 @@ namespace Google.ProtocolBuffers reader.ReadMessageStart(); //manually read the begin the message '{' builder.MergeFrom(reader); //write the message normally - Assert.True(builder.HasText); - Assert.Equal(String.Empty, builder.Text); + Assert.IsTrue(builder.HasText); + Assert.AreEqual(String.Empty, builder.Text); } - [Fact] + [Test] public void TestXmlReadWriteWithoutRoot() { TestXmlMessage.Builder builder = TestXmlMessage.CreateBuilder(); @@ -442,7 +442,7 @@ namespace Google.ProtocolBuffers output.Flush(); xml = sw.ToString(); } - Assert.Equal("abc123", xml); + Assert.AreEqual("abc123", xml); TestXmlMessage copy; using (XmlReader xr = XmlReader.Create(new StringReader(xml), new XmlReaderSettings() { ConformanceLevel = ConformanceLevel.Fragment })) @@ -451,10 +451,10 @@ namespace Google.ProtocolBuffers copy = TestXmlMessage.CreateBuilder().MergeFrom(input).Build(); } - Assert.Equal(message, copy); + Assert.AreEqual(message, copy); } - [Fact] + [Test] public void TestRecursiveLimit() { StringBuilder sb = new StringBuilder(8192); diff --git a/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs b/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs index 1e083c6b..5af71787 100644 --- a/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs +++ b/csharp/src/ProtocolBuffers.Test/TextFormatTest.cs @@ -37,7 +37,7 @@ using System; using System.IO; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -84,13 +84,13 @@ namespace Google.ProtocolBuffers /// /// Print TestAllTypes and compare with golden file. /// - [Fact] + [Test] public void PrintMessage() { TestUtil.TestInMultipleCultures(() => { string text = TextFormat.PrintToString(TestUtil.GetAllSet()); - Assert.Equal(AllFieldsSetText.Replace("\r\n", "\n").Trim(), + Assert.AreEqual(AllFieldsSetText.Replace("\r\n", "\n").Trim(), text.Replace("\r\n", "\n").Trim()); }); } @@ -98,32 +98,32 @@ namespace Google.ProtocolBuffers /// /// Tests that a builder prints the same way as a message. /// - [Fact] + [Test] public void PrintBuilder() { TestUtil.TestInMultipleCultures(() => { string messageText = TextFormat.PrintToString(TestUtil.GetAllSet()); string builderText = TextFormat.PrintToString(TestUtil.GetAllSet().ToBuilder()); - Assert.Equal(messageText, builderText); + Assert.AreEqual(messageText, builderText); }); } /// /// Print TestAllExtensions and compare with golden file. /// - [Fact] + [Test] public void PrintExtensions() { string text = TextFormat.PrintToString(TestUtil.GetAllExtensionsSet()); - Assert.Equal(AllExtensionsSetText.Replace("\r\n", "\n").Trim(), text.Replace("\r\n", "\n").Trim()); + Assert.AreEqual(AllExtensionsSetText.Replace("\r\n", "\n").Trim(), text.Replace("\r\n", "\n").Trim()); } /// /// Test printing of unknown fields in a message. /// - [Fact] + [Test] public void PrintUnknownFields() { TestEmptyMessage message = @@ -159,7 +159,7 @@ namespace Google.ProtocolBuffers .Build()) .Build(); - Assert.Equal( + Assert.AreEqual( "5: 1\n" + "5: 0x00000002\n" + "5: 0x0000000000000003\n" + @@ -189,7 +189,7 @@ namespace Google.ProtocolBuffers return ByteString.CopyFrom(bytes); } - [Fact] + [Test] public void PrintExotic() { IMessage message = TestAllTypes.CreateBuilder() @@ -220,10 +220,10 @@ namespace Google.ProtocolBuffers .AddRepeatedBytes(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\"\u00fe")) .Build(); - Assert.Equal(ExoticText, message.ToString()); + Assert.AreEqual(ExoticText, message.ToString()); } - [Fact] + [Test] public void PrintMessageSet() { TestMessageSet messageSet = @@ -236,12 +236,12 @@ namespace Google.ProtocolBuffers TestMessageSetExtension2.CreateBuilder().SetStr("foo").Build()) .Build(); - Assert.Equal(MessageSetText, messageSet.ToString()); + Assert.AreEqual(MessageSetText, messageSet.ToString()); } // ================================================================= - [Fact] + [Test] public void Parse() { TestUtil.TestInMultipleCultures(() => @@ -252,7 +252,7 @@ namespace Google.ProtocolBuffers }); } - [Fact] + [Test] public void ParseReader() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -260,7 +260,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllFieldsSet(builder.Build()); } - [Fact] + [Test] public void ParseExtensions() { TestAllExtensions.Builder builder = TestAllExtensions.CreateBuilder(); @@ -270,7 +270,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(builder.Build()); } - [Fact] + [Test] public void ParseCompatibility() { string original = "repeated_float: inf\n" + @@ -299,10 +299,10 @@ namespace Google.ProtocolBuffers "repeated_double: NaN\n"; TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge(original, builder); - Assert.Equal(canonical, builder.Build().ToString()); + Assert.AreEqual(canonical, builder.Build().ToString()); } - [Fact] + [Test] public void ParseExotic() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -310,10 +310,10 @@ namespace Google.ProtocolBuffers // Too lazy to check things individually. Don't try to debug this // if testPrintExotic() is Assert.Failing. - Assert.Equal(ExoticText, builder.Build().ToString()); + Assert.AreEqual(ExoticText, builder.Build().ToString()); } - [Fact] + [Test] public void ParseMessageSet() { ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance(); @@ -324,30 +324,30 @@ namespace Google.ProtocolBuffers TextFormat.Merge(MessageSetText, extensionRegistry, builder); TestMessageSet messageSet = builder.Build(); - Assert.True(messageSet.HasExtension(TestMessageSetExtension1.MessageSetExtension)); - Assert.Equal(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); - Assert.True(messageSet.HasExtension(TestMessageSetExtension2.MessageSetExtension)); - Assert.Equal("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); + Assert.IsTrue(messageSet.HasExtension(TestMessageSetExtension1.MessageSetExtension)); + Assert.AreEqual(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); + Assert.IsTrue(messageSet.HasExtension(TestMessageSetExtension2.MessageSetExtension)); + Assert.AreEqual("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); } - [Fact] + [Test] public void ParseNumericEnum() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("optional_nested_enum: 2", builder); - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, builder.OptionalNestedEnum); + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, builder.OptionalNestedEnum); } - [Fact] + [Test] public void ParseAngleBrackets() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("OptionalGroup: < a: 1 >", builder); - Assert.True(builder.HasOptionalGroup); - Assert.Equal(1, builder.OptionalGroup.A); + Assert.IsTrue(builder.HasOptionalGroup); + Assert.AreEqual(1, builder.OptionalGroup.A); } - [Fact] + [Test] public void ParseComment() { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); @@ -356,8 +356,8 @@ namespace Google.ProtocolBuffers "optional_int32: 1 # another comment\n" + "optional_int64: 2\n" + "# EOF comment", builder); - Assert.Equal(1, builder.OptionalInt32); - Assert.Equal(2, builder.OptionalInt64); + Assert.AreEqual(1, builder.OptionalInt32); + Assert.AreEqual(2, builder.OptionalInt64); } @@ -365,10 +365,10 @@ namespace Google.ProtocolBuffers { TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); Exception exception = Assert.Throws(() => TextFormat.Merge(text, TestUtil.CreateExtensionRegistry(), builder)); - Assert.Equal(error, exception.Message); + Assert.AreEqual(error, exception.Message); } - [Fact] + [Test] public void ParseErrors() { AssertParseError( @@ -443,26 +443,26 @@ namespace Google.ProtocolBuffers return ByteString.CopyFrom(bytes); } - [Fact] + [Test] public void Escape() { // Escape sequences. - Assert.Equal("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", + Assert.AreEqual("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", TextFormat.EscapeBytes(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""))); - Assert.Equal("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", + Assert.AreEqual("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"", TextFormat.EscapeText("\0\u0001\u0007\b\f\n\r\t\v\\\'\"")); - Assert.Equal(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""), + Assert.AreEqual(Bytes("\0\u0001\u0007\b\f\n\r\t\v\\\'\""), TextFormat.UnescapeBytes("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); - Assert.Equal("\0\u0001\u0007\b\f\n\r\t\v\\\'\"", + Assert.AreEqual("\0\u0001\u0007\b\f\n\r\t\v\\\'\"", TextFormat.UnescapeText("\\000\\001\\a\\b\\f\\n\\r\\t\\v\\\\\\'\\\"")); // Unicode handling. - Assert.Equal("\\341\\210\\264", TextFormat.EscapeText("\u1234")); - Assert.Equal("\\341\\210\\264", TextFormat.EscapeBytes(Bytes(0xe1, 0x88, 0xb4))); - Assert.Equal("\u1234", TextFormat.UnescapeText("\\341\\210\\264")); - Assert.Equal(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\341\\210\\264")); - Assert.Equal("\u1234", TextFormat.UnescapeText("\\xe1\\x88\\xb4")); - Assert.Equal(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\xe1\\x88\\xb4")); + Assert.AreEqual("\\341\\210\\264", TextFormat.EscapeText("\u1234")); + Assert.AreEqual("\\341\\210\\264", TextFormat.EscapeBytes(Bytes(0xe1, 0x88, 0xb4))); + Assert.AreEqual("\u1234", TextFormat.UnescapeText("\\341\\210\\264")); + Assert.AreEqual(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\341\\210\\264")); + Assert.AreEqual("\u1234", TextFormat.UnescapeText("\\xe1\\x88\\xb4")); + Assert.AreEqual(Bytes(0xe1, 0x88, 0xb4), TextFormat.UnescapeBytes("\\xe1\\x88\\xb4")); // Errors. Assert.Throws(() => TextFormat.UnescapeText("\\x")); @@ -470,55 +470,55 @@ namespace Google.ProtocolBuffers Assert.Throws(() => TextFormat.UnescapeText("\\")); } - [Fact] + [Test] public void ParseInteger() { - Assert.Equal(0, TextFormat.ParseInt32("0")); - Assert.Equal(1, TextFormat.ParseInt32("1")); - Assert.Equal(-1, TextFormat.ParseInt32("-1")); - Assert.Equal(12345, TextFormat.ParseInt32("12345")); - Assert.Equal(-12345, TextFormat.ParseInt32("-12345")); - Assert.Equal(2147483647, TextFormat.ParseInt32("2147483647")); - Assert.Equal(-2147483648, TextFormat.ParseInt32("-2147483648")); - - Assert.Equal(0u, TextFormat.ParseUInt32("0")); - Assert.Equal(1u, TextFormat.ParseUInt32("1")); - Assert.Equal(12345u, TextFormat.ParseUInt32("12345")); - Assert.Equal(2147483647u, TextFormat.ParseUInt32("2147483647")); - Assert.Equal(2147483648U, TextFormat.ParseUInt32("2147483648")); - Assert.Equal(4294967295U, TextFormat.ParseUInt32("4294967295")); - - Assert.Equal(0L, TextFormat.ParseInt64("0")); - Assert.Equal(1L, TextFormat.ParseInt64("1")); - Assert.Equal(-1L, TextFormat.ParseInt64("-1")); - Assert.Equal(12345L, TextFormat.ParseInt64("12345")); - Assert.Equal(-12345L, TextFormat.ParseInt64("-12345")); - Assert.Equal(2147483647L, TextFormat.ParseInt64("2147483647")); - Assert.Equal(-2147483648L, TextFormat.ParseInt64("-2147483648")); - Assert.Equal(4294967295L, TextFormat.ParseInt64("4294967295")); - Assert.Equal(4294967296L, TextFormat.ParseInt64("4294967296")); - Assert.Equal(9223372036854775807L, TextFormat.ParseInt64("9223372036854775807")); - Assert.Equal(-9223372036854775808L, TextFormat.ParseInt64("-9223372036854775808")); - - Assert.Equal(0uL, TextFormat.ParseUInt64("0")); - Assert.Equal(1uL, TextFormat.ParseUInt64("1")); - Assert.Equal(12345uL, TextFormat.ParseUInt64("12345")); - Assert.Equal(2147483647uL, TextFormat.ParseUInt64("2147483647")); - Assert.Equal(4294967295uL, TextFormat.ParseUInt64("4294967295")); - Assert.Equal(4294967296uL, TextFormat.ParseUInt64("4294967296")); - Assert.Equal(9223372036854775807UL, TextFormat.ParseUInt64("9223372036854775807")); - Assert.Equal(9223372036854775808UL, TextFormat.ParseUInt64("9223372036854775808")); - Assert.Equal(18446744073709551615UL, TextFormat.ParseUInt64("18446744073709551615")); + Assert.AreEqual(0, TextFormat.ParseInt32("0")); + Assert.AreEqual(1, TextFormat.ParseInt32("1")); + Assert.AreEqual(-1, TextFormat.ParseInt32("-1")); + Assert.AreEqual(12345, TextFormat.ParseInt32("12345")); + Assert.AreEqual(-12345, TextFormat.ParseInt32("-12345")); + Assert.AreEqual(2147483647, TextFormat.ParseInt32("2147483647")); + Assert.AreEqual(-2147483648, TextFormat.ParseInt32("-2147483648")); + + Assert.AreEqual(0u, TextFormat.ParseUInt32("0")); + Assert.AreEqual(1u, TextFormat.ParseUInt32("1")); + Assert.AreEqual(12345u, TextFormat.ParseUInt32("12345")); + Assert.AreEqual(2147483647u, TextFormat.ParseUInt32("2147483647")); + Assert.AreEqual(2147483648U, TextFormat.ParseUInt32("2147483648")); + Assert.AreEqual(4294967295U, TextFormat.ParseUInt32("4294967295")); + + Assert.AreEqual(0L, TextFormat.ParseInt64("0")); + Assert.AreEqual(1L, TextFormat.ParseInt64("1")); + Assert.AreEqual(-1L, TextFormat.ParseInt64("-1")); + Assert.AreEqual(12345L, TextFormat.ParseInt64("12345")); + Assert.AreEqual(-12345L, TextFormat.ParseInt64("-12345")); + Assert.AreEqual(2147483647L, TextFormat.ParseInt64("2147483647")); + Assert.AreEqual(-2147483648L, TextFormat.ParseInt64("-2147483648")); + Assert.AreEqual(4294967295L, TextFormat.ParseInt64("4294967295")); + Assert.AreEqual(4294967296L, TextFormat.ParseInt64("4294967296")); + Assert.AreEqual(9223372036854775807L, TextFormat.ParseInt64("9223372036854775807")); + Assert.AreEqual(-9223372036854775808L, TextFormat.ParseInt64("-9223372036854775808")); + + Assert.AreEqual(0uL, TextFormat.ParseUInt64("0")); + Assert.AreEqual(1uL, TextFormat.ParseUInt64("1")); + Assert.AreEqual(12345uL, TextFormat.ParseUInt64("12345")); + Assert.AreEqual(2147483647uL, TextFormat.ParseUInt64("2147483647")); + Assert.AreEqual(4294967295uL, TextFormat.ParseUInt64("4294967295")); + Assert.AreEqual(4294967296uL, TextFormat.ParseUInt64("4294967296")); + Assert.AreEqual(9223372036854775807UL, TextFormat.ParseUInt64("9223372036854775807")); + Assert.AreEqual(9223372036854775808UL, TextFormat.ParseUInt64("9223372036854775808")); + Assert.AreEqual(18446744073709551615UL, TextFormat.ParseUInt64("18446744073709551615")); // Hex - Assert.Equal(0x1234abcd, TextFormat.ParseInt32("0x1234abcd")); - Assert.Equal(-0x1234abcd, TextFormat.ParseInt32("-0x1234abcd")); - Assert.Equal(0xffffffffffffffffUL, TextFormat.ParseUInt64("0xffffffffffffffff")); - Assert.Equal(0x7fffffffffffffffL, + Assert.AreEqual(0x1234abcd, TextFormat.ParseInt32("0x1234abcd")); + Assert.AreEqual(-0x1234abcd, TextFormat.ParseInt32("-0x1234abcd")); + Assert.AreEqual(0xffffffffffffffffUL, TextFormat.ParseUInt64("0xffffffffffffffff")); + Assert.AreEqual(0x7fffffffffffffffL, TextFormat.ParseInt64("0x7fffffffffffffff")); // Octal - Assert.Equal(342391, TextFormat.ParseInt32("01234567")); + Assert.AreEqual(342391, TextFormat.ParseInt32("01234567")); // Out-of-range Assert.Throws(() => TextFormat.ParseInt32("2147483648")); @@ -532,7 +532,7 @@ namespace Google.ProtocolBuffers Assert.Throws(() => TextFormat.ParseInt32("abcd")); } - [Fact] + [Test] public void ParseLongString() { string longText = @@ -554,7 +554,7 @@ namespace Google.ProtocolBuffers "123456789012345678901234567890123456789012345678901234567890"; TestAllTypes.Builder builder = TestAllTypes.CreateBuilder(); TextFormat.Merge("optional_string: \"" + longText + "\"", builder); - Assert.Equal(longText, builder.OptionalString); + Assert.AreEqual(longText, builder.OptionalString); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs b/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs index f20ba7cb..97f48ead 100644 --- a/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs +++ b/csharp/src/ProtocolBuffers.Test/UnknownFieldSetTest.cs @@ -38,7 +38,7 @@ using System; using System.Collections.Generic; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -103,39 +103,39 @@ namespace Google.ProtocolBuffers // ================================================================= - [Fact] + [Test] public void Varint() { UnknownField field = GetField("optional_int32"); - Assert.Equal(1, field.VarintList.Count); - Assert.Equal(allFields.OptionalInt32, (long) field.VarintList[0]); + Assert.AreEqual(1, field.VarintList.Count); + Assert.AreEqual(allFields.OptionalInt32, (long) field.VarintList[0]); } - [Fact] + [Test] public void Fixed32() { UnknownField field = GetField("optional_fixed32"); - Assert.Equal(1, field.Fixed32List.Count); - Assert.Equal(allFields.OptionalFixed32, (int) field.Fixed32List[0]); + Assert.AreEqual(1, field.Fixed32List.Count); + Assert.AreEqual(allFields.OptionalFixed32, (int) field.Fixed32List[0]); } - [Fact] + [Test] public void Fixed64() { UnknownField field = GetField("optional_fixed64"); - Assert.Equal(1, field.Fixed64List.Count); - Assert.Equal((long)allFields.OptionalFixed64, (long)field.Fixed64List[0]); + Assert.AreEqual(1, field.Fixed64List.Count); + Assert.AreEqual((long)allFields.OptionalFixed64, (long)field.Fixed64List[0]); } - [Fact] + [Test] public void LengthDelimited() { UnknownField field = GetField("optional_bytes"); - Assert.Equal(1, field.LengthDelimitedList.Count); - Assert.Equal(allFields.OptionalBytes, field.LengthDelimitedList[0]); + Assert.AreEqual(1, field.LengthDelimitedList.Count); + Assert.AreEqual(allFields.OptionalBytes, field.LengthDelimitedList[0]); } - [Fact] + [Test] public void Group() { FieldDescriptor nestedFieldDescriptor = @@ -143,35 +143,35 @@ namespace Google.ProtocolBuffers Assert.NotNull(nestedFieldDescriptor); UnknownField field = GetField("optionalgroup"); - Assert.Equal(1, field.GroupList.Count); + Assert.AreEqual(1, field.GroupList.Count); UnknownFieldSet group = field.GroupList[0]; - Assert.Equal(1, group.FieldDictionary.Count); - Assert.True(group.HasField(nestedFieldDescriptor.FieldNumber)); + Assert.AreEqual(1, group.FieldDictionary.Count); + Assert.IsTrue(group.HasField(nestedFieldDescriptor.FieldNumber)); UnknownField nestedField = group[nestedFieldDescriptor.FieldNumber]; - Assert.Equal(1, nestedField.VarintList.Count); - Assert.Equal(allFields.OptionalGroup.A, (long) nestedField.VarintList[0]); + Assert.AreEqual(1, nestedField.VarintList.Count); + Assert.AreEqual(allFields.OptionalGroup.A, (long) nestedField.VarintList[0]); } - [Fact] + [Test] public void Serialize() { // Check that serializing the UnknownFieldSet produces the original data again. ByteString data = emptyMessage.ToByteString(); - Assert.Equal(allFieldsData, data); + Assert.AreEqual(allFieldsData, data); } - [Fact] + [Test] public void CopyFrom() { TestEmptyMessage message = TestEmptyMessage.CreateBuilder().MergeFrom(emptyMessage).Build(); - Assert.Equal(emptyMessage.ToString(), message.ToString()); + Assert.AreEqual(emptyMessage.ToString(), message.ToString()); } - [Fact] + [Test] public void MergeFrom() { TestEmptyMessage source = @@ -200,7 +200,7 @@ namespace Google.ProtocolBuffers .MergeFrom(source) .Build(); - Assert.Equal( + Assert.AreEqual( "1: 1\n" + "2: 2\n" + "3: 3\n" + @@ -208,23 +208,23 @@ namespace Google.ProtocolBuffers destination.ToString()); } - [Fact] + [Test] public void Clear() { UnknownFieldSet fields = UnknownFieldSet.CreateBuilder().MergeFrom(unknownFields).Clear().Build(); - Assert.Equal(0, fields.FieldDictionary.Count); + Assert.AreEqual(0, fields.FieldDictionary.Count); } - [Fact] + [Test] public void ClearMessage() { TestEmptyMessage message = TestEmptyMessage.CreateBuilder().MergeFrom(emptyMessage).Clear().Build(); - Assert.Equal(0, message.SerializedSize); + Assert.AreEqual(0, message.SerializedSize); } - [Fact] + [Test] public void ParseKnownAndUnknown() { // Test mixing known and unknown fields when parsing. @@ -239,14 +239,14 @@ namespace Google.ProtocolBuffers TestAllTypes destination = TestAllTypes.ParseFrom(data); TestUtil.AssertAllFieldsSet(destination); - Assert.Equal(1, destination.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(1, destination.UnknownFields.FieldDictionary.Count); UnknownField field = destination.UnknownFields[123456]; - Assert.Equal(1, field.VarintList.Count); - Assert.Equal(654321, (long) field.VarintList[0]); + Assert.AreEqual(1, field.VarintList.Count); + Assert.AreEqual(654321, (long) field.VarintList[0]); } - [Fact] + [Test] public void WrongTypeTreatedAsUnknown() { // Test that fields of the wrong wire type are treated like unknown fields @@ -258,10 +258,10 @@ namespace Google.ProtocolBuffers // All fields should have been interpreted as unknown, so the debug strings // should be the same. - Assert.Equal(emptyMessage.ToString(), allTypesMessage.ToString()); + Assert.AreEqual(emptyMessage.ToString(), allTypesMessage.ToString()); } - [Fact] + [Test] public void UnknownExtensions() { // Make sure fields are properly parsed to the UnknownFieldSet even when @@ -270,12 +270,12 @@ namespace Google.ProtocolBuffers TestEmptyMessageWithExtensions message = TestEmptyMessageWithExtensions.ParseFrom(allFieldsData); - Assert.Equal(unknownFields.FieldDictionary.Count, + Assert.AreEqual(unknownFields.FieldDictionary.Count, message.UnknownFields.FieldDictionary.Count); - Assert.Equal(allFieldsData, message.ToByteString()); + Assert.AreEqual(allFieldsData, message.ToByteString()); } - [Fact] + [Test] public void WrongExtensionTypeTreatedAsUnknown() { // Test that fields of the wrong wire type are treated like unknown fields @@ -287,11 +287,11 @@ namespace Google.ProtocolBuffers // All fields should have been interpreted as unknown, so the debug strings // should be the same. - Assert.Equal(emptyMessage.ToString(), + Assert.AreEqual(emptyMessage.ToString(), allExtensionsMessage.ToString()); } - [Fact] + [Test] public void ParseUnknownEnumValue() { FieldDescriptor singularField = @@ -320,7 +320,7 @@ namespace Google.ProtocolBuffers { TestAllTypes message = TestAllTypes.ParseFrom(data); - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.OptionalNestedEnum); TestUtil.AssertEqual(new[] {TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.BAZ}, message.RepeatedNestedEnumList); @@ -331,7 +331,7 @@ namespace Google.ProtocolBuffers { TestAllExtensions message = TestAllExtensions.ParseFrom(data, TestUtil.CreateExtensionRegistry()); - Assert.Equal(TestAllTypes.Types.NestedEnum.BAR, + Assert.AreEqual(TestAllTypes.Types.NestedEnum.BAR, message.GetExtension(Unittest.OptionalNestedEnumExtension)); TestUtil.AssertEqual(new[] {TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.BAZ}, message.GetExtension(Unittest.RepeatedNestedEnumExtension)); @@ -340,7 +340,7 @@ namespace Google.ProtocolBuffers } } - [Fact] + [Test] public void LargeVarint() { ByteString data = @@ -353,11 +353,11 @@ namespace Google.ProtocolBuffers .ToByteString(); UnknownFieldSet parsed = UnknownFieldSet.ParseFrom(data); UnknownField field = parsed[1]; - Assert.Equal(1, field.VarintList.Count); - Assert.Equal(0x7FFFFFFFFFFFFFFFUL, field.VarintList[0]); + Assert.AreEqual(1, field.VarintList.Count); + Assert.AreEqual(0x7FFFFFFFFFFFFFFFUL, field.VarintList[0]); } - [Fact] + [Test] public void EqualsAndHashCode() { UnknownField fixed32Field = UnknownField.CreateBuilder().AddFixed32(1).Build(); @@ -405,10 +405,10 @@ namespace Google.ProtocolBuffers private static void CheckNotEqual(UnknownFieldSet s1, UnknownFieldSet s2) { String equalsError = string.Format("{0} should not be equal to {1}", s1, s2); - Assert.False(s1.Equals(s2), equalsError); - Assert.False(s2.Equals(s1), equalsError); + Assert.IsFalse(s1.Equals(s2), equalsError); + Assert.IsFalse(s2.Equals(s1), equalsError); - Assert.False(s1.GetHashCode() == s2.GetHashCode(), + Assert.IsFalse(s1.GetHashCode() == s2.GetHashCode(), string.Format("{0} should have a different hash code from {1}", s1, s2)); } @@ -419,13 +419,13 @@ namespace Google.ProtocolBuffers private static void CheckEqualsIsConsistent(UnknownFieldSet set) { // Object should be equal to itself. - Assert.Equal(set, set); + Assert.AreEqual(set, set); // Object should be equal to a copy of itself. UnknownFieldSet copy = UnknownFieldSet.CreateBuilder(set).Build(); - Assert.Equal(set, copy); - Assert.Equal(copy, set); - Assert.Equal(set.GetHashCode(), copy.GetHashCode()); + Assert.AreEqual(set, copy); + Assert.AreEqual(copy, set); + Assert.AreEqual(set.GetHashCode(), copy.GetHashCode()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs b/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs index 12a9d236..0c9b8c27 100644 --- a/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs +++ b/csharp/src/ProtocolBuffers.Test/WireFormatTest.cs @@ -38,7 +38,7 @@ using System.IO; using System.Reflection; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -47,7 +47,7 @@ namespace Google.ProtocolBuffers /// /// Keeps the attributes on FieldType and the switch statement in WireFormat in sync. /// - [Fact] + [Test] public void FieldTypeToWireTypeMapping() { foreach (FieldInfo field in typeof(FieldType).GetFields(BindingFlags.Static | BindingFlags.Public)) @@ -55,34 +55,34 @@ namespace Google.ProtocolBuffers FieldType fieldType = (FieldType) field.GetValue(null); FieldMappingAttribute mapping = (FieldMappingAttribute) field.GetCustomAttributes(typeof(FieldMappingAttribute), false)[0]; - Assert.Equal(mapping.WireType, WireFormat.GetWireType(fieldType)); + Assert.AreEqual(mapping.WireType, WireFormat.GetWireType(fieldType)); } } - [Fact] + [Test] public void Serialization() { TestAllTypes message = TestUtil.GetAllSet(); ByteString rawBytes = message.ToByteString(); - Assert.Equal(rawBytes.Length, message.SerializedSize); + Assert.AreEqual(rawBytes.Length, message.SerializedSize); TestAllTypes message2 = TestAllTypes.ParseFrom(rawBytes); TestUtil.AssertAllFieldsSet(message2); } - [Fact] + [Test] public void SerializationPacked() { TestPackedTypes message = TestUtil.GetPackedSet(); ByteString rawBytes = message.ToByteString(); - Assert.Equal(rawBytes.Length, message.SerializedSize); + Assert.AreEqual(rawBytes.Length, message.SerializedSize); TestPackedTypes message2 = TestPackedTypes.ParseFrom(rawBytes); TestUtil.AssertPackedFieldsSet(message2); } - [Fact] + [Test] public void SerializeExtensions() { // TestAllTypes and TestAllExtensions should have compatible wire formats, @@ -90,14 +90,14 @@ namespace Google.ProtocolBuffers // it should work. TestAllExtensions message = TestUtil.GetAllExtensionsSet(); ByteString rawBytes = message.ToByteString(); - Assert.Equal(rawBytes.Length, message.SerializedSize); + Assert.AreEqual(rawBytes.Length, message.SerializedSize); TestAllTypes message2 = TestAllTypes.ParseFrom(rawBytes); TestUtil.AssertAllFieldsSet(message2); } - [Fact] + [Test] public void SerializePackedExtensions() { // TestPackedTypes and TestPackedExtensions should have compatible wire @@ -108,10 +108,10 @@ namespace Google.ProtocolBuffers TestPackedTypes message2 = TestUtil.GetPackedSet(); ByteString rawBytes2 = message2.ToByteString(); - Assert.Equal(rawBytes, rawBytes2); + Assert.AreEqual(rawBytes, rawBytes2); } - [Fact] + [Test] public void SerializeDelimited() { MemoryStream stream = new MemoryStream(); @@ -123,13 +123,13 @@ namespace Google.ProtocolBuffers stream.Position = 0; TestUtil.AssertAllFieldsSet(TestAllTypes.ParseDelimitedFrom(stream)); - Assert.Equal(12, stream.ReadByte()); + Assert.AreEqual(12, stream.ReadByte()); TestUtil.AssertPackedFieldsSet(TestPackedTypes.ParseDelimitedFrom(stream)); - Assert.Equal(34, stream.ReadByte()); - Assert.Equal(-1, stream.ReadByte()); + Assert.AreEqual(34, stream.ReadByte()); + Assert.AreEqual(-1, stream.ReadByte()); } - [Fact] + [Test] public void ParseExtensions() { // TestAllTypes and TestAllExtensions should have compatible wire formats, @@ -148,7 +148,7 @@ namespace Google.ProtocolBuffers TestUtil.AssertAllExtensionsSet(message2); } - [Fact] + [Test] public void ParsePackedExtensions() { // Ensure that packed extensions can be properly parsed. @@ -161,10 +161,10 @@ namespace Google.ProtocolBuffers TestUtil.AssertPackedExtensionsSet(message2); } - [Fact] + [Test] public void ExtensionsSerializedSize() { - Assert.Equal(TestUtil.GetAllSet().SerializedSize, TestUtil.GetAllExtensionsSet().SerializedSize); + Assert.AreEqual(TestUtil.GetAllSet().SerializedSize, TestUtil.GetAllExtensionsSet().SerializedSize); } private static void AssertFieldsInOrder(ByteString data) @@ -176,13 +176,13 @@ namespace Google.ProtocolBuffers string name; while (input.ReadTag(out tag, out name)) { - Assert.True(tag > previousTag); + Assert.IsTrue(tag > previousTag); previousTag = tag; input.SkipField(); } } - [Fact] + [Test] public void InterleavedFieldsAndExtensions() { // Tests that fields are written in order even when extension ranges @@ -213,7 +213,7 @@ namespace Google.ProtocolBuffers private static readonly int TypeId1 = TestMessageSetExtension1.Descriptor.Extensions[0].FieldNumber; private static readonly int TypeId2 = TestMessageSetExtension2.Descriptor.Extensions[0].FieldNumber; - [Fact] + [Test] public void SerializeMessageSet() { // Set up a TestMessageSet with two known messages and an unknown one. @@ -239,23 +239,23 @@ namespace Google.ProtocolBuffers // Parse back using RawMessageSet and check the contents. RawMessageSet raw = RawMessageSet.ParseFrom(data); - Assert.Equal(0, raw.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(0, raw.UnknownFields.FieldDictionary.Count); - Assert.Equal(3, raw.ItemCount); - Assert.Equal(TypeId1, raw.ItemList[0].TypeId); - Assert.Equal(TypeId2, raw.ItemList[1].TypeId); - Assert.Equal(UnknownTypeId, raw.ItemList[2].TypeId); + Assert.AreEqual(3, raw.ItemCount); + Assert.AreEqual(TypeId1, raw.ItemList[0].TypeId); + Assert.AreEqual(TypeId2, raw.ItemList[1].TypeId); + Assert.AreEqual(UnknownTypeId, raw.ItemList[2].TypeId); TestMessageSetExtension1 message1 = TestMessageSetExtension1.ParseFrom(raw.GetItem(0).Message.ToByteArray()); - Assert.Equal(123, message1.I); + Assert.AreEqual(123, message1.I); TestMessageSetExtension2 message2 = TestMessageSetExtension2.ParseFrom(raw.GetItem(1).Message.ToByteArray()); - Assert.Equal("foo", message2.Str); + Assert.AreEqual("foo", message2.Str); - Assert.Equal("bar", raw.GetItem(2).Message.ToStringUtf8()); + Assert.AreEqual("bar", raw.GetItem(2).Message.ToStringUtf8()); } - [Fact] + [Test] public void ParseMessageSet() { ExtensionRegistry extensionRegistry = ExtensionRegistry.CreateInstance(); @@ -294,18 +294,18 @@ namespace Google.ProtocolBuffers TestMessageSet messageSet = TestMessageSet.ParseFrom(data, extensionRegistry); - Assert.Equal(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); - Assert.Equal("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); + Assert.AreEqual(123, messageSet.GetExtension(TestMessageSetExtension1.MessageSetExtension).I); + Assert.AreEqual("foo", messageSet.GetExtension(TestMessageSetExtension2.MessageSetExtension).Str); // Check for unknown field with type LENGTH_DELIMITED, // number UNKNOWN_TYPE_ID, and contents "bar". UnknownFieldSet unknownFields = messageSet.UnknownFields; - Assert.Equal(1, unknownFields.FieldDictionary.Count); - Assert.True(unknownFields.HasField(UnknownTypeId)); + Assert.AreEqual(1, unknownFields.FieldDictionary.Count); + Assert.IsTrue(unknownFields.HasField(UnknownTypeId)); UnknownField field = unknownFields[UnknownTypeId]; - Assert.Equal(1, field.LengthDelimitedList.Count); - Assert.Equal("bar", field.LengthDelimitedList[0].ToStringUtf8()); + Assert.AreEqual(1, field.LengthDelimitedList.Count); + Assert.AreEqual("bar", field.LengthDelimitedList[0].ToStringUtf8()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffers.Test/packages.config b/csharp/src/ProtocolBuffers.Test/packages.config index 6f1fb7f5..c7653992 100644 --- a/csharp/src/ProtocolBuffers.Test/packages.config +++ b/csharp/src/ProtocolBuffers.Test/packages.config @@ -1,9 +1,5 @@  - - - - - - + + \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs index e0199202..f5932ab3 100644 --- a/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/AbstractBuilderLiteTest.cs @@ -36,13 +36,13 @@ using System.IO; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class AbstractBuilderLiteTest { - [Fact] + [Test] public void TestMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -50,7 +50,7 @@ namespace Google.ProtocolBuffers .SetOptionalUint32(uint.MaxValue).Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); using (MemoryStream ms = new MemoryStream(msg.ToByteArray())) { @@ -58,22 +58,22 @@ namespace Google.ProtocolBuffers copy = copy.ToBuilder().MergeFrom(ci).Build(); } - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakClear() { TestAllTypesLite copy, msg = TestAllTypesLite.DefaultInstance; copy = msg.ToBuilder().SetOptionalString("Should be removed.").Build(); - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakClear().WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestBuilderLiteMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -81,14 +81,14 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = copy.ToBuilder().MergeFrom(CodedInputStream.CreateInstance(new MemoryStream(msg.ToByteArray()))).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestBuilderLiteMergeDelimitedFrom() { TestAllTypesLite copy, @@ -96,15 +96,15 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteDelimitedTo(s); s.Position = 0; copy = copy.ToBuilder().MergeDelimitedFrom(s).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestBuilderLiteMergeDelimitedFromExtensions() { TestAllExtensionsLite copy, @@ -113,7 +113,7 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteDelimitedTo(s); @@ -123,11 +123,11 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = copy.ToBuilder().MergeDelimitedFrom(s, registry).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [Fact] + [Test] public void TestBuilderLiteMergeFromStream() { TestAllTypesLite copy, @@ -135,15 +135,15 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteTo(s); s.Position = 0; copy = copy.ToBuilder().MergeFrom(s).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestBuilderLiteMergeFromStreamExtensions() { TestAllExtensionsLite copy, @@ -152,7 +152,7 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); Stream s = new MemoryStream(); msg.WriteTo(s); @@ -162,11 +162,11 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = copy.ToBuilder().MergeFrom(s, registry).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [Fact] + [Test] public void TestIBuilderLiteWeakMergeFromIMessageLite() { TestAllTypesLite copy, @@ -174,13 +174,13 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom((IMessageLite) msg).WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakMergeFromByteString() { TestAllTypesLite copy, @@ -188,13 +188,13 @@ namespace Google.ProtocolBuffers .SetOptionalString("Should be merged.").Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString()).WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakMergeFromByteStringExtensions() { TestAllExtensionsLite copy, @@ -203,12 +203,12 @@ namespace Google.ProtocolBuffers "Should be merged.").Build(); copy = TestAllExtensionsLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); copy = (TestAllExtensionsLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString(), ExtensionRegistry.Empty).WeakBuild(); - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestLite.RegisterAllExtensions(registry); @@ -216,11 +216,11 @@ namespace Google.ProtocolBuffers copy = (TestAllExtensionsLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(msg.ToByteString(), registry).WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); - Assert.Equal("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual("Should be merged.", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); } - [Fact] + [Test] public void TestIBuilderLiteWeakMergeFromCodedInputStream() { TestAllTypesLite copy, @@ -228,7 +228,7 @@ namespace Google.ProtocolBuffers .SetOptionalUint32(uint.MaxValue).Build(); copy = TestAllTypesLite.DefaultInstance; - Assert.NotEqual(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreNotEqual(msg.ToByteArray(), copy.ToByteArray()); using (MemoryStream ms = new MemoryStream(msg.ToByteArray())) { @@ -236,58 +236,58 @@ namespace Google.ProtocolBuffers copy = (TestAllTypesLite) ((IBuilderLite) copy.ToBuilder()).WeakMergeFrom(ci).WeakBuild(); } - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakBuildPartial() { IBuilderLite builder = TestRequiredLite.CreateBuilder(); - Assert.False(builder.IsInitialized); + Assert.IsFalse(builder.IsInitialized); IMessageLite msg = builder.WeakBuildPartial(); - Assert.False(msg.IsInitialized); + Assert.IsFalse(msg.IsInitialized); - Assert.Equal(msg.ToByteArray(), TestRequiredLite.DefaultInstance.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), TestRequiredLite.DefaultInstance.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakBuildUninitialized() { IBuilderLite builder = TestRequiredLite.CreateBuilder(); - Assert.False(builder.IsInitialized); + Assert.IsFalse(builder.IsInitialized); Assert.Throws(() => builder.WeakBuild()); } - [Fact] + [Test] public void TestIBuilderLiteWeakBuild() { IBuilderLite builder = TestRequiredLite.CreateBuilder() .SetD(0) .SetEn(ExtraEnum.EXLITE_BAZ); - Assert.True(builder.IsInitialized); + Assert.IsTrue(builder.IsInitialized); builder.WeakBuild(); } - [Fact] + [Test] public void TestIBuilderLiteWeakClone() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() .SetD(1).SetEn(ExtraEnum.EXLITE_BAR).Build(); - Assert.True(msg.IsInitialized); + Assert.IsTrue(msg.IsInitialized); IMessageLite copy = ((IBuilderLite) msg.ToBuilder()).WeakClone().WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestIBuilderLiteWeakDefaultInstance() { - Assert.True(ReferenceEquals(TestRequiredLite.DefaultInstance, + Assert.IsTrue(ReferenceEquals(TestRequiredLite.DefaultInstance, ((IBuilderLite) TestRequiredLite.CreateBuilder()).WeakDefaultInstanceForType)); } - [Fact] + [Test] public void TestGeneratedBuilderLiteAddRange() { TestAllTypesLite copy, @@ -299,11 +299,11 @@ namespace Google.ProtocolBuffers .Build(); copy = msg.DefaultInstanceForType.ToBuilder().MergeFrom(msg).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } // ROK 5/7/2013 Issue #54: should retire all bytes in buffer (bufferSize) - [Fact] + [Test] public void TestBufferRefillIssue() { var ms = new MemoryStream(); @@ -322,15 +322,15 @@ namespace Google.ProtocolBuffers var input = CodedInputStream.CreateInstance(ms); var builder = BucketOfBytes.CreateBuilder(); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.Equal(3005L, input.Position); - Assert.Equal(3000, builder.Value.Length); + Assert.AreEqual(3005L, input.Position); + Assert.AreEqual(3000, builder.Value.Length); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.Equal(5114, input.Position); - Assert.Equal(1000, builder.Value.Length); + Assert.AreEqual(5114, input.Position); + Assert.AreEqual(1000, builder.Value.Length); input.ReadMessage(builder, ExtensionRegistry.Empty); - Assert.Equal(5217L, input.Position); - Assert.Equal(input.Position, ms.Length); - Assert.Equal(100, builder.Value.Length); + Assert.AreEqual(5217L, input.Position); + Assert.AreEqual(input.Position, ms.Length); + Assert.AreEqual(100, builder.Value.Length); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs index f6a4e94b..93ed5ea5 100644 --- a/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/AbstractMessageLiteTest.cs @@ -37,13 +37,13 @@ using System; using System.IO; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class AbstractMessageLiteTest { - [Fact] + [Test] public void TestMessageLiteToByteString() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -52,14 +52,14 @@ namespace Google.ProtocolBuffers .Build(); ByteString b = msg.ToByteString(); - Assert.Equal(4, b.Length); - Assert.Equal(TestRequiredLite.DFieldNumber << 3, b[0]); - Assert.Equal(42, b[1]); - Assert.Equal(TestRequiredLite.EnFieldNumber << 3, b[2]); - Assert.Equal((int) ExtraEnum.EXLITE_BAZ, b[3]); + Assert.AreEqual(4, b.Length); + Assert.AreEqual(TestRequiredLite.DFieldNumber << 3, b[0]); + Assert.AreEqual(42, b[1]); + Assert.AreEqual(TestRequiredLite.EnFieldNumber << 3, b[2]); + Assert.AreEqual((int) ExtraEnum.EXLITE_BAZ, b[3]); } - [Fact] + [Test] public void TestMessageLiteToByteArray() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -69,10 +69,10 @@ namespace Google.ProtocolBuffers ByteString b = msg.ToByteString(); ByteString copy = ByteString.CopyFrom(msg.ToByteArray()); - Assert.Equal(b, copy); + Assert.AreEqual(b, copy); } - [Fact] + [Test] public void TestMessageLiteWriteTo() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -82,10 +82,10 @@ namespace Google.ProtocolBuffers MemoryStream ms = new MemoryStream(); msg.WriteTo(ms); - Assert.Equal(msg.ToByteArray(), ms.ToArray()); + Assert.AreEqual(msg.ToByteArray(), ms.ToArray()); } - [Fact] + [Test] public void TestMessageLiteWriteDelimitedTo() { TestRequiredLite msg = TestRequiredLite.CreateBuilder() @@ -97,21 +97,21 @@ namespace Google.ProtocolBuffers msg.WriteDelimitedTo(ms); byte[] buffer = ms.ToArray(); - Assert.Equal(5, buffer.Length); - Assert.Equal(4, buffer[0]); + Assert.AreEqual(5, buffer.Length); + Assert.AreEqual(4, buffer[0]); byte[] msgBytes = new byte[4]; Array.Copy(buffer, 1, msgBytes, 0, 4); - Assert.Equal(msg.ToByteArray(), msgBytes); + Assert.AreEqual(msg.ToByteArray(), msgBytes); } - [Fact] + [Test] public void TestIMessageLiteWeakCreateBuilderForType() { IMessageLite msg = TestRequiredLite.DefaultInstance; - Assert.Equal(typeof(TestRequiredLite.Builder), msg.WeakCreateBuilderForType().GetType()); + Assert.AreEqual(typeof(TestRequiredLite.Builder), msg.WeakCreateBuilderForType().GetType()); } - [Fact] + [Test] public void TestMessageLiteWeakToBuilder() { IMessageLite msg = TestRequiredLite.CreateBuilder() @@ -120,14 +120,14 @@ namespace Google.ProtocolBuffers .Build(); IMessageLite copy = msg.WeakToBuilder().WeakBuild(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestMessageLiteWeakDefaultInstanceForType() { IMessageLite msg = TestRequiredLite.DefaultInstance; - Assert.True(Object.ReferenceEquals(TestRequiredLite.DefaultInstance, msg.WeakDefaultInstanceForType)); + Assert.IsTrue(Object.ReferenceEquals(TestRequiredLite.DefaultInstance, msg.WeakDefaultInstanceForType)); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs index 5377ea6a..1ea712d4 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/ExtendableBuilderLiteTest.cs @@ -37,29 +37,29 @@ using System; using System.Collections.Generic; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class ExtendableBuilderLiteTest { - [Fact] + [Test] public void TestHasExtensionT() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 123); - Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [Fact] + [Test] public void TestHasExtensionTMissing() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [Fact] + [Test] public void TestGetExtensionCountT() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -67,17 +67,17 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2) .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 3); - Assert.Equal(3, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(3, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [Fact] + [Test] public void TestGetExtensionCountTEmpty() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [Fact] + [Test] public void TestGetExtensionTNull() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); @@ -85,23 +85,23 @@ namespace Google.ProtocolBuffers Assert.Null(value); } - [Fact] + [Test] public void TestGetExtensionTValue() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 3); - Assert.Equal(3, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.AreEqual(3, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [Fact] + [Test] public void TestGetExtensionTEmpty() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.Equal(0, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite).Count); + Assert.AreEqual(0, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite).Count); } - [Fact] + [Test] public void TestGetExtensionTList() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -110,10 +110,10 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 3); IList values = builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite); - Assert.Equal(3, values.Count); + Assert.AreEqual(3, values.Count); } - [Fact] + [Test] public void TestGetExtensionTIndex() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -122,17 +122,17 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2); for (int i = 0; i < 3; i++) - Assert.Equal(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.AreEqual(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); } - [Fact] + [Test] public void TestGetExtensionTIndexOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); Assert.Throws(() => builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); } - [Fact] + [Test] public void TestSetExtensionTIndex() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -141,107 +141,107 @@ namespace Google.ProtocolBuffers .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 2); for (int i = 0; i < 3; i++) - Assert.Equal(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.AreEqual(i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0, 5); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1, 6); builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 2, 7); for (int i = 0; i < 3; i++) - Assert.Equal(5 + i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); + Assert.AreEqual(5 + i, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, i)); } - [Fact] + [Test] public void TestSetExtensionTIndexOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); Assert.Throws(() => builder.SetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0, -1)); } - [Fact] + [Test] public void TestClearExtensionTList() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); builder.ClearExtension(UnittestLite.RepeatedInt32ExtensionLite); - Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [Fact] + [Test] public void TestClearExtensionTValue() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .SetExtension(UnittestLite.OptionalInt32ExtensionLite, 0); - Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); builder.ClearExtension(UnittestLite.OptionalInt32ExtensionLite); - Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [Fact] + [Test] public void TestIndexedByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.False(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsFalse(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); builder[UnittestLite.OptionalInt32ExtensionLite.Descriptor] = 123; - Assert.True(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.Equal(123, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.IsTrue(builder.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.AreEqual(123, builder.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); } - [Fact] + [Test] public void TestIndexedByDescriptorAndOrdinal() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder[f, 0] = 123; - Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); - Assert.Equal(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); + Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); } - [Fact] + [Test] public void TestIndexedByDescriptorAndOrdinalOutOfRange() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder(); - Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; Assert.Throws(() => builder[f, 0] = 123); } - [Fact] + [Test] public void TestClearFieldByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder.ClearField(f); - Assert.Equal(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(0, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); } - [Fact] + [Test] public void TestAddRepeatedFieldByDescriptor() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() .AddExtension(UnittestLite.RepeatedInt32ExtensionLite, 0); - Assert.Equal(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(1, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); IFieldDescriptorLite f = UnittestLite.RepeatedInt32ExtensionLite.Descriptor; builder.AddRepeatedField(f, 123); - Assert.Equal(2, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); - Assert.Equal(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1)); + Assert.AreEqual(2, builder.GetExtensionCount(UnittestLite.RepeatedInt32ExtensionLite)); + Assert.AreEqual(123, builder.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 1)); } - [Fact] + [Test] public void TestMissingExtensionsLite() { const int optionalInt32 = 12345678; @@ -252,21 +252,21 @@ namespace Google.ProtocolBuffers builder.AddExtension(UnittestLite.RepeatedDoubleExtensionLite, 1.3); TestAllExtensionsLite msg = builder.Build(); - Assert.True(msg.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.Equal(3, msg.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); + Assert.IsTrue(msg.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.AreEqual(3, msg.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); byte[] bits = msg.ToByteArray(); TestAllExtensionsLite copy = TestAllExtensionsLite.ParseFrom(bits); - Assert.False(copy.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.Equal(0, copy.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); - Assert.NotEqual(msg, copy); + Assert.IsFalse(copy.HasExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.AreEqual(0, copy.GetExtensionCount(UnittestLite.RepeatedDoubleExtensionLite)); + Assert.AreNotEqual(msg, copy); //The lite runtime removes all unknown fields and extensions byte[] copybits = copy.ToByteArray(); - Assert.Equal(0, copybits.Length); + Assert.AreEqual(0, copybits.Length); } - [Fact] + [Test] public void TestMissingFieldsLite() { TestAllTypesLite msg = TestAllTypesLite.CreateBuilder() @@ -276,13 +276,11 @@ namespace Google.ProtocolBuffers byte[] bits = msg.ToByteArray(); IMessageLite copy = TestAllExtensionsLite.ParseFrom(bits); - // Use explicit call to Equals to avoid xUnit checking for type equality. - Assert.False(msg.Equals(copy)); - Assert.False(copy.Equals(msg)); + Assert.AreNotEqual(msg, copy); //The lite runtime removes all unknown fields and extensions byte[] copybits = copy.ToByteArray(); - Assert.Equal(0, copybits.Length); + Assert.AreEqual(0, copybits.Length); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs index 78127445..9a8e35b6 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/ExtendableMessageLiteTest.cs @@ -39,7 +39,7 @@ using System.Collections.Generic; using System.Text; using Google.ProtocolBuffers; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -54,7 +54,7 @@ namespace Google.ProtocolBuffers // ForeignMessageLite.DefaultInstance; //} - [Fact] + [Test] public void ExtensionWriterTestMessages() { TestAllExtensionsLite.Builder b = TestAllExtensionsLite.CreateBuilder().SetExtension( @@ -66,20 +66,20 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = TestAllExtensionsLite.ParseFrom(msg.ToByteArray(), registry); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void ExtensionWriterIsInitialized() { - Assert.True(ForeignMessageLite.DefaultInstance.IsInitialized); - Assert.True(TestPackedExtensionsLite.CreateBuilder().IsInitialized); - Assert.True(TestAllExtensionsLite.CreateBuilder().SetExtension( + Assert.IsTrue(ForeignMessageLite.DefaultInstance.IsInitialized); + Assert.IsTrue(TestPackedExtensionsLite.CreateBuilder().IsInitialized); + Assert.IsTrue(TestAllExtensionsLite.CreateBuilder().SetExtension( UnittestLite.OptionalForeignMessageExtensionLite, ForeignMessageLite.DefaultInstance) .IsInitialized); } - [Fact] + [Test] public void ExtensionWriterTestSetExtensionLists() { TestAllExtensionsLite msg, copy; @@ -95,13 +95,13 @@ namespace Google.ProtocolBuffers UnittestLite.RegisterAllExtensions(registry); copy = TestAllExtensionsLite.ParseFrom(msg.ToByteArray(), registry); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.Equal(ForeignEnumLite.FOREIGN_LITE_FOO, + Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_FOO, copy.GetExtension(UnittestLite.RepeatedForeignEnumExtensionLite, 1)); } - [Fact] + [Test] public void ExtensionWriterTest() { TestAllExtensionsLite.Builder builder = TestAllExtensionsLite.CreateBuilder() @@ -180,82 +180,82 @@ namespace Google.ProtocolBuffers TestAllExtensionsLite.CreateBuilder().MergeFrom(msg.ToByteArray(), registry); TestAllExtensionsLite copy = copyBuilder.Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); - Assert.Equal(true, copy.GetExtension(UnittestLite.DefaultBoolExtensionLite)); - Assert.Equal(ByteString.CopyFromUtf8("123"), + Assert.AreEqual(true, copy.GetExtension(UnittestLite.DefaultBoolExtensionLite)); + Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.DefaultBytesExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultCordExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultDoubleExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultFixed32ExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultFixed64ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultFloatExtensionLite)); - Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultCordExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultDoubleExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultFixed32ExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultFixed64ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultFloatExtensionLite)); + Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.DefaultForeignEnumExtensionLite)); - Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.DefaultImportEnumExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultInt32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultInt64ExtensionLite)); - Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultInt32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultInt64ExtensionLite)); + Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.DefaultNestedEnumExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSfixed32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSfixed64ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSint32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.DefaultSint64ExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultStringExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.DefaultStringPieceExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultUint32ExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.DefaultUint64ExtensionLite)); - - Assert.Equal(true, copy.GetExtension(UnittestLite.OptionalBoolExtensionLite)); - Assert.Equal(ByteString.CopyFromUtf8("123"), + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSfixed32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSfixed64ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSint32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.DefaultSint64ExtensionLite)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultStringExtensionLite)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.DefaultStringPieceExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultUint32ExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.DefaultUint64ExtensionLite)); + + Assert.AreEqual(true, copy.GetExtension(UnittestLite.OptionalBoolExtensionLite)); + Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.OptionalBytesExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalCordExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalDoubleExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalFixed32ExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalFixed64ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalFloatExtensionLite)); - Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalCordExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalDoubleExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalFixed32ExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalFixed64ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalFloatExtensionLite)); + Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.OptionalForeignEnumExtensionLite)); - Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.OptionalImportEnumExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalInt64ExtensionLite)); - Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalInt32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalInt64ExtensionLite)); + Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.OptionalNestedEnumExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSfixed32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSfixed64ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSint32ExtensionLite)); - Assert.Equal(123, copy.GetExtension(UnittestLite.OptionalSint64ExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); - Assert.Equal("123", copy.GetExtension(UnittestLite.OptionalStringPieceExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalUint32ExtensionLite)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.OptionalUint64ExtensionLite)); - - Assert.Equal(true, copy.GetExtension(UnittestLite.RepeatedBoolExtensionLite, 0)); - Assert.Equal(ByteString.CopyFromUtf8("123"), + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSfixed32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSfixed64ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSint32ExtensionLite)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.OptionalSint64ExtensionLite)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalStringExtensionLite)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.OptionalStringPieceExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalUint32ExtensionLite)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.OptionalUint64ExtensionLite)); + + Assert.AreEqual(true, copy.GetExtension(UnittestLite.RepeatedBoolExtensionLite, 0)); + Assert.AreEqual(ByteString.CopyFromUtf8("123"), copy.GetExtension(UnittestLite.RepeatedBytesExtensionLite, 0)); - Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedCordExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedDoubleExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedFixed32ExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedFixed64ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedFloatExtensionLite, 0)); - Assert.Equal(ForeignEnumLite.FOREIGN_LITE_BAZ, + Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedCordExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedDoubleExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedFixed32ExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedFixed64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedFloatExtensionLite, 0)); + Assert.AreEqual(ForeignEnumLite.FOREIGN_LITE_BAZ, copy.GetExtension(UnittestLite.RepeatedForeignEnumExtensionLite, 0)); - Assert.Equal(ImportEnumLite.IMPORT_LITE_BAZ, + Assert.AreEqual(ImportEnumLite.IMPORT_LITE_BAZ, copy.GetExtension(UnittestLite.RepeatedImportEnumExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedInt64ExtensionLite, 0)); - Assert.Equal(TestAllTypesLite.Types.NestedEnum.FOO, + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedInt32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedInt64ExtensionLite, 0)); + Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.FOO, copy.GetExtension(UnittestLite.RepeatedNestedEnumExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSfixed32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSfixed64ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSint32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.RepeatedSint64ExtensionLite, 0)); - Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedStringExtensionLite, 0)); - Assert.Equal("123", copy.GetExtension(UnittestLite.RepeatedStringPieceExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedUint32ExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.RepeatedUint64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSfixed32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSfixed64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSint32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.RepeatedSint64ExtensionLite, 0)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedStringExtensionLite, 0)); + Assert.AreEqual("123", copy.GetExtension(UnittestLite.RepeatedStringPieceExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedUint32ExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.RepeatedUint64ExtensionLite, 0)); } private TestPackedExtensionsLite BuildPackedExtensions() @@ -294,36 +294,36 @@ namespace Google.ProtocolBuffers private void AssertPackedExtensions(TestPackedExtensionsLite copy) { - Assert.Equal(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 0)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 0)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 0)); - - Assert.Equal(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 1)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 1)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 1)); - Assert.Equal(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 1)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 1)); - Assert.Equal(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 1)); + Assert.AreEqual(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 0)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 0)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 0)); + + Assert.AreEqual(true, copy.GetExtension(UnittestLite.PackedBoolExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedDoubleExtensionLite, 1)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed32ExtensionLite, 1)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedFixed64ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedFloatExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt32ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedInt64ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed32ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSfixed64ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint32ExtensionLite, 1)); + Assert.AreEqual(123, copy.GetExtension(UnittestLite.PackedSint64ExtensionLite, 1)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint32ExtensionLite, 1)); + Assert.AreEqual(123u, copy.GetExtension(UnittestLite.PackedUint64ExtensionLite, 1)); } - [Fact] + [Test] public void ExtensionWriterTestPacked() { TestPackedExtensionsLite msg = BuildPackedExtensions(); @@ -335,12 +335,12 @@ namespace Google.ProtocolBuffers TestPackedExtensionsLite.CreateBuilder().MergeFrom(msg.ToByteArray(), registry); TestPackedExtensionsLite copy = copyBuilder.Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); AssertPackedExtensions(copy); } - [Fact] + [Test] public void TestUnpackedAndPackedExtensions() { TestPackedExtensionsLite original = BuildPackedExtensions(); @@ -354,19 +354,19 @@ namespace Google.ProtocolBuffers TestPackedExtensionsLite packed = TestPackedExtensionsLite.ParseFrom(unpacked.ToByteArray(), registry); - Assert.Equal(original, packed); - Assert.Equal(original.ToByteArray(), packed.ToByteArray()); + Assert.AreEqual(original, packed); + Assert.AreEqual(original.ToByteArray(), packed.ToByteArray()); AssertPackedExtensions(packed); } - [Fact] + [Test] public void TestUnpackedFromPackedInput() { byte[] packedData = BuildPackedExtensions().ToByteArray(); TestUnpackedTypesLite unpacked = TestUnpackedTypesLite.ParseFrom(packedData); TestPackedTypesLite packed = TestPackedTypesLite.ParseFrom(unpacked.ToByteArray()); - Assert.Equal(packedData, packed.ToByteArray()); + Assert.AreEqual(packedData, packed.ToByteArray()); unpacked = TestUnpackedTypesLite.ParseFrom(packed.ToByteArray()); diff --git a/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs index 7feb0448..227b53d2 100644 --- a/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/InteropLiteTest.cs @@ -36,27 +36,27 @@ using System; using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class InteropLiteTest { - [Fact] + [Test] public void TestConvertFromFullMinimal() { TestInteropPerson person = TestInteropPerson.CreateBuilder() .SetId(123) .SetName("abc") .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(person.ToByteArray()); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestConvertFromFullComplete() { TestInteropPerson person = TestInteropPerson.CreateBuilder() @@ -72,7 +72,7 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasFull.EmployeeId, TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasLite.RegisterAllExtensions(registry); @@ -81,24 +81,24 @@ namespace Google.ProtocolBuffers TestInteropPersonLite copy = TestInteropPersonLite.ParseFrom(fullBytes, registry); byte[] liteBytes = copy.ToByteArray(); - Assert.Equal(fullBytes, liteBytes); + Assert.AreEqual(fullBytes, liteBytes); } - [Fact] + [Test] public void TestConvertFromLiteMinimal() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() .SetId(123) .SetName("abc") .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray()); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestConvertFromLiteComplete() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() @@ -114,14 +114,14 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasLite.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); } public ByteString AllBytes @@ -135,7 +135,7 @@ namespace Google.ProtocolBuffers } } - [Fact] + [Test] public void TestCompareStringValues() { TestInteropPersonLite person = TestInteropPersonLite.CreateBuilder() @@ -153,14 +153,14 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasLite.EmployeeIdLite, TestInteropEmployeeIdLite.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(person.ToByteArray(), registry); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); TestInteropPerson.Builder copyBuilder = TestInteropPerson.CreateBuilder(); TextFormat.Merge( @@ -168,7 +168,7 @@ namespace Google.ProtocolBuffers "[protobuf_unittest_extra.employee_id]"), registry, copyBuilder); copy = copyBuilder.Build(); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); string liteText = person.ToString().TrimEnd().Replace("\r", ""); string fullText = copy.ToString().TrimEnd().Replace("\r", ""); @@ -179,7 +179,7 @@ namespace Google.ProtocolBuffers while (fullText.IndexOf("\n ", StringComparison.Ordinal) >= 0) fullText = fullText.Replace("\n ", "\n"); - Assert.Equal(fullText, liteText); + Assert.AreEqual(fullText, liteText); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs b/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs index 8ffd3ee2..5defc26e 100644 --- a/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/LiteTest.cs @@ -35,7 +35,7 @@ #endregion using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { @@ -45,7 +45,7 @@ namespace Google.ProtocolBuffers /// public class LiteTest { - [Fact] + [Test] public void TestLite() { // Since lite messages are a subset of regular messages, we can mostly @@ -68,13 +68,13 @@ namespace Google.ProtocolBuffers TestAllTypesLite message2 = TestAllTypesLite.ParseFrom(data); - Assert.Equal(123, message2.OptionalInt32); - Assert.Equal(1, message2.RepeatedStringCount); - Assert.Equal("hello", message2.RepeatedStringList[0]); - Assert.Equal(7, message2.OptionalNestedMessage.Bb); + Assert.AreEqual(123, message2.OptionalInt32); + Assert.AreEqual(1, message2.RepeatedStringCount); + Assert.AreEqual("hello", message2.RepeatedStringList[0]); + Assert.AreEqual(7, message2.OptionalNestedMessage.Bb); } - [Fact] + [Test] public void TestLiteExtensions() { // TODO(kenton): Unlike other features of the lite library, extensions are @@ -96,17 +96,17 @@ namespace Google.ProtocolBuffers // writing, parsing hasn't been implemented yet. TestAllExtensionsLite message2 = message.ToBuilder().Build(); - Assert.Equal(123, (int) message2.GetExtension( + Assert.AreEqual(123, (int) message2.GetExtension( UnittestLite.OptionalInt32ExtensionLite)); - Assert.Equal(1, message2.GetExtensionCount( + Assert.AreEqual(1, message2.GetExtensionCount( UnittestLite.RepeatedStringExtensionLite)); - Assert.Equal(1, message2.GetExtension( + Assert.AreEqual(1, message2.GetExtension( UnittestLite.RepeatedStringExtensionLite).Count); - Assert.Equal("hello", message2.GetExtension( + Assert.AreEqual("hello", message2.GetExtension( UnittestLite.RepeatedStringExtensionLite, 0)); - Assert.Equal(TestAllTypesLite.Types.NestedEnum.BAZ, message2.GetExtension( + Assert.AreEqual(TestAllTypesLite.Types.NestedEnum.BAZ, message2.GetExtension( UnittestLite.OptionalNestedEnumExtensionLite)); - Assert.Equal(7, message2.GetExtension( + Assert.AreEqual(7, message2.GetExtension( UnittestLite.OptionalNestedMessageExtensionLite).Bb); } } diff --git a/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs b/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs index b9680e68..2385bde5 100644 --- a/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs +++ b/csharp/src/ProtocolBuffersLite.Test/MissingFieldAndExtensionTest.cs @@ -35,13 +35,13 @@ #endregion using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class MissingFieldAndExtensionTest { - [Fact] + [Test] public void TestRecoverMissingExtensions() { const int optionalInt32 = 12345678; @@ -52,42 +52,42 @@ namespace Google.ProtocolBuffers builder.AddExtension(Unittest.RepeatedDoubleExtension, 1.3); TestAllExtensions msg = builder.Build(); - Assert.True(msg.HasExtension(Unittest.OptionalInt32Extension)); - Assert.Equal(3, msg.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.IsTrue(msg.HasExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(3, msg.GetExtensionCount(Unittest.RepeatedDoubleExtension)); byte[] bits = msg.ToByteArray(); TestAllExtensions copy = TestAllExtensions.ParseFrom(bits); - Assert.False(copy.HasExtension(Unittest.OptionalInt32Extension)); - Assert.Equal(0, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.NotEqual(msg, copy); + Assert.IsFalse(copy.HasExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(0, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.AreNotEqual(msg, copy); //Even though copy does not understand the typees they serialize correctly byte[] copybits = copy.ToByteArray(); - Assert.Equal(bits, copybits); + Assert.AreEqual(bits, copybits); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); Unittest.RegisterAllExtensions(registry); //Now we can take those copy bits and restore the full message with extensions copy = TestAllExtensions.ParseFrom(copybits, registry); - Assert.True(copy.HasExtension(Unittest.OptionalInt32Extension)); - Assert.Equal(3, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); + Assert.IsTrue(copy.HasExtension(Unittest.OptionalInt32Extension)); + Assert.AreEqual(3, copy.GetExtensionCount(Unittest.RepeatedDoubleExtension)); - Assert.Equal(msg, copy); - Assert.Equal(bits, copy.ToByteArray()); + Assert.AreEqual(msg, copy); + Assert.AreEqual(bits, copy.ToByteArray()); //If we modify the object this should all continue to work as before copybits = copy.ToBuilder().Build().ToByteArray(); - Assert.Equal(bits, copybits); + Assert.AreEqual(bits, copybits); //If we replace extension the object this should all continue to work as before copybits = copy.ToBuilder() .SetExtension(Unittest.OptionalInt32Extension, optionalInt32) .Build().ToByteArray(); - Assert.Equal(bits, copybits); + Assert.AreEqual(bits, copybits); } - [Fact] + [Test] public void TestRecoverMissingFields() { TestMissingFieldsA msga = TestMissingFieldsA.CreateBuilder() @@ -98,53 +98,53 @@ namespace Google.ProtocolBuffers //serialize to type B and verify all fields exist TestMissingFieldsB msgb = TestMissingFieldsB.ParseFrom(msga.ToByteArray()); - Assert.Equal(1001, msgb.Id); - Assert.Equal("Name", msgb.Name); - Assert.False(msgb.HasWebsite); - Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); - Assert.Equal("missing@field.value", + Assert.AreEqual(1001, msgb.Id); + Assert.AreEqual("Name", msgb.Name); + Assert.IsFalse(msgb.HasWebsite); + Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual("missing@field.value", msgb.UnknownFields[TestMissingFieldsA.EmailFieldNumber].LengthDelimitedList[0].ToStringUtf8()); //serializes exactly the same (at least for this simple example) - Assert.Equal(msga.ToByteArray(), msgb.ToByteArray()); - Assert.Equal(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); + Assert.AreEqual(msga.ToByteArray(), msgb.ToByteArray()); + Assert.AreEqual(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); //now re-create an exact copy of A from serialized B TestMissingFieldsA copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.Equal(msga, copya); - Assert.Equal(1001, copya.Id); - Assert.Equal("Name", copya.Name); - Assert.Equal("missing@field.value", copya.Email); + Assert.AreEqual(msga, copya); + Assert.AreEqual(1001, copya.Id); + Assert.AreEqual("Name", copya.Name); + Assert.AreEqual("missing@field.value", copya.Email); //Now we modify B... and try again msgb = msgb.ToBuilder().SetWebsite("http://new.missing.field").Build(); //Does B still have the missing field? - Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); //Convert back to A and see if all fields are there? copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.NotEqual(msga, copya); - Assert.Equal(1001, copya.Id); - Assert.Equal("Name", copya.Name); - Assert.Equal("missing@field.value", copya.Email); - Assert.Equal(1, copya.UnknownFields.FieldDictionary.Count); - Assert.Equal("http://new.missing.field", + Assert.AreNotEqual(msga, copya); + Assert.AreEqual(1001, copya.Id); + Assert.AreEqual("Name", copya.Name); + Assert.AreEqual("missing@field.value", copya.Email); + Assert.AreEqual(1, copya.UnknownFields.FieldDictionary.Count); + Assert.AreEqual("http://new.missing.field", copya.UnknownFields[TestMissingFieldsB.WebsiteFieldNumber].LengthDelimitedList[0]. ToStringUtf8()); //Lastly we can even still trip back to type B and see all fields: TestMissingFieldsB copyb = TestMissingFieldsB.ParseFrom(copya.ToByteArray()); - Assert.Equal(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. - Assert.Equal(1001, copyb.Id); - Assert.Equal("Name", copyb.Name); - Assert.Equal("http://new.missing.field", copyb.Website); - Assert.Equal(1, copyb.UnknownFields.FieldDictionary.Count); - Assert.Equal("missing@field.value", + Assert.AreEqual(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. + Assert.AreEqual(1001, copyb.Id); + Assert.AreEqual("Name", copyb.Name); + Assert.AreEqual("http://new.missing.field", copyb.Website); + Assert.AreEqual(1, copyb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual("missing@field.value", copyb.UnknownFields[TestMissingFieldsA.EmailFieldNumber].LengthDelimitedList[0].ToStringUtf8 ()); } - [Fact] + [Test] public void TestRecoverMissingMessage() { TestMissingFieldsA.Types.SubA suba = @@ -158,52 +158,52 @@ namespace Google.ProtocolBuffers //serialize to type B and verify all fields exist TestMissingFieldsB msgb = TestMissingFieldsB.ParseFrom(msga.ToByteArray()); - Assert.Equal(1001, msgb.Id); - Assert.Equal("Name", msgb.Name); - Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); - Assert.Equal(suba.ToString(), + Assert.AreEqual(1001, msgb.Id); + Assert.AreEqual("Name", msgb.Name); + Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(suba.ToString(), TestMissingFieldsA.Types.SubA.ParseFrom( msgb.UnknownFields[TestMissingFieldsA.TestAFieldNumber].LengthDelimitedList[0]).ToString ()); //serializes exactly the same (at least for this simple example) - Assert.Equal(msga.ToByteArray(), msgb.ToByteArray()); - Assert.Equal(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); + Assert.AreEqual(msga.ToByteArray(), msgb.ToByteArray()); + Assert.AreEqual(msga, TestMissingFieldsA.ParseFrom(msgb.ToByteArray())); //now re-create an exact copy of A from serialized B TestMissingFieldsA copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.Equal(msga, copya); - Assert.Equal(1001, copya.Id); - Assert.Equal("Name", copya.Name); - Assert.Equal(suba, copya.TestA); + Assert.AreEqual(msga, copya); + Assert.AreEqual(1001, copya.Id); + Assert.AreEqual("Name", copya.Name); + Assert.AreEqual(suba, copya.TestA); //Now we modify B... and try again TestMissingFieldsB.Types.SubB subb = TestMissingFieldsB.Types.SubB.CreateBuilder().AddValues("test-b").Build(); msgb = msgb.ToBuilder().SetTestB(subb).Build(); //Does B still have the missing field? - Assert.Equal(1, msgb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(1, msgb.UnknownFields.FieldDictionary.Count); //Convert back to A and see if all fields are there? copya = TestMissingFieldsA.ParseFrom(msgb.ToByteArray()); - Assert.NotEqual(msga, copya); - Assert.Equal(1001, copya.Id); - Assert.Equal("Name", copya.Name); - Assert.Equal(suba, copya.TestA); - Assert.Equal(1, copya.UnknownFields.FieldDictionary.Count); - Assert.Equal(subb.ToByteArray(), + Assert.AreNotEqual(msga, copya); + Assert.AreEqual(1001, copya.Id); + Assert.AreEqual("Name", copya.Name); + Assert.AreEqual(suba, copya.TestA); + Assert.AreEqual(1, copya.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(subb.ToByteArray(), copya.UnknownFields[TestMissingFieldsB.TestBFieldNumber].LengthDelimitedList[0].ToByteArray()); //Lastly we can even still trip back to type B and see all fields: TestMissingFieldsB copyb = TestMissingFieldsB.ParseFrom(copya.ToByteArray()); - Assert.Equal(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. - Assert.Equal(1001, copyb.Id); - Assert.Equal("Name", copyb.Name); - Assert.Equal(subb, copyb.TestB); - Assert.Equal(1, copyb.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(copya.ToByteArray().Length, copyb.ToByteArray().Length); //not exact order. + Assert.AreEqual(1001, copyb.Id); + Assert.AreEqual("Name", copyb.Name); + Assert.AreEqual(subb, copyb.TestB); + Assert.AreEqual(1, copyb.UnknownFields.FieldDictionary.Count); } - [Fact] + [Test] public void TestRestoreFromOtherType() { TestInteropPerson person = TestInteropPerson.CreateBuilder() @@ -219,19 +219,19 @@ namespace Google.ProtocolBuffers .SetExtension(UnittestExtrasFull.EmployeeId, TestInteropEmployeeId.CreateBuilder().SetNumber("123").Build()) .Build(); - Assert.True(person.IsInitialized); + Assert.IsTrue(person.IsInitialized); TestEmptyMessage temp = TestEmptyMessage.ParseFrom(person.ToByteArray()); - Assert.Equal(7, temp.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(7, temp.UnknownFields.FieldDictionary.Count); temp = temp.ToBuilder().Build(); - Assert.Equal(7, temp.UnknownFields.FieldDictionary.Count); + Assert.AreEqual(7, temp.UnknownFields.FieldDictionary.Count); ExtensionRegistry registry = ExtensionRegistry.CreateInstance(); UnittestExtrasFull.RegisterAllExtensions(registry); TestInteropPerson copy = TestInteropPerson.ParseFrom(temp.ToByteArray(), registry); - Assert.Equal(person, copy); - Assert.Equal(person.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(person, copy); + Assert.AreEqual(person.ToByteArray(), copy.ToByteArray()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 8acc1fb1..75a14499 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -1,7 +1,5 @@  - - Debug AnyCPU @@ -19,6 +17,8 @@ 3.5 + + true @@ -49,17 +49,28 @@ - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll + True + + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll + True + + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True - - ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll + True - - ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll + True + + @@ -90,6 +101,9 @@ + + + - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index 5f1a7ba3..11109223 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -1,7 +1,5 @@  - - Debug AnyCPU @@ -49,17 +47,28 @@ - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll + True + + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll + True + + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True - - ..\packages\xunit.assert.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll + True - - ..\packages\xunit.extensibility.core.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll + True + + @@ -100,11 +109,4 @@ --> - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs b/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs index e4f9acff..9c864618 100644 --- a/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs +++ b/csharp/src/ProtocolBuffersLite.Test/TestLiteByApi.cs @@ -35,66 +35,66 @@ #endregion using Google.ProtocolBuffers.TestProtos; -using Xunit; +using NUnit.Framework; namespace Google.ProtocolBuffers { public class TestLiteByApi { - [Fact] + [Test] public void TestAllTypesEquality() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; TestAllTypesLite copy = msg.ToBuilder().Build(); - Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); - Assert.True(msg.Equals(copy)); + Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsTrue(msg.Equals(copy)); msg = msg.ToBuilder().SetOptionalString("Hi").Build(); - Assert.NotEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.False(msg.Equals(copy)); + Assert.AreNotEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsFalse(msg.Equals(copy)); copy = copy.ToBuilder().SetOptionalString("Hi").Build(); - Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); - Assert.True(msg.Equals(copy)); + Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsTrue(msg.Equals(copy)); } - [Fact] + [Test] public void TestEqualityOnExtensions() { TestAllExtensionsLite msg = TestAllExtensionsLite.DefaultInstance; TestAllExtensionsLite copy = msg.ToBuilder().Build(); - Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); - Assert.True(msg.Equals(copy)); + Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsTrue(msg.Equals(copy)); msg = msg.ToBuilder().SetExtension(UnittestLite.OptionalStringExtensionLite, "Hi").Build(); - Assert.NotEqual(msg.GetHashCode(), copy.GetHashCode()); - Assert.False(msg.Equals(copy)); + Assert.AreNotEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsFalse(msg.Equals(copy)); copy = copy.ToBuilder().SetExtension(UnittestLite.OptionalStringExtensionLite, "Hi").Build(); - Assert.Equal(msg.GetHashCode(), copy.GetHashCode()); - Assert.True(msg.Equals(copy)); + Assert.AreEqual(msg.GetHashCode(), copy.GetHashCode()); + Assert.IsTrue(msg.Equals(copy)); } - [Fact] + [Test] public void TestAllTypesToString() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; TestAllTypesLite copy = msg.ToBuilder().Build(); - Assert.Equal(msg.ToString(), copy.ToString()); - Assert.Equal(0, msg.ToString().Length); + Assert.AreEqual(msg.ToString(), copy.ToString()); + Assert.AreEqual(0, msg.ToString().Length); msg = msg.ToBuilder().SetOptionalInt32(-1).Build(); - Assert.Equal("optional_int32: -1", msg.ToString().TrimEnd()); + Assert.AreEqual("optional_int32: -1", msg.ToString().TrimEnd()); msg = msg.ToBuilder().SetOptionalString("abc123").Build(); - Assert.Equal("optional_int32: -1\noptional_string: \"abc123\"", + Assert.AreEqual("optional_int32: -1\noptional_string: \"abc123\"", msg.ToString().Replace("\r", "").TrimEnd()); } - [Fact] + [Test] public void TestAllTypesDefaultedRoundTrip() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; - Assert.True(msg.IsInitialized); + Assert.IsTrue(msg.IsInitialized); TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } - [Fact] + [Test] public void TestAllTypesModifiedRoundTrip() { TestAllTypesLite msg = TestAllTypesLite.DefaultInstance; @@ -114,7 +114,7 @@ namespace Google.ProtocolBuffers .AddRepeatedGroup(TestAllTypesLite.Types.RepeatedGroup.CreateBuilder().SetA('A').Build()) ; TestAllTypesLite copy = TestAllTypesLite.CreateBuilder().MergeFrom(msg.ToByteArray()).Build(); - Assert.Equal(msg.ToByteArray(), copy.ToByteArray()); + Assert.AreEqual(msg.ToByteArray(), copy.ToByteArray()); } } } \ No newline at end of file diff --git a/csharp/src/ProtocolBuffersLite.Test/packages.config b/csharp/src/ProtocolBuffersLite.Test/packages.config index 6f1fb7f5..c7653992 100644 --- a/csharp/src/ProtocolBuffersLite.Test/packages.config +++ b/csharp/src/ProtocolBuffersLite.Test/packages.config @@ -1,9 +1,5 @@  - - - - - - + + \ No newline at end of file -- cgit v1.2.3 From 7149cee2825c013fe5376672572d3745dd5ad57e Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 11:23:35 -0700 Subject: remove TreatWarningsAsError setting to allow building in Monodevelop --- csharp/src/AddressBook/AddressBook.csproj | 2 -- csharp/src/ProtoBench/ProtoBench.csproj | 2 -- csharp/src/ProtoDump/ProtoDump.csproj | 2 -- csharp/src/ProtoMunge/ProtoMunge.csproj | 2 -- csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj | 2 -- csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj | 2 -- .../src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj | 2 -- 7 files changed, 14 deletions(-) (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/AddressBook/AddressBook.csproj b/csharp/src/AddressBook/AddressBook.csproj index 52b82a8f..f7e0d6be 100644 --- a/csharp/src/AddressBook/AddressBook.csproj +++ b/csharp/src/AddressBook/AddressBook.csproj @@ -24,7 +24,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -36,7 +35,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoBench/ProtoBench.csproj b/csharp/src/ProtoBench/ProtoBench.csproj index 280a54a9..beee3a71 100644 --- a/csharp/src/ProtoBench/ProtoBench.csproj +++ b/csharp/src/ProtoBench/ProtoBench.csproj @@ -23,7 +23,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -35,7 +34,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoDump/ProtoDump.csproj b/csharp/src/ProtoDump/ProtoDump.csproj index 506d316b..b7e6c1a3 100644 --- a/csharp/src/ProtoDump/ProtoDump.csproj +++ b/csharp/src/ProtoDump/ProtoDump.csproj @@ -25,7 +25,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -37,7 +36,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtoMunge/ProtoMunge.csproj b/csharp/src/ProtoMunge/ProtoMunge.csproj index 7be2b3f7..60c907b1 100644 --- a/csharp/src/ProtoMunge/ProtoMunge.csproj +++ b/csharp/src/ProtoMunge/ProtoMunge.csproj @@ -25,7 +25,6 @@ DEBUG;TRACE prompt 4 - true true Off @@ -37,7 +36,6 @@ TRACE prompt 4 - true true Off diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 545725e3..76bfcab3 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -29,7 +29,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -42,7 +41,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj index 75a14499..4d813f83 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLite.Test.csproj @@ -29,7 +29,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -42,7 +41,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false diff --git a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj index 11109223..c42ab93c 100644 --- a/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj +++ b/csharp/src/ProtocolBuffersLite.Test/ProtocolBuffersLiteMixed.Test.csproj @@ -27,7 +27,6 @@ DEBUG;TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false @@ -40,7 +39,6 @@ TRACE;$(EnvironmentFlavor);$(EnvironmentTemplate) prompt 4 - true true Off false -- cgit v1.2.3 From 3ccbf4b8936f415eed75c81d6228984516dfcbff Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 11:54:23 -0700 Subject: Fix newline assertion in TestJsonFormatted on mono --- csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs index da0d9eef..3d4d0320 100644 --- a/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs +++ b/csharp/src/ProtocolBuffers.Test/TestMimeMessageFormats.cs @@ -221,7 +221,8 @@ namespace Google.ProtocolBuffers Extensions.WriteTo(TestXmlMessage.CreateBuilder().SetText("a").SetNumber(1).Build(), new MessageFormatOptions() { FormattedOutput = true }, "application/json", ms); - Assert.AreEqual("{\r\n \"text\": \"a\",\r\n \"number\": 1\r\n}", Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); + string expected = string.Format("{{{0} \"text\": \"a\",{0} \"number\": 1{0}}}", System.Environment.NewLine); + Assert.AreEqual(expected, Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length)); } [Test] -- cgit v1.2.3 From a39dc6d5be2aac6e78ee5f96f9bf1a304a1c7644 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 20:57:41 -0700 Subject: rename FieldPresence to correct name --- .../ProtocolBuffers.Test.csproj | 2 +- .../TestProtos/FieldPresence.cs | 782 --------------------- .../TestProtos/FieldPresenceTest.cs | 782 +++++++++++++++++++++ 3 files changed, 783 insertions(+), 783 deletions(-) delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index 76bfcab3..dd28f34a 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -84,7 +84,7 @@ - + diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs deleted file mode 100644 index b4cb279d..00000000 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresence.cs +++ /dev/null @@ -1,782 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: protos/google/protobuf/field_presence_test.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos.FieldPresence { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class FieldPresenceTest { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static FieldPresenceTest() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CjBwcm90b3MvZ29vZ2xlL3Byb3RvYnVmL2ZpZWxkX3ByZXNlbmNlX3Rlc3Qu", - "cHJvdG8SL0dvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFByb3Rvcy5GaWVs", - "ZFByZXNlbmNlIvYCCgxUZXN0QWxsVHlwZXMSFgoOb3B0aW9uYWxfaW50MzIY", - "ASABKAUSFwoPb3B0aW9uYWxfc3RyaW5nGAIgASgJEhYKDm9wdGlvbmFsX2J5", - "dGVzGAMgASgMEmYKFG9wdGlvbmFsX25lc3RlZF9lbnVtGAQgASgOMkguR29v", - "Z2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zLkZpZWxkUHJlc2VuY2Uu", - "VGVzdEFsbFR5cGVzLk5lc3RlZEVudW0SbAoXb3B0aW9uYWxfbmVzdGVkX21l", - "c3NhZ2UYBSABKAsySy5Hb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90", - "b3MuRmllbGRQcmVzZW5jZS5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZRoe", - "Cg1OZXN0ZWRNZXNzYWdlEg0KBXZhbHVlGAEgASgFIicKCk5lc3RlZEVudW0S", - "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJiBnByb3RvMw==")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor = Descriptor.MessageTypes[0]; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor, - new string[] { "OptionalInt32", "OptionalString", "OptionalBytes", "OptionalNestedEnum", "OptionalNestedMessage", }); - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor = internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor.NestedTypes[0]; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor, - new string[] { "Value", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestAllTypes : pb::GeneratedMessage { - private TestAllTypes() { } - private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly(); - private static readonly string[] _testAllTypesFieldNames = new string[] { "optional_bytes", "optional_int32", "optional_nested_enum", "optional_nested_message", "optional_string" }; - private static readonly uint[] _testAllTypesFieldTags = new uint[] { 26, 8, 32, 42, 18 }; - public static TestAllTypes DefaultInstance { - get { return defaultInstance; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestAllTypes ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; } - } - - #region Nested types - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class Types { - public enum NestedEnum { - FOO = 0, - BAR = 1, - BAZ = 2, - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class NestedMessage : pb::GeneratedMessage { - private NestedMessage() { } - private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly(); - private static readonly string[] _nestedMessageFieldNames = new string[] { "value" }; - private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 }; - public static NestedMessage DefaultInstance { - get { return defaultInstance; } - } - - public override NestedMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override NestedMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; } - } - - public const int ValueFieldNumber = 1; - private int value_; - public int Value { - get { return value_; } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _nestedMessageFieldNames; - if (Value != 0) { - output.WriteInt32(1, field_names[0], Value); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (Value != 0) { - size += pb::CodedOutputStream.ComputeInt32Size(1, Value); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static NestedMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private NestedMessage MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(NestedMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(NestedMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private NestedMessage result; - - private NestedMessage PrepareBuilder() { - if (resultIsReadOnly) { - NestedMessage original = result; - result = new NestedMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override NestedMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Descriptor; } - } - - public override NestedMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public override NestedMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is NestedMessage) { - return MergeFrom((NestedMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(NestedMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.Value != 0) { - Value = other.Value; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_nestedMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _nestedMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - input.ReadInt32(ref result.value_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public int Value { - get { return result.Value; } - set { SetValue(value); } - } - public Builder SetValue(int value) { - PrepareBuilder(); - result.value_ = value; - return this; - } - public Builder ClearValue() { - PrepareBuilder(); - result.value_ = 0; - return this; - } - } - static NestedMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); - } - } - - } - #endregion - - public const int OptionalInt32FieldNumber = 1; - private int optionalInt32_; - public int OptionalInt32 { - get { return optionalInt32_; } - } - - public const int OptionalStringFieldNumber = 2; - private string optionalString_ = ""; - public string OptionalString { - get { return optionalString_; } - } - - public const int OptionalBytesFieldNumber = 3; - private pb::ByteString optionalBytes_ = pb::ByteString.Empty; - public pb::ByteString OptionalBytes { - get { return optionalBytes_; } - } - - public const int OptionalNestedEnumFieldNumber = 4; - private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return optionalNestedEnum_; } - } - - public const int OptionalNestedMessageFieldNumber = 5; - private bool hasOptionalNestedMessage; - private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage optionalNestedMessage_; - public bool HasOptionalNestedMessage { - get { return hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return optionalNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testAllTypesFieldNames; - if (OptionalInt32 != 0) { - output.WriteInt32(1, field_names[1], OptionalInt32); - } - if (OptionalString != "") { - output.WriteString(2, field_names[4], OptionalString); - } - if (OptionalBytes != pb::ByteString.Empty) { - output.WriteBytes(3, field_names[0], OptionalBytes); - } - if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - output.WriteEnum(4, field_names[2], (int) OptionalNestedEnum, OptionalNestedEnum); - } - if (hasOptionalNestedMessage) { - output.WriteMessage(5, field_names[3], OptionalNestedMessage); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (OptionalInt32 != 0) { - size += pb::CodedOutputStream.ComputeInt32Size(1, OptionalInt32); - } - if (OptionalString != "") { - size += pb::CodedOutputStream.ComputeStringSize(2, OptionalString); - } - if (OptionalBytes != pb::ByteString.Empty) { - size += pb::CodedOutputStream.ComputeBytesSize(3, OptionalBytes); - } - if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - size += pb::CodedOutputStream.ComputeEnumSize(4, (int) OptionalNestedEnum); - } - if (hasOptionalNestedMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(5, OptionalNestedMessage); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestAllTypes ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestAllTypes MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestAllTypes prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestAllTypes cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestAllTypes result; - - private TestAllTypes PrepareBuilder() { - if (resultIsReadOnly) { - TestAllTypes original = result; - result = new TestAllTypes(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestAllTypes MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Descriptor; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance; } - } - - public override TestAllTypes BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestAllTypes) { - return MergeFrom((TestAllTypes) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestAllTypes other) { - if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance) return this; - PrepareBuilder(); - if (other.OptionalInt32 != 0) { - OptionalInt32 = other.OptionalInt32; - } - if (other.OptionalString != "") { - OptionalString = other.OptionalString; - } - if (other.OptionalBytes != pb::ByteString.Empty) { - OptionalBytes = other.OptionalBytes; - } - if (other.OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - OptionalNestedEnum = other.OptionalNestedEnum; - } - if (other.HasOptionalNestedMessage) { - MergeOptionalNestedMessage(other.OptionalNestedMessage); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testAllTypesFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testAllTypesFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - input.ReadInt32(ref result.optionalInt32_); - break; - } - case 18: { - input.ReadString(ref result.optionalString_); - break; - } - case 26: { - input.ReadBytes(ref result.optionalBytes_); - break; - } - case 32: { - object unknown; - if(input.ReadEnum(ref result.optionalNestedEnum_, out unknown)) { - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(4, (ulong)(int)unknown); - } - break; - } - case 42: { - global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(); - if (result.hasOptionalNestedMessage) { - subBuilder.MergeFrom(OptionalNestedMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalNestedMessage = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public int OptionalInt32 { - get { return result.OptionalInt32; } - set { SetOptionalInt32(value); } - } - public Builder SetOptionalInt32(int value) { - PrepareBuilder(); - result.optionalInt32_ = value; - return this; - } - public Builder ClearOptionalInt32() { - PrepareBuilder(); - result.optionalInt32_ = 0; - return this; - } - - public string OptionalString { - get { return result.OptionalString; } - set { SetOptionalString(value); } - } - public Builder SetOptionalString(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.optionalString_ = value; - return this; - } - public Builder ClearOptionalString() { - PrepareBuilder(); - result.optionalString_ = ""; - return this; - } - - public pb::ByteString OptionalBytes { - get { return result.OptionalBytes; } - set { SetOptionalBytes(value); } - } - public Builder SetOptionalBytes(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.optionalBytes_ = value; - return this; - } - public Builder ClearOptionalBytes() { - PrepareBuilder(); - result.optionalBytes_ = pb::ByteString.Empty; - return this; - } - - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return result.OptionalNestedEnum; } - set { SetOptionalNestedEnum(value); } - } - public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.optionalNestedEnum_ = value; - return this; - } - public Builder ClearOptionalNestedEnum() { - PrepareBuilder(); - result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; - return this; - } - - public bool HasOptionalNestedMessage { - get { return result.hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return result.OptionalNestedMessage; } - set { SetOptionalNestedMessage(value); } - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = value; - return this; - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalNestedMessage && - result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) { - result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial(); - } else { - result.optionalNestedMessage_ = value; - } - result.hasOptionalNestedMessage = true; - return this; - } - public Builder ClearOptionalNestedMessage() { - PrepareBuilder(); - result.hasOptionalNestedMessage = false; - result.optionalNestedMessage_ = null; - return this; - } - } - static TestAllTypes() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs new file mode 100644 index 00000000..b4cb279d --- /dev/null +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs @@ -0,0 +1,782 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: protos/google/protobuf/field_presence_test.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.ProtocolBuffers; +using pbc = global::Google.ProtocolBuffers.Collections; +using pbd = global::Google.ProtocolBuffers.Descriptors; +using scg = global::System.Collections.Generic; +namespace Google.ProtocolBuffers.TestProtos.FieldPresence { + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static partial class FieldPresenceTest { + + #region Extension registration + public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { + } + #endregion + #region Static variables + internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; + #endregion + #region Descriptor + public static pbd::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbd::FileDescriptor descriptor; + + static FieldPresenceTest() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CjBwcm90b3MvZ29vZ2xlL3Byb3RvYnVmL2ZpZWxkX3ByZXNlbmNlX3Rlc3Qu", + "cHJvdG8SL0dvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFByb3Rvcy5GaWVs", + "ZFByZXNlbmNlIvYCCgxUZXN0QWxsVHlwZXMSFgoOb3B0aW9uYWxfaW50MzIY", + "ASABKAUSFwoPb3B0aW9uYWxfc3RyaW5nGAIgASgJEhYKDm9wdGlvbmFsX2J5", + "dGVzGAMgASgMEmYKFG9wdGlvbmFsX25lc3RlZF9lbnVtGAQgASgOMkguR29v", + "Z2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zLkZpZWxkUHJlc2VuY2Uu", + "VGVzdEFsbFR5cGVzLk5lc3RlZEVudW0SbAoXb3B0aW9uYWxfbmVzdGVkX21l", + "c3NhZ2UYBSABKAsySy5Hb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90", + "b3MuRmllbGRQcmVzZW5jZS5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZRoe", + "Cg1OZXN0ZWRNZXNzYWdlEg0KBXZhbHVlGAEgASgFIicKCk5lc3RlZEVudW0S", + "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJiBnByb3RvMw==")); + pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { + descriptor = root; + internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor = Descriptor.MessageTypes[0]; + internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor, + new string[] { "OptionalInt32", "OptionalString", "OptionalBytes", "OptionalNestedEnum", "OptionalNestedMessage", }); + internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor = internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor.NestedTypes[0]; + internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor, + new string[] { "Value", }); + pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); + RegisterAllExtensions(registry); + return registry; + }; + pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, + new pbd::FileDescriptor[] { + }, assigner); + } + #endregion + + } + #region Messages + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class TestAllTypes : pb::GeneratedMessage { + private TestAllTypes() { } + private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly(); + private static readonly string[] _testAllTypesFieldNames = new string[] { "optional_bytes", "optional_int32", "optional_nested_enum", "optional_nested_message", "optional_string" }; + private static readonly uint[] _testAllTypesFieldTags = new uint[] { 26, 8, 32, 42, 18 }; + public static TestAllTypes DefaultInstance { + get { return defaultInstance; } + } + + public override TestAllTypes DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override TestAllTypes ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; } + } + + #region Nested types + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static partial class Types { + public enum NestedEnum { + FOO = 0, + BAR = 1, + BAZ = 2, + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class NestedMessage : pb::GeneratedMessage { + private NestedMessage() { } + private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly(); + private static readonly string[] _nestedMessageFieldNames = new string[] { "value" }; + private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 }; + public static NestedMessage DefaultInstance { + get { return defaultInstance; } + } + + public override NestedMessage DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override NestedMessage ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; } + } + + public const int ValueFieldNumber = 1; + private int value_; + public int Value { + get { return value_; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _nestedMessageFieldNames; + if (Value != 0) { + output.WriteInt32(1, field_names[0], Value); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (Value != 0) { + size += pb::CodedOutputStream.ComputeInt32Size(1, Value); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static NestedMessage ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static NestedMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static NestedMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private NestedMessage MakeReadOnly() { + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(NestedMessage prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(NestedMessage cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private NestedMessage result; + + private NestedMessage PrepareBuilder() { + if (resultIsReadOnly) { + NestedMessage original = result; + result = new NestedMessage(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override NestedMessage MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Descriptor; } + } + + public override NestedMessage DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public override NestedMessage BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is NestedMessage) { + return MergeFrom((NestedMessage) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(NestedMessage other) { + if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) return this; + PrepareBuilder(); + if (other.Value != 0) { + Value = other.Value; + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_nestedMessageFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _nestedMessageFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + input.ReadInt32(ref result.value_); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public int Value { + get { return result.Value; } + set { SetValue(value); } + } + public Builder SetValue(int value) { + PrepareBuilder(); + result.value_ = value; + return this; + } + public Builder ClearValue() { + PrepareBuilder(); + result.value_ = 0; + return this; + } + } + static NestedMessage() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); + } + } + + } + #endregion + + public const int OptionalInt32FieldNumber = 1; + private int optionalInt32_; + public int OptionalInt32 { + get { return optionalInt32_; } + } + + public const int OptionalStringFieldNumber = 2; + private string optionalString_ = ""; + public string OptionalString { + get { return optionalString_; } + } + + public const int OptionalBytesFieldNumber = 3; + private pb::ByteString optionalBytes_ = pb::ByteString.Empty; + public pb::ByteString OptionalBytes { + get { return optionalBytes_; } + } + + public const int OptionalNestedEnumFieldNumber = 4; + private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; + public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { + get { return optionalNestedEnum_; } + } + + public const int OptionalNestedMessageFieldNumber = 5; + private bool hasOptionalNestedMessage; + private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage optionalNestedMessage_; + public bool HasOptionalNestedMessage { + get { return hasOptionalNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { + get { return optionalNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _testAllTypesFieldNames; + if (OptionalInt32 != 0) { + output.WriteInt32(1, field_names[1], OptionalInt32); + } + if (OptionalString != "") { + output.WriteString(2, field_names[4], OptionalString); + } + if (OptionalBytes != pb::ByteString.Empty) { + output.WriteBytes(3, field_names[0], OptionalBytes); + } + if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { + output.WriteEnum(4, field_names[2], (int) OptionalNestedEnum, OptionalNestedEnum); + } + if (hasOptionalNestedMessage) { + output.WriteMessage(5, field_names[3], OptionalNestedMessage); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (OptionalInt32 != 0) { + size += pb::CodedOutputStream.ComputeInt32Size(1, OptionalInt32); + } + if (OptionalString != "") { + size += pb::CodedOutputStream.ComputeStringSize(2, OptionalString); + } + if (OptionalBytes != pb::ByteString.Empty) { + size += pb::CodedOutputStream.ComputeBytesSize(3, OptionalBytes); + } + if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { + size += pb::CodedOutputStream.ComputeEnumSize(4, (int) OptionalNestedEnum); + } + if (hasOptionalNestedMessage) { + size += pb::CodedOutputStream.ComputeMessageSize(5, OptionalNestedMessage); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static TestAllTypes ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestAllTypes ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestAllTypes ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private TestAllTypes MakeReadOnly() { + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(TestAllTypes prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(TestAllTypes cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private TestAllTypes result; + + private TestAllTypes PrepareBuilder() { + if (resultIsReadOnly) { + TestAllTypes original = result; + result = new TestAllTypes(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override TestAllTypes MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Descriptor; } + } + + public override TestAllTypes DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance; } + } + + public override TestAllTypes BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is TestAllTypes) { + return MergeFrom((TestAllTypes) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(TestAllTypes other) { + if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance) return this; + PrepareBuilder(); + if (other.OptionalInt32 != 0) { + OptionalInt32 = other.OptionalInt32; + } + if (other.OptionalString != "") { + OptionalString = other.OptionalString; + } + if (other.OptionalBytes != pb::ByteString.Empty) { + OptionalBytes = other.OptionalBytes; + } + if (other.OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { + OptionalNestedEnum = other.OptionalNestedEnum; + } + if (other.HasOptionalNestedMessage) { + MergeOptionalNestedMessage(other.OptionalNestedMessage); + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_testAllTypesFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _testAllTypesFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + input.ReadInt32(ref result.optionalInt32_); + break; + } + case 18: { + input.ReadString(ref result.optionalString_); + break; + } + case 26: { + input.ReadBytes(ref result.optionalBytes_); + break; + } + case 32: { + object unknown; + if(input.ReadEnum(ref result.optionalNestedEnum_, out unknown)) { + } else if(unknown is int) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + unknownFields.MergeVarintField(4, (ulong)(int)unknown); + } + break; + } + case 42: { + global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(); + if (result.hasOptionalNestedMessage) { + subBuilder.MergeFrom(OptionalNestedMessage); + } + input.ReadMessage(subBuilder, extensionRegistry); + OptionalNestedMessage = subBuilder.BuildPartial(); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public int OptionalInt32 { + get { return result.OptionalInt32; } + set { SetOptionalInt32(value); } + } + public Builder SetOptionalInt32(int value) { + PrepareBuilder(); + result.optionalInt32_ = value; + return this; + } + public Builder ClearOptionalInt32() { + PrepareBuilder(); + result.optionalInt32_ = 0; + return this; + } + + public string OptionalString { + get { return result.OptionalString; } + set { SetOptionalString(value); } + } + public Builder SetOptionalString(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalString_ = value; + return this; + } + public Builder ClearOptionalString() { + PrepareBuilder(); + result.optionalString_ = ""; + return this; + } + + public pb::ByteString OptionalBytes { + get { return result.OptionalBytes; } + set { SetOptionalBytes(value); } + } + public Builder SetOptionalBytes(pb::ByteString value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalBytes_ = value; + return this; + } + public Builder ClearOptionalBytes() { + PrepareBuilder(); + result.optionalBytes_ = pb::ByteString.Empty; + return this; + } + + public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { + get { return result.OptionalNestedEnum; } + set { SetOptionalNestedEnum(value); } + } + public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum value) { + PrepareBuilder(); + result.optionalNestedEnum_ = value; + return this; + } + public Builder ClearOptionalNestedEnum() { + PrepareBuilder(); + result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; + return this; + } + + public bool HasOptionalNestedMessage { + get { return result.hasOptionalNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { + get { return result.OptionalNestedMessage; } + set { SetOptionalNestedMessage(value); } + } + public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOptionalNestedMessage = true; + result.optionalNestedMessage_ = value; + return this; + } + public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOptionalNestedMessage = true; + result.optionalNestedMessage_ = builderForValue.Build(); + return this; + } + public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOptionalNestedMessage && + result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) { + result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial(); + } else { + result.optionalNestedMessage_ = value; + } + result.hasOptionalNestedMessage = true; + return this; + } + public Builder ClearOptionalNestedMessage() { + PrepareBuilder(); + result.hasOptionalNestedMessage = false; + result.optionalNestedMessage_ = null; + return this; + } + } + static TestAllTypes() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); + } + } + + #endregion + +} + +#endregion Designer generated code -- cgit v1.2.3 From 385afba572b6541286976f463e6240f2ca45ea11 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 21:09:49 -0700 Subject: Regenerate some proto files after ClsCompliance has been dropped --- .../ProtocolBuffers.Test/TestProtos/GoogleSize.cs | 22 ---------------------- .../ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs | 22 ---------------------- .../TestProtos/UnittestExtrasFull.cs | 3 --- 3 files changed, 47 deletions(-) (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSize.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSize.cs index 06f2c0ca..92309e92 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSize.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSize.cs @@ -265,14 +265,12 @@ namespace Google.ProtocolBuffers.TestProtos { public const int Field5FieldNumber = 5; private pbc::PopsicleList field5_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] public scg::IList Field5List { get { return pbc::Lists.AsReadOnly(field5_); } } public int Field5Count { get { return field5_.Count; } } - [global::System.CLSCompliant(false)] public ulong GetField5(int index) { return field5_[index]; } @@ -899,30 +897,25 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - [global::System.CLSCompliant(false)] public pbc::IPopsicleList Field5List { get { return PrepareBuilder().field5_; } } public int Field5Count { get { return result.Field5Count; } } - [global::System.CLSCompliant(false)] public ulong GetField5(int index) { return result.GetField5(index); } - [global::System.CLSCompliant(false)] public Builder SetField5(int index, ulong value) { PrepareBuilder(); result.field5_[index] = value; return this; } - [global::System.CLSCompliant(false)] public Builder AddField5(ulong value) { PrepareBuilder(); result.field5_.Add(value); return this; } - [global::System.CLSCompliant(false)] public Builder AddRangeField5(scg::IEnumerable values) { PrepareBuilder(); result.field5_.Add(values); @@ -1683,7 +1676,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField21 { get { return hasField21; } } - [global::System.CLSCompliant(false)] public ulong Field21 { get { return field21_; } } @@ -1724,7 +1716,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField203 { get { return hasField203; } } - [global::System.CLSCompliant(false)] public uint Field203 { get { return field203_; } } @@ -1755,7 +1746,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField207 { get { return hasField207; } } - [global::System.CLSCompliant(false)] public ulong Field207 { get { return field207_; } } @@ -1766,7 +1756,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField300 { get { return hasField300; } } - [global::System.CLSCompliant(false)] public ulong Field300 { get { return field300_; } } @@ -2102,12 +2091,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField21 { get { return result.hasField21; } } - [global::System.CLSCompliant(false)] public ulong Field21 { get { return result.Field21; } set { SetField21(value); } } - [global::System.CLSCompliant(false)] public Builder SetField21(ulong value) { PrepareBuilder(); result.hasField21 = true; @@ -2184,12 +2171,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField203 { get { return result.hasField203; } } - [global::System.CLSCompliant(false)] public uint Field203 { get { return result.Field203; } set { SetField203(value); } } - [global::System.CLSCompliant(false)] public Builder SetField203(uint value) { PrepareBuilder(); result.hasField203 = true; @@ -2247,12 +2232,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField207 { get { return result.hasField207; } } - [global::System.CLSCompliant(false)] public ulong Field207 { get { return result.Field207; } set { SetField207(value); } } - [global::System.CLSCompliant(false)] public Builder SetField207(ulong value) { PrepareBuilder(); result.hasField207 = true; @@ -2269,12 +2252,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField300 { get { return result.hasField300; } } - [global::System.CLSCompliant(false)] public ulong Field300 { get { return result.Field300; } set { SetField300(value); } } - [global::System.CLSCompliant(false)] public Builder SetField300(ulong value) { PrepareBuilder(); result.hasField300 = true; @@ -2402,7 +2383,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField15 { get { return hasField15; } } - [global::System.CLSCompliant(false)] public ulong Field15 { get { return field15_; } } @@ -2738,12 +2718,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField15 { get { return result.hasField15; } } - [global::System.CLSCompliant(false)] public ulong Field15 { get { return result.Field15; } set { SetField15(value); } } - [global::System.CLSCompliant(false)] public Builder SetField15(ulong value) { PrepareBuilder(); result.hasField15 = true; diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs index 13e684a5..aa9b90f0 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/GoogleSpeed.cs @@ -267,14 +267,12 @@ namespace Google.ProtocolBuffers.TestProtos { public const int Field5FieldNumber = 5; private pbc::PopsicleList field5_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] public scg::IList Field5List { get { return pbc::Lists.AsReadOnly(field5_); } } public int Field5Count { get { return field5_.Count; } } - [global::System.CLSCompliant(false)] public ulong GetField5(int index) { return field5_[index]; } @@ -1540,30 +1538,25 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - [global::System.CLSCompliant(false)] public pbc::IPopsicleList Field5List { get { return PrepareBuilder().field5_; } } public int Field5Count { get { return result.Field5Count; } } - [global::System.CLSCompliant(false)] public ulong GetField5(int index) { return result.GetField5(index); } - [global::System.CLSCompliant(false)] public Builder SetField5(int index, ulong value) { PrepareBuilder(); result.field5_[index] = value; return this; } - [global::System.CLSCompliant(false)] public Builder AddField5(ulong value) { PrepareBuilder(); result.field5_.Add(value); return this; } - [global::System.CLSCompliant(false)] public Builder AddRangeField5(scg::IEnumerable values) { PrepareBuilder(); result.field5_.Add(values); @@ -2326,7 +2319,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField21 { get { return hasField21; } } - [global::System.CLSCompliant(false)] public ulong Field21 { get { return field21_; } } @@ -2367,7 +2359,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField203 { get { return hasField203; } } - [global::System.CLSCompliant(false)] public uint Field203 { get { return field203_; } } @@ -2398,7 +2389,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField207 { get { return hasField207; } } - [global::System.CLSCompliant(false)] public ulong Field207 { get { return field207_; } } @@ -2409,7 +2399,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField300 { get { return hasField300; } } - [global::System.CLSCompliant(false)] public ulong Field300 { get { return field300_; } } @@ -3099,12 +3088,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField21 { get { return result.hasField21; } } - [global::System.CLSCompliant(false)] public ulong Field21 { get { return result.Field21; } set { SetField21(value); } } - [global::System.CLSCompliant(false)] public Builder SetField21(ulong value) { PrepareBuilder(); result.hasField21 = true; @@ -3181,12 +3168,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField203 { get { return result.hasField203; } } - [global::System.CLSCompliant(false)] public uint Field203 { get { return result.Field203; } set { SetField203(value); } } - [global::System.CLSCompliant(false)] public Builder SetField203(uint value) { PrepareBuilder(); result.hasField203 = true; @@ -3244,12 +3229,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField207 { get { return result.hasField207; } } - [global::System.CLSCompliant(false)] public ulong Field207 { get { return result.Field207; } set { SetField207(value); } } - [global::System.CLSCompliant(false)] public Builder SetField207(ulong value) { PrepareBuilder(); result.hasField207 = true; @@ -3266,12 +3249,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField300 { get { return result.hasField300; } } - [global::System.CLSCompliant(false)] public ulong Field300 { get { return result.Field300; } set { SetField300(value); } } - [global::System.CLSCompliant(false)] public Builder SetField300(ulong value) { PrepareBuilder(); result.hasField300 = true; @@ -3403,7 +3384,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField15 { get { return hasField15; } } - [global::System.CLSCompliant(false)] public ulong Field15 { get { return field15_; } } @@ -4064,12 +4044,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasField15 { get { return result.hasField15; } } - [global::System.CLSCompliant(false)] public ulong Field15 { get { return result.Field15; } set { SetField15(value); } } - [global::System.CLSCompliant(false)] public Builder SetField15(ulong value) { PrepareBuilder(); result.hasField15 = true; diff --git a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasFull.cs b/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasFull.cs index 3eed99f1..827bedef 100644 --- a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasFull.cs +++ b/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasFull.cs @@ -420,7 +420,6 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasZip { get { return hasZip; } } - [global::System.CLSCompliant(false)] public uint Zip { get { return zip_; } } @@ -619,12 +618,10 @@ namespace Google.ProtocolBuffers.TestProtos { public bool HasZip { get { return result.hasZip; } } - [global::System.CLSCompliant(false)] public uint Zip { get { return result.Zip; } set { SetZip(value); } } - [global::System.CLSCompliant(false)] public Builder SetZip(uint value) { PrepareBuilder(); result.hasZip = true; -- cgit v1.2.3 From 766036f231afb3789292adedd3d1a3e41079b1ea Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 21:33:40 -0700 Subject: remove C# files not referenced in any project --- .../TestProtos/UnittestNoFieldPresence.cs | 4065 -------------------- .../TestProtos/UnittestPreserveUnknownEnum.cs | 1320 ------- .../TestProtos/UnittestPreserveUnknownEnum2.cs | 684 ---- .../TestProtos/UnittestExtrasXmltest.cs | 2277 ----------- .../TestProtos/UnittestIssues.cs | 3437 ----------------- 5 files changed, 11783 deletions(-) delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum.cs delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum2.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasXmltest.cs delete mode 100644 csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestIssues.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs deleted file mode 100644 index 654c2e50..00000000 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs +++ /dev/null @@ -1,4065 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/protobuf/unittest_no_field_presence.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class UnittestNoFieldPresence { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static UnittestNoFieldPresence() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CjBnb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rfbm9fZmllbGRfcHJlc2VuY2Uu", - "cHJvdG8SH3Byb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QaHmdvb2ds", - "ZS9wcm90b2J1Zi91bml0dGVzdC5wcm90byKaEQoMVGVzdEFsbFR5cGVzEhYK", - "Dm9wdGlvbmFsX2ludDMyGAEgASgFEhYKDm9wdGlvbmFsX2ludDY0GAIgASgD", - "EhcKD29wdGlvbmFsX3VpbnQzMhgDIAEoDRIXCg9vcHRpb25hbF91aW50NjQY", - "BCABKAQSFwoPb3B0aW9uYWxfc2ludDMyGAUgASgREhcKD29wdGlvbmFsX3Np", - "bnQ2NBgGIAEoEhIYChBvcHRpb25hbF9maXhlZDMyGAcgASgHEhgKEG9wdGlv", - "bmFsX2ZpeGVkNjQYCCABKAYSGQoRb3B0aW9uYWxfc2ZpeGVkMzIYCSABKA8S", - "GQoRb3B0aW9uYWxfc2ZpeGVkNjQYCiABKBASFgoOb3B0aW9uYWxfZmxvYXQY", - "CyABKAISFwoPb3B0aW9uYWxfZG91YmxlGAwgASgBEhUKDW9wdGlvbmFsX2Jv", - "b2wYDSABKAgSFwoPb3B0aW9uYWxfc3RyaW5nGA4gASgJEhYKDm9wdGlvbmFs", - "X2J5dGVzGA8gASgMElwKF29wdGlvbmFsX25lc3RlZF9tZXNzYWdlGBIgASgL", - "MjsucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0dGVzdC5UZXN0QWxsVHlw", - "ZXMuTmVzdGVkTWVzc2FnZRJRChhvcHRpb25hbF9mb3JlaWduX21lc3NhZ2UY", - "EyABKAsyLy5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0LkZvcmVp", - "Z25NZXNzYWdlEkAKF29wdGlvbmFsX3Byb3RvMl9tZXNzYWdlGBQgASgLMh8u", - "cHJvdG9idWZfdW5pdHRlc3QuVGVzdEFsbFR5cGVzElYKFG9wdGlvbmFsX25l", - "c3RlZF9lbnVtGBUgASgOMjgucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0", - "dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkRW51bRJLChVvcHRpb25hbF9mb3Jl", - "aWduX2VudW0YFiABKA4yLC5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0", - "ZXN0LkZvcmVpZ25FbnVtEiEKFW9wdGlvbmFsX3N0cmluZ19waWVjZRgYIAEo", - "CUICCAISGQoNb3B0aW9uYWxfY29yZBgZIAEoCUICCAESXgoVb3B0aW9uYWxf", - "bGF6eV9tZXNzYWdlGB4gASgLMjsucHJvdG8yX25vZmllbGRwcmVzZW5jZV91", - "bml0dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZUICKAESFgoOcmVw", - "ZWF0ZWRfaW50MzIYHyADKAUSFgoOcmVwZWF0ZWRfaW50NjQYICADKAMSFwoP", - "cmVwZWF0ZWRfdWludDMyGCEgAygNEhcKD3JlcGVhdGVkX3VpbnQ2NBgiIAMo", - "BBIXCg9yZXBlYXRlZF9zaW50MzIYIyADKBESFwoPcmVwZWF0ZWRfc2ludDY0", - "GCQgAygSEhgKEHJlcGVhdGVkX2ZpeGVkMzIYJSADKAcSGAoQcmVwZWF0ZWRf", - "Zml4ZWQ2NBgmIAMoBhIZChFyZXBlYXRlZF9zZml4ZWQzMhgnIAMoDxIZChFy", - "ZXBlYXRlZF9zZml4ZWQ2NBgoIAMoEBIWCg5yZXBlYXRlZF9mbG9hdBgpIAMo", - "AhIXCg9yZXBlYXRlZF9kb3VibGUYKiADKAESFQoNcmVwZWF0ZWRfYm9vbBgr", - "IAMoCBIXCg9yZXBlYXRlZF9zdHJpbmcYLCADKAkSFgoOcmVwZWF0ZWRfYnl0", - "ZXMYLSADKAwSXAoXcmVwZWF0ZWRfbmVzdGVkX21lc3NhZ2UYMCADKAsyOy5w", - "cm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0LlRlc3RBbGxUeXBlcy5O", - "ZXN0ZWRNZXNzYWdlElEKGHJlcGVhdGVkX2ZvcmVpZ25fbWVzc2FnZRgxIAMo", - "CzIvLnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QuRm9yZWlnbk1l", - "c3NhZ2USQAoXcmVwZWF0ZWRfcHJvdG8yX21lc3NhZ2UYMiADKAsyHy5wcm90", - "b2J1Zl91bml0dGVzdC5UZXN0QWxsVHlwZXMSVgoUcmVwZWF0ZWRfbmVzdGVk", - "X2VudW0YMyADKA4yOC5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0", - "LlRlc3RBbGxUeXBlcy5OZXN0ZWRFbnVtEksKFXJlcGVhdGVkX2ZvcmVpZ25f", - "ZW51bRg0IAMoDjIsLnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3Qu", - "Rm9yZWlnbkVudW0SIQoVcmVwZWF0ZWRfc3RyaW5nX3BpZWNlGDYgAygJQgII", - "AhIZCg1yZXBlYXRlZF9jb3JkGDcgAygJQgIIARJeChVyZXBlYXRlZF9sYXp5", - "X21lc3NhZ2UYOSADKAsyOy5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0", - "ZXN0LlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlQgIoARIWCgxvbmVvZl91", - "aW50MzIYbyABKA1IABJbChRvbmVvZl9uZXN0ZWRfbWVzc2FnZRhwIAEoCzI7", - "LnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QuVGVzdEFsbFR5cGVz", - "Lk5lc3RlZE1lc3NhZ2VIABIWCgxvbmVvZl9zdHJpbmcYcSABKAlIABJOCgpv", - "bmVvZl9lbnVtGHIgASgOMjgucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0", - "dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkRW51bUgAGhsKDU5lc3RlZE1lc3Nh", - "Z2USCgoCYmIYASABKAUiJwoKTmVzdGVkRW51bRIHCgNGT08QABIHCgNCQVIQ", - "ARIHCgNCQVoQAkINCgtvbmVvZl9maWVsZCJFChJUZXN0UHJvdG8yUmVxdWly", - "ZWQSLwoGcHJvdG8yGAEgASgLMh8ucHJvdG9idWZfdW5pdHRlc3QuVGVzdFJl", - "cXVpcmVkIhsKDkZvcmVpZ25NZXNzYWdlEgkKAWMYASABKAUqQAoLRm9yZWln", - "bkVudW0SDwoLRk9SRUlHTl9GT08QABIPCgtGT1JFSUdOX0JBUhABEg8KC0ZP", - "UkVJR05fQkFaEAJCJKoCIUdvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFBy", - "b3Rvc2IGcHJvdG8z")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor = Descriptor.MessageTypes[0]; - internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor, - new string[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalProto2Message", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalStringPiece", "OptionalCord", "OptionalLazyMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedProto2Message", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedStringPiece", "RepeatedCord", "RepeatedLazyMessage", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofEnum", }); - internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor = internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor.NestedTypes[0]; - internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor, - new string[] { "Bb", }); - internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor = Descriptor.MessageTypes[1]; - internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor, - new string[] { "Proto2", }); - internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor = Descriptor.MessageTypes[2]; - internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor, - new string[] { "C", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - global::Google.ProtocolBuffers.TestProtos.Unittest.RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - global::Google.ProtocolBuffers.TestProtos.Unittest.Descriptor, - }, assigner); - } - #endregion - - } - #region Enums - public enum ForeignEnum { - FOREIGN_FOO = 0, - FOREIGN_BAR = 1, - FOREIGN_BAZ = 2, - } - - #endregion - - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestAllTypes : pb::GeneratedMessage { - private TestAllTypes() { } - private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly(); - private static readonly string[] _testAllTypesFieldNames = new string[] { "oneof_enum", "oneof_nested_message", "oneof_string", "oneof_uint32", "optional_bool", "optional_bytes", "optional_cord", "optional_double", "optional_fixed32", "optional_fixed64", "optional_float", "optional_foreign_enum", "optional_foreign_message", "optional_int32", "optional_int64", "optional_lazy_message", "optional_nested_enum", "optional_nested_message", "optional_proto2_message", "optional_sfixed32", "optional_sfixed64", "optional_sint32", "optional_sint64", "optional_string", "optional_string_piece", "optional_uint32", "optional_uint64", "repeated_bool", "repeated_bytes", "repeated_cord", "repeated_double", "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_foreign_enum", "repeated_foreign_message", "repeated_int32", "repeated_int64", "repeated_lazy_message", "repeated_nested_enum", "repeated_nested_message", "repeated_proto2_message", "repeated_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_string_piece", "repeated_uint32", "repeated_uint64" }; - private static readonly uint[] _testAllTypesFieldTags = new uint[] { 912, 898, 906, 888, 104, 122, 202, 97, 61, 65, 93, 176, 154, 8, 16, 242, 168, 146, 162, 77, 81, 40, 48, 114, 194, 24, 32, 344, 362, 442, 337, 301, 305, 333, 416, 394, 248, 256, 458, 408, 386, 402, 317, 321, 280, 288, 354, 434, 264, 272 }; - public static TestAllTypes DefaultInstance { - get { return defaultInstance; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestAllTypes ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable; } - } - - #region Nested types - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class Types { - public enum NestedEnum { - FOO = 0, - BAR = 1, - BAZ = 2, - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class NestedMessage : pb::GeneratedMessage { - private NestedMessage() { } - private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly(); - private static readonly string[] _nestedMessageFieldNames = new string[] { "bb" }; - private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 }; - public static NestedMessage DefaultInstance { - get { return defaultInstance; } - } - - public override NestedMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override NestedMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; } - } - - public const int BbFieldNumber = 1; - private bool hasBb; - private int bb_; - public bool HasBb { - get { return hasBb; } - } - public int Bb { - get { return bb_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _nestedMessageFieldNames; - if (hasBb) { - output.WriteInt32(1, field_names[0], Bb); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasBb) { - size += pb::CodedOutputStream.ComputeInt32Size(1, Bb); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static NestedMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private NestedMessage MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(NestedMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(NestedMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private NestedMessage result; - - private NestedMessage PrepareBuilder() { - if (resultIsReadOnly) { - NestedMessage original = result; - result = new NestedMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override NestedMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Descriptor; } - } - - public override NestedMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public override NestedMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is NestedMessage) { - return MergeFrom((NestedMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(NestedMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasBb) { - Bb = other.Bb; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_nestedMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _nestedMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasBb = input.ReadInt32(ref result.bb_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasBb { - get { return result.hasBb; } - } - public int Bb { - get { return result.Bb; } - set { SetBb(value); } - } - public Builder SetBb(int value) { - PrepareBuilder(); - result.hasBb = true; - result.bb_ = value; - return this; - } - public Builder ClearBb() { - PrepareBuilder(); - result.hasBb = false; - result.bb_ = 0; - return this; - } - } - static NestedMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.Descriptor, null); - } - } - - } - #endregion - - public const int OptionalInt32FieldNumber = 1; - private bool hasOptionalInt32; - private int optionalInt32_; - public bool HasOptionalInt32 { - get { return hasOptionalInt32; } - } - public int OptionalInt32 { - get { return optionalInt32_; } - } - - public const int OptionalInt64FieldNumber = 2; - private bool hasOptionalInt64; - private long optionalInt64_; - public bool HasOptionalInt64 { - get { return hasOptionalInt64; } - } - public long OptionalInt64 { - get { return optionalInt64_; } - } - - public const int OptionalUint32FieldNumber = 3; - private bool hasOptionalUint32; - private uint optionalUint32_; - public bool HasOptionalUint32 { - get { return hasOptionalUint32; } - } - [global::System.CLSCompliant(false)] - public uint OptionalUint32 { - get { return optionalUint32_; } - } - - public const int OptionalUint64FieldNumber = 4; - private bool hasOptionalUint64; - private ulong optionalUint64_; - public bool HasOptionalUint64 { - get { return hasOptionalUint64; } - } - [global::System.CLSCompliant(false)] - public ulong OptionalUint64 { - get { return optionalUint64_; } - } - - public const int OptionalSint32FieldNumber = 5; - private bool hasOptionalSint32; - private int optionalSint32_; - public bool HasOptionalSint32 { - get { return hasOptionalSint32; } - } - public int OptionalSint32 { - get { return optionalSint32_; } - } - - public const int OptionalSint64FieldNumber = 6; - private bool hasOptionalSint64; - private long optionalSint64_; - public bool HasOptionalSint64 { - get { return hasOptionalSint64; } - } - public long OptionalSint64 { - get { return optionalSint64_; } - } - - public const int OptionalFixed32FieldNumber = 7; - private bool hasOptionalFixed32; - private uint optionalFixed32_; - public bool HasOptionalFixed32 { - get { return hasOptionalFixed32; } - } - [global::System.CLSCompliant(false)] - public uint OptionalFixed32 { - get { return optionalFixed32_; } - } - - public const int OptionalFixed64FieldNumber = 8; - private bool hasOptionalFixed64; - private ulong optionalFixed64_; - public bool HasOptionalFixed64 { - get { return hasOptionalFixed64; } - } - [global::System.CLSCompliant(false)] - public ulong OptionalFixed64 { - get { return optionalFixed64_; } - } - - public const int OptionalSfixed32FieldNumber = 9; - private bool hasOptionalSfixed32; - private int optionalSfixed32_; - public bool HasOptionalSfixed32 { - get { return hasOptionalSfixed32; } - } - public int OptionalSfixed32 { - get { return optionalSfixed32_; } - } - - public const int OptionalSfixed64FieldNumber = 10; - private bool hasOptionalSfixed64; - private long optionalSfixed64_; - public bool HasOptionalSfixed64 { - get { return hasOptionalSfixed64; } - } - public long OptionalSfixed64 { - get { return optionalSfixed64_; } - } - - public const int OptionalFloatFieldNumber = 11; - private bool hasOptionalFloat; - private float optionalFloat_; - public bool HasOptionalFloat { - get { return hasOptionalFloat; } - } - public float OptionalFloat { - get { return optionalFloat_; } - } - - public const int OptionalDoubleFieldNumber = 12; - private bool hasOptionalDouble; - private double optionalDouble_; - public bool HasOptionalDouble { - get { return hasOptionalDouble; } - } - public double OptionalDouble { - get { return optionalDouble_; } - } - - public const int OptionalBoolFieldNumber = 13; - private bool hasOptionalBool; - private bool optionalBool_; - public bool HasOptionalBool { - get { return hasOptionalBool; } - } - public bool OptionalBool { - get { return optionalBool_; } - } - - public const int OptionalStringFieldNumber = 14; - private bool hasOptionalString; - private string optionalString_ = ""; - public bool HasOptionalString { - get { return hasOptionalString; } - } - public string OptionalString { - get { return optionalString_; } - } - - public const int OptionalBytesFieldNumber = 15; - private bool hasOptionalBytes; - private pb::ByteString optionalBytes_ = pb::ByteString.Empty; - public bool HasOptionalBytes { - get { return hasOptionalBytes; } - } - public pb::ByteString OptionalBytes { - get { return optionalBytes_; } - } - - public const int OptionalNestedMessageFieldNumber = 18; - private bool hasOptionalNestedMessage; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage optionalNestedMessage_; - public bool HasOptionalNestedMessage { - get { return hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return optionalNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public const int OptionalForeignMessageFieldNumber = 19; - private bool hasOptionalForeignMessage; - private global::Google.ProtocolBuffers.TestProtos.ForeignMessage optionalForeignMessage_; - public bool HasOptionalForeignMessage { - get { return hasOptionalForeignMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignMessage OptionalForeignMessage { - get { return optionalForeignMessage_ ?? global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance; } - } - - public const int OptionalProto2MessageFieldNumber = 20; - private bool hasOptionalProto2Message; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes optionalProto2Message_; - public bool HasOptionalProto2Message { - get { return hasOptionalProto2Message; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes OptionalProto2Message { - get { return optionalProto2Message_ ?? global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance; } - } - - public const int OptionalNestedEnumFieldNumber = 21; - private bool hasOptionalNestedEnum; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO; - public bool HasOptionalNestedEnum { - get { return hasOptionalNestedEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return optionalNestedEnum_; } - } - - public const int OptionalForeignEnumFieldNumber = 22; - private bool hasOptionalForeignEnum; - private global::Google.ProtocolBuffers.TestProtos.ForeignEnum optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO; - public bool HasOptionalForeignEnum { - get { return hasOptionalForeignEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignEnum OptionalForeignEnum { - get { return optionalForeignEnum_; } - } - - public const int OptionalStringPieceFieldNumber = 24; - private bool hasOptionalStringPiece; - private string optionalStringPiece_ = ""; - public bool HasOptionalStringPiece { - get { return hasOptionalStringPiece; } - } - public string OptionalStringPiece { - get { return optionalStringPiece_; } - } - - public const int OptionalCordFieldNumber = 25; - private bool hasOptionalCord; - private string optionalCord_ = ""; - public bool HasOptionalCord { - get { return hasOptionalCord; } - } - public string OptionalCord { - get { return optionalCord_; } - } - - public const int OptionalLazyMessageFieldNumber = 30; - private bool hasOptionalLazyMessage; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage optionalLazyMessage_; - public bool HasOptionalLazyMessage { - get { return hasOptionalLazyMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalLazyMessage { - get { return optionalLazyMessage_ ?? global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public const int RepeatedInt32FieldNumber = 31; - private pbc::PopsicleList repeatedInt32_ = new pbc::PopsicleList(); - public scg::IList RepeatedInt32List { - get { return pbc::Lists.AsReadOnly(repeatedInt32_); } - } - public int RepeatedInt32Count { - get { return repeatedInt32_.Count; } - } - public int GetRepeatedInt32(int index) { - return repeatedInt32_[index]; - } - - public const int RepeatedInt64FieldNumber = 32; - private pbc::PopsicleList repeatedInt64_ = new pbc::PopsicleList(); - public scg::IList RepeatedInt64List { - get { return pbc::Lists.AsReadOnly(repeatedInt64_); } - } - public int RepeatedInt64Count { - get { return repeatedInt64_.Count; } - } - public long GetRepeatedInt64(int index) { - return repeatedInt64_[index]; - } - - public const int RepeatedUint32FieldNumber = 33; - private pbc::PopsicleList repeatedUint32_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] - public scg::IList RepeatedUint32List { - get { return pbc::Lists.AsReadOnly(repeatedUint32_); } - } - public int RepeatedUint32Count { - get { return repeatedUint32_.Count; } - } - [global::System.CLSCompliant(false)] - public uint GetRepeatedUint32(int index) { - return repeatedUint32_[index]; - } - - public const int RepeatedUint64FieldNumber = 34; - private pbc::PopsicleList repeatedUint64_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] - public scg::IList RepeatedUint64List { - get { return pbc::Lists.AsReadOnly(repeatedUint64_); } - } - public int RepeatedUint64Count { - get { return repeatedUint64_.Count; } - } - [global::System.CLSCompliant(false)] - public ulong GetRepeatedUint64(int index) { - return repeatedUint64_[index]; - } - - public const int RepeatedSint32FieldNumber = 35; - private pbc::PopsicleList repeatedSint32_ = new pbc::PopsicleList(); - public scg::IList RepeatedSint32List { - get { return pbc::Lists.AsReadOnly(repeatedSint32_); } - } - public int RepeatedSint32Count { - get { return repeatedSint32_.Count; } - } - public int GetRepeatedSint32(int index) { - return repeatedSint32_[index]; - } - - public const int RepeatedSint64FieldNumber = 36; - private pbc::PopsicleList repeatedSint64_ = new pbc::PopsicleList(); - public scg::IList RepeatedSint64List { - get { return pbc::Lists.AsReadOnly(repeatedSint64_); } - } - public int RepeatedSint64Count { - get { return repeatedSint64_.Count; } - } - public long GetRepeatedSint64(int index) { - return repeatedSint64_[index]; - } - - public const int RepeatedFixed32FieldNumber = 37; - private pbc::PopsicleList repeatedFixed32_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] - public scg::IList RepeatedFixed32List { - get { return pbc::Lists.AsReadOnly(repeatedFixed32_); } - } - public int RepeatedFixed32Count { - get { return repeatedFixed32_.Count; } - } - [global::System.CLSCompliant(false)] - public uint GetRepeatedFixed32(int index) { - return repeatedFixed32_[index]; - } - - public const int RepeatedFixed64FieldNumber = 38; - private pbc::PopsicleList repeatedFixed64_ = new pbc::PopsicleList(); - [global::System.CLSCompliant(false)] - public scg::IList RepeatedFixed64List { - get { return pbc::Lists.AsReadOnly(repeatedFixed64_); } - } - public int RepeatedFixed64Count { - get { return repeatedFixed64_.Count; } - } - [global::System.CLSCompliant(false)] - public ulong GetRepeatedFixed64(int index) { - return repeatedFixed64_[index]; - } - - public const int RepeatedSfixed32FieldNumber = 39; - private pbc::PopsicleList repeatedSfixed32_ = new pbc::PopsicleList(); - public scg::IList RepeatedSfixed32List { - get { return pbc::Lists.AsReadOnly(repeatedSfixed32_); } - } - public int RepeatedSfixed32Count { - get { return repeatedSfixed32_.Count; } - } - public int GetRepeatedSfixed32(int index) { - return repeatedSfixed32_[index]; - } - - public const int RepeatedSfixed64FieldNumber = 40; - private pbc::PopsicleList repeatedSfixed64_ = new pbc::PopsicleList(); - public scg::IList RepeatedSfixed64List { - get { return pbc::Lists.AsReadOnly(repeatedSfixed64_); } - } - public int RepeatedSfixed64Count { - get { return repeatedSfixed64_.Count; } - } - public long GetRepeatedSfixed64(int index) { - return repeatedSfixed64_[index]; - } - - public const int RepeatedFloatFieldNumber = 41; - private pbc::PopsicleList repeatedFloat_ = new pbc::PopsicleList(); - public scg::IList RepeatedFloatList { - get { return pbc::Lists.AsReadOnly(repeatedFloat_); } - } - public int RepeatedFloatCount { - get { return repeatedFloat_.Count; } - } - public float GetRepeatedFloat(int index) { - return repeatedFloat_[index]; - } - - public const int RepeatedDoubleFieldNumber = 42; - private pbc::PopsicleList repeatedDouble_ = new pbc::PopsicleList(); - public scg::IList RepeatedDoubleList { - get { return pbc::Lists.AsReadOnly(repeatedDouble_); } - } - public int RepeatedDoubleCount { - get { return repeatedDouble_.Count; } - } - public double GetRepeatedDouble(int index) { - return repeatedDouble_[index]; - } - - public const int RepeatedBoolFieldNumber = 43; - private pbc::PopsicleList repeatedBool_ = new pbc::PopsicleList(); - public scg::IList RepeatedBoolList { - get { return pbc::Lists.AsReadOnly(repeatedBool_); } - } - public int RepeatedBoolCount { - get { return repeatedBool_.Count; } - } - public bool GetRepeatedBool(int index) { - return repeatedBool_[index]; - } - - public const int RepeatedStringFieldNumber = 44; - private pbc::PopsicleList repeatedString_ = new pbc::PopsicleList(); - public scg::IList RepeatedStringList { - get { return pbc::Lists.AsReadOnly(repeatedString_); } - } - public int RepeatedStringCount { - get { return repeatedString_.Count; } - } - public string GetRepeatedString(int index) { - return repeatedString_[index]; - } - - public const int RepeatedBytesFieldNumber = 45; - private pbc::PopsicleList repeatedBytes_ = new pbc::PopsicleList(); - public scg::IList RepeatedBytesList { - get { return pbc::Lists.AsReadOnly(repeatedBytes_); } - } - public int RepeatedBytesCount { - get { return repeatedBytes_.Count; } - } - public pb::ByteString GetRepeatedBytes(int index) { - return repeatedBytes_[index]; - } - - public const int RepeatedNestedMessageFieldNumber = 48; - private pbc::PopsicleList repeatedNestedMessage_ = new pbc::PopsicleList(); - public scg::IList RepeatedNestedMessageList { - get { return repeatedNestedMessage_; } - } - public int RepeatedNestedMessageCount { - get { return repeatedNestedMessage_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) { - return repeatedNestedMessage_[index]; - } - - public const int RepeatedForeignMessageFieldNumber = 49; - private pbc::PopsicleList repeatedForeignMessage_ = new pbc::PopsicleList(); - public scg::IList RepeatedForeignMessageList { - get { return repeatedForeignMessage_; } - } - public int RepeatedForeignMessageCount { - get { return repeatedForeignMessage_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedForeignMessage(int index) { - return repeatedForeignMessage_[index]; - } - - public const int RepeatedProto2MessageFieldNumber = 50; - private pbc::PopsicleList repeatedProto2Message_ = new pbc::PopsicleList(); - public scg::IList RepeatedProto2MessageList { - get { return repeatedProto2Message_; } - } - public int RepeatedProto2MessageCount { - get { return repeatedProto2Message_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetRepeatedProto2Message(int index) { - return repeatedProto2Message_[index]; - } - - public const int RepeatedNestedEnumFieldNumber = 51; - private pbc::PopsicleList repeatedNestedEnum_ = new pbc::PopsicleList(); - public scg::IList RepeatedNestedEnumList { - get { return pbc::Lists.AsReadOnly(repeatedNestedEnum_); } - } - public int RepeatedNestedEnumCount { - get { return repeatedNestedEnum_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) { - return repeatedNestedEnum_[index]; - } - - public const int RepeatedForeignEnumFieldNumber = 52; - private pbc::PopsicleList repeatedForeignEnum_ = new pbc::PopsicleList(); - public scg::IList RepeatedForeignEnumList { - get { return pbc::Lists.AsReadOnly(repeatedForeignEnum_); } - } - public int RepeatedForeignEnumCount { - get { return repeatedForeignEnum_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedForeignEnum(int index) { - return repeatedForeignEnum_[index]; - } - - public const int RepeatedStringPieceFieldNumber = 54; - private pbc::PopsicleList repeatedStringPiece_ = new pbc::PopsicleList(); - public scg::IList RepeatedStringPieceList { - get { return pbc::Lists.AsReadOnly(repeatedStringPiece_); } - } - public int RepeatedStringPieceCount { - get { return repeatedStringPiece_.Count; } - } - public string GetRepeatedStringPiece(int index) { - return repeatedStringPiece_[index]; - } - - public const int RepeatedCordFieldNumber = 55; - private pbc::PopsicleList repeatedCord_ = new pbc::PopsicleList(); - public scg::IList RepeatedCordList { - get { return pbc::Lists.AsReadOnly(repeatedCord_); } - } - public int RepeatedCordCount { - get { return repeatedCord_.Count; } - } - public string GetRepeatedCord(int index) { - return repeatedCord_[index]; - } - - public const int RepeatedLazyMessageFieldNumber = 57; - private pbc::PopsicleList repeatedLazyMessage_ = new pbc::PopsicleList(); - public scg::IList RepeatedLazyMessageList { - get { return repeatedLazyMessage_; } - } - public int RepeatedLazyMessageCount { - get { return repeatedLazyMessage_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedLazyMessage(int index) { - return repeatedLazyMessage_[index]; - } - - public const int OneofUint32FieldNumber = 111; - private bool hasOneofUint32; - private uint oneofUint32_; - public bool HasOneofUint32 { - get { return hasOneofUint32; } - } - [global::System.CLSCompliant(false)] - public uint OneofUint32 { - get { return oneofUint32_; } - } - - public const int OneofNestedMessageFieldNumber = 112; - private bool hasOneofNestedMessage; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage oneofNestedMessage_; - public bool HasOneofNestedMessage { - get { return hasOneofNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OneofNestedMessage { - get { return oneofNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public const int OneofStringFieldNumber = 113; - private bool hasOneofString; - private string oneofString_ = ""; - public bool HasOneofString { - get { return hasOneofString; } - } - public string OneofString { - get { return oneofString_; } - } - - public const int OneofEnumFieldNumber = 114; - private bool hasOneofEnum; - private global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum oneofEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO; - public bool HasOneofEnum { - get { return hasOneofEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OneofEnum { - get { return oneofEnum_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testAllTypesFieldNames; - if (hasOptionalInt32) { - output.WriteInt32(1, field_names[13], OptionalInt32); - } - if (hasOptionalInt64) { - output.WriteInt64(2, field_names[14], OptionalInt64); - } - if (hasOptionalUint32) { - output.WriteUInt32(3, field_names[25], OptionalUint32); - } - if (hasOptionalUint64) { - output.WriteUInt64(4, field_names[26], OptionalUint64); - } - if (hasOptionalSint32) { - output.WriteSInt32(5, field_names[21], OptionalSint32); - } - if (hasOptionalSint64) { - output.WriteSInt64(6, field_names[22], OptionalSint64); - } - if (hasOptionalFixed32) { - output.WriteFixed32(7, field_names[8], OptionalFixed32); - } - if (hasOptionalFixed64) { - output.WriteFixed64(8, field_names[9], OptionalFixed64); - } - if (hasOptionalSfixed32) { - output.WriteSFixed32(9, field_names[19], OptionalSfixed32); - } - if (hasOptionalSfixed64) { - output.WriteSFixed64(10, field_names[20], OptionalSfixed64); - } - if (hasOptionalFloat) { - output.WriteFloat(11, field_names[10], OptionalFloat); - } - if (hasOptionalDouble) { - output.WriteDouble(12, field_names[7], OptionalDouble); - } - if (hasOptionalBool) { - output.WriteBool(13, field_names[4], OptionalBool); - } - if (hasOptionalString) { - output.WriteString(14, field_names[23], OptionalString); - } - if (hasOptionalBytes) { - output.WriteBytes(15, field_names[5], OptionalBytes); - } - if (hasOptionalNestedMessage) { - output.WriteMessage(18, field_names[17], OptionalNestedMessage); - } - if (hasOptionalForeignMessage) { - output.WriteMessage(19, field_names[12], OptionalForeignMessage); - } - if (hasOptionalProto2Message) { - output.WriteMessage(20, field_names[18], OptionalProto2Message); - } - if (hasOptionalNestedEnum) { - output.WriteEnum(21, field_names[16], (int) OptionalNestedEnum, OptionalNestedEnum); - } - if (hasOptionalForeignEnum) { - output.WriteEnum(22, field_names[11], (int) OptionalForeignEnum, OptionalForeignEnum); - } - if (hasOptionalStringPiece) { - output.WriteString(24, field_names[24], OptionalStringPiece); - } - if (hasOptionalCord) { - output.WriteString(25, field_names[6], OptionalCord); - } - if (hasOptionalLazyMessage) { - output.WriteMessage(30, field_names[15], OptionalLazyMessage); - } - if (repeatedInt32_.Count > 0) { - output.WriteInt32Array(31, field_names[36], repeatedInt32_); - } - if (repeatedInt64_.Count > 0) { - output.WriteInt64Array(32, field_names[37], repeatedInt64_); - } - if (repeatedUint32_.Count > 0) { - output.WriteUInt32Array(33, field_names[48], repeatedUint32_); - } - if (repeatedUint64_.Count > 0) { - output.WriteUInt64Array(34, field_names[49], repeatedUint64_); - } - if (repeatedSint32_.Count > 0) { - output.WriteSInt32Array(35, field_names[44], repeatedSint32_); - } - if (repeatedSint64_.Count > 0) { - output.WriteSInt64Array(36, field_names[45], repeatedSint64_); - } - if (repeatedFixed32_.Count > 0) { - output.WriteFixed32Array(37, field_names[31], repeatedFixed32_); - } - if (repeatedFixed64_.Count > 0) { - output.WriteFixed64Array(38, field_names[32], repeatedFixed64_); - } - if (repeatedSfixed32_.Count > 0) { - output.WriteSFixed32Array(39, field_names[42], repeatedSfixed32_); - } - if (repeatedSfixed64_.Count > 0) { - output.WriteSFixed64Array(40, field_names[43], repeatedSfixed64_); - } - if (repeatedFloat_.Count > 0) { - output.WriteFloatArray(41, field_names[33], repeatedFloat_); - } - if (repeatedDouble_.Count > 0) { - output.WriteDoubleArray(42, field_names[30], repeatedDouble_); - } - if (repeatedBool_.Count > 0) { - output.WriteBoolArray(43, field_names[27], repeatedBool_); - } - if (repeatedString_.Count > 0) { - output.WriteStringArray(44, field_names[46], repeatedString_); - } - if (repeatedBytes_.Count > 0) { - output.WriteBytesArray(45, field_names[28], repeatedBytes_); - } - if (repeatedNestedMessage_.Count > 0) { - output.WriteMessageArray(48, field_names[40], repeatedNestedMessage_); - } - if (repeatedForeignMessage_.Count > 0) { - output.WriteMessageArray(49, field_names[35], repeatedForeignMessage_); - } - if (repeatedProto2Message_.Count > 0) { - output.WriteMessageArray(50, field_names[41], repeatedProto2Message_); - } - if (repeatedNestedEnum_.Count > 0) { - output.WriteEnumArray(51, field_names[39], repeatedNestedEnum_); - } - if (repeatedForeignEnum_.Count > 0) { - output.WriteEnumArray(52, field_names[34], repeatedForeignEnum_); - } - if (repeatedStringPiece_.Count > 0) { - output.WriteStringArray(54, field_names[47], repeatedStringPiece_); - } - if (repeatedCord_.Count > 0) { - output.WriteStringArray(55, field_names[29], repeatedCord_); - } - if (repeatedLazyMessage_.Count > 0) { - output.WriteMessageArray(57, field_names[38], repeatedLazyMessage_); - } - if (hasOneofUint32) { - output.WriteUInt32(111, field_names[3], OneofUint32); - } - if (hasOneofNestedMessage) { - output.WriteMessage(112, field_names[1], OneofNestedMessage); - } - if (hasOneofString) { - output.WriteString(113, field_names[2], OneofString); - } - if (hasOneofEnum) { - output.WriteEnum(114, field_names[0], (int) OneofEnum, OneofEnum); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasOptionalInt32) { - size += pb::CodedOutputStream.ComputeInt32Size(1, OptionalInt32); - } - if (hasOptionalInt64) { - size += pb::CodedOutputStream.ComputeInt64Size(2, OptionalInt64); - } - if (hasOptionalUint32) { - size += pb::CodedOutputStream.ComputeUInt32Size(3, OptionalUint32); - } - if (hasOptionalUint64) { - size += pb::CodedOutputStream.ComputeUInt64Size(4, OptionalUint64); - } - if (hasOptionalSint32) { - size += pb::CodedOutputStream.ComputeSInt32Size(5, OptionalSint32); - } - if (hasOptionalSint64) { - size += pb::CodedOutputStream.ComputeSInt64Size(6, OptionalSint64); - } - if (hasOptionalFixed32) { - size += pb::CodedOutputStream.ComputeFixed32Size(7, OptionalFixed32); - } - if (hasOptionalFixed64) { - size += pb::CodedOutputStream.ComputeFixed64Size(8, OptionalFixed64); - } - if (hasOptionalSfixed32) { - size += pb::CodedOutputStream.ComputeSFixed32Size(9, OptionalSfixed32); - } - if (hasOptionalSfixed64) { - size += pb::CodedOutputStream.ComputeSFixed64Size(10, OptionalSfixed64); - } - if (hasOptionalFloat) { - size += pb::CodedOutputStream.ComputeFloatSize(11, OptionalFloat); - } - if (hasOptionalDouble) { - size += pb::CodedOutputStream.ComputeDoubleSize(12, OptionalDouble); - } - if (hasOptionalBool) { - size += pb::CodedOutputStream.ComputeBoolSize(13, OptionalBool); - } - if (hasOptionalString) { - size += pb::CodedOutputStream.ComputeStringSize(14, OptionalString); - } - if (hasOptionalBytes) { - size += pb::CodedOutputStream.ComputeBytesSize(15, OptionalBytes); - } - if (hasOptionalNestedMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(18, OptionalNestedMessage); - } - if (hasOptionalForeignMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(19, OptionalForeignMessage); - } - if (hasOptionalProto2Message) { - size += pb::CodedOutputStream.ComputeMessageSize(20, OptionalProto2Message); - } - if (hasOptionalNestedEnum) { - size += pb::CodedOutputStream.ComputeEnumSize(21, (int) OptionalNestedEnum); - } - if (hasOptionalForeignEnum) { - size += pb::CodedOutputStream.ComputeEnumSize(22, (int) OptionalForeignEnum); - } - if (hasOptionalStringPiece) { - size += pb::CodedOutputStream.ComputeStringSize(24, OptionalStringPiece); - } - if (hasOptionalCord) { - size += pb::CodedOutputStream.ComputeStringSize(25, OptionalCord); - } - if (hasOptionalLazyMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(30, OptionalLazyMessage); - } - { - int dataSize = 0; - foreach (int element in RepeatedInt32List) { - dataSize += pb::CodedOutputStream.ComputeInt32SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedInt32_.Count; - } - { - int dataSize = 0; - foreach (long element in RepeatedInt64List) { - dataSize += pb::CodedOutputStream.ComputeInt64SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedInt64_.Count; - } - { - int dataSize = 0; - foreach (uint element in RepeatedUint32List) { - dataSize += pb::CodedOutputStream.ComputeUInt32SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedUint32_.Count; - } - { - int dataSize = 0; - foreach (ulong element in RepeatedUint64List) { - dataSize += pb::CodedOutputStream.ComputeUInt64SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedUint64_.Count; - } - { - int dataSize = 0; - foreach (int element in RepeatedSint32List) { - dataSize += pb::CodedOutputStream.ComputeSInt32SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedSint32_.Count; - } - { - int dataSize = 0; - foreach (long element in RepeatedSint64List) { - dataSize += pb::CodedOutputStream.ComputeSInt64SizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedSint64_.Count; - } - { - int dataSize = 0; - dataSize = 4 * repeatedFixed32_.Count; - size += dataSize; - size += 2 * repeatedFixed32_.Count; - } - { - int dataSize = 0; - dataSize = 8 * repeatedFixed64_.Count; - size += dataSize; - size += 2 * repeatedFixed64_.Count; - } - { - int dataSize = 0; - dataSize = 4 * repeatedSfixed32_.Count; - size += dataSize; - size += 2 * repeatedSfixed32_.Count; - } - { - int dataSize = 0; - dataSize = 8 * repeatedSfixed64_.Count; - size += dataSize; - size += 2 * repeatedSfixed64_.Count; - } - { - int dataSize = 0; - dataSize = 4 * repeatedFloat_.Count; - size += dataSize; - size += 2 * repeatedFloat_.Count; - } - { - int dataSize = 0; - dataSize = 8 * repeatedDouble_.Count; - size += dataSize; - size += 2 * repeatedDouble_.Count; - } - { - int dataSize = 0; - dataSize = 1 * repeatedBool_.Count; - size += dataSize; - size += 2 * repeatedBool_.Count; - } - { - int dataSize = 0; - foreach (string element in RepeatedStringList) { - dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedString_.Count; - } - { - int dataSize = 0; - foreach (pb::ByteString element in RepeatedBytesList) { - dataSize += pb::CodedOutputStream.ComputeBytesSizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedBytes_.Count; - } - foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) { - size += pb::CodedOutputStream.ComputeMessageSize(48, element); - } - foreach (global::Google.ProtocolBuffers.TestProtos.ForeignMessage element in RepeatedForeignMessageList) { - size += pb::CodedOutputStream.ComputeMessageSize(49, element); - } - foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes element in RepeatedProto2MessageList) { - size += pb::CodedOutputStream.ComputeMessageSize(50, element); - } - { - int dataSize = 0; - if (repeatedNestedEnum_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum element in repeatedNestedEnum_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 2 * repeatedNestedEnum_.Count; - } - } - { - int dataSize = 0; - if (repeatedForeignEnum_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.ForeignEnum element in repeatedForeignEnum_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 2 * repeatedForeignEnum_.Count; - } - } - { - int dataSize = 0; - foreach (string element in RepeatedStringPieceList) { - dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedStringPiece_.Count; - } - { - int dataSize = 0; - foreach (string element in RepeatedCordList) { - dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); - } - size += dataSize; - size += 2 * repeatedCord_.Count; - } - foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage element in RepeatedLazyMessageList) { - size += pb::CodedOutputStream.ComputeMessageSize(57, element); - } - if (hasOneofUint32) { - size += pb::CodedOutputStream.ComputeUInt32Size(111, OneofUint32); - } - if (hasOneofNestedMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(112, OneofNestedMessage); - } - if (hasOneofString) { - size += pb::CodedOutputStream.ComputeStringSize(113, OneofString); - } - if (hasOneofEnum) { - size += pb::CodedOutputStream.ComputeEnumSize(114, (int) OneofEnum); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestAllTypes ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestAllTypes MakeReadOnly() { - repeatedInt32_.MakeReadOnly(); - repeatedInt64_.MakeReadOnly(); - repeatedUint32_.MakeReadOnly(); - repeatedUint64_.MakeReadOnly(); - repeatedSint32_.MakeReadOnly(); - repeatedSint64_.MakeReadOnly(); - repeatedFixed32_.MakeReadOnly(); - repeatedFixed64_.MakeReadOnly(); - repeatedSfixed32_.MakeReadOnly(); - repeatedSfixed64_.MakeReadOnly(); - repeatedFloat_.MakeReadOnly(); - repeatedDouble_.MakeReadOnly(); - repeatedBool_.MakeReadOnly(); - repeatedString_.MakeReadOnly(); - repeatedBytes_.MakeReadOnly(); - repeatedNestedMessage_.MakeReadOnly(); - repeatedForeignMessage_.MakeReadOnly(); - repeatedProto2Message_.MakeReadOnly(); - repeatedNestedEnum_.MakeReadOnly(); - repeatedForeignEnum_.MakeReadOnly(); - repeatedStringPiece_.MakeReadOnly(); - repeatedCord_.MakeReadOnly(); - repeatedLazyMessage_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestAllTypes prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestAllTypes cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestAllTypes result; - - private TestAllTypes PrepareBuilder() { - if (resultIsReadOnly) { - TestAllTypes original = result; - result = new TestAllTypes(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestAllTypes MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Descriptor; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance; } - } - - public override TestAllTypes BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestAllTypes) { - return MergeFrom((TestAllTypes) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestAllTypes other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasOptionalInt32) { - OptionalInt32 = other.OptionalInt32; - } - if (other.HasOptionalInt64) { - OptionalInt64 = other.OptionalInt64; - } - if (other.HasOptionalUint32) { - OptionalUint32 = other.OptionalUint32; - } - if (other.HasOptionalUint64) { - OptionalUint64 = other.OptionalUint64; - } - if (other.HasOptionalSint32) { - OptionalSint32 = other.OptionalSint32; - } - if (other.HasOptionalSint64) { - OptionalSint64 = other.OptionalSint64; - } - if (other.HasOptionalFixed32) { - OptionalFixed32 = other.OptionalFixed32; - } - if (other.HasOptionalFixed64) { - OptionalFixed64 = other.OptionalFixed64; - } - if (other.HasOptionalSfixed32) { - OptionalSfixed32 = other.OptionalSfixed32; - } - if (other.HasOptionalSfixed64) { - OptionalSfixed64 = other.OptionalSfixed64; - } - if (other.HasOptionalFloat) { - OptionalFloat = other.OptionalFloat; - } - if (other.HasOptionalDouble) { - OptionalDouble = other.OptionalDouble; - } - if (other.HasOptionalBool) { - OptionalBool = other.OptionalBool; - } - if (other.HasOptionalString) { - OptionalString = other.OptionalString; - } - if (other.HasOptionalBytes) { - OptionalBytes = other.OptionalBytes; - } - if (other.HasOptionalNestedMessage) { - MergeOptionalNestedMessage(other.OptionalNestedMessage); - } - if (other.HasOptionalForeignMessage) { - MergeOptionalForeignMessage(other.OptionalForeignMessage); - } - if (other.HasOptionalProto2Message) { - MergeOptionalProto2Message(other.OptionalProto2Message); - } - if (other.HasOptionalNestedEnum) { - OptionalNestedEnum = other.OptionalNestedEnum; - } - if (other.HasOptionalForeignEnum) { - OptionalForeignEnum = other.OptionalForeignEnum; - } - if (other.HasOptionalStringPiece) { - OptionalStringPiece = other.OptionalStringPiece; - } - if (other.HasOptionalCord) { - OptionalCord = other.OptionalCord; - } - if (other.HasOptionalLazyMessage) { - MergeOptionalLazyMessage(other.OptionalLazyMessage); - } - if (other.repeatedInt32_.Count != 0) { - result.repeatedInt32_.Add(other.repeatedInt32_); - } - if (other.repeatedInt64_.Count != 0) { - result.repeatedInt64_.Add(other.repeatedInt64_); - } - if (other.repeatedUint32_.Count != 0) { - result.repeatedUint32_.Add(other.repeatedUint32_); - } - if (other.repeatedUint64_.Count != 0) { - result.repeatedUint64_.Add(other.repeatedUint64_); - } - if (other.repeatedSint32_.Count != 0) { - result.repeatedSint32_.Add(other.repeatedSint32_); - } - if (other.repeatedSint64_.Count != 0) { - result.repeatedSint64_.Add(other.repeatedSint64_); - } - if (other.repeatedFixed32_.Count != 0) { - result.repeatedFixed32_.Add(other.repeatedFixed32_); - } - if (other.repeatedFixed64_.Count != 0) { - result.repeatedFixed64_.Add(other.repeatedFixed64_); - } - if (other.repeatedSfixed32_.Count != 0) { - result.repeatedSfixed32_.Add(other.repeatedSfixed32_); - } - if (other.repeatedSfixed64_.Count != 0) { - result.repeatedSfixed64_.Add(other.repeatedSfixed64_); - } - if (other.repeatedFloat_.Count != 0) { - result.repeatedFloat_.Add(other.repeatedFloat_); - } - if (other.repeatedDouble_.Count != 0) { - result.repeatedDouble_.Add(other.repeatedDouble_); - } - if (other.repeatedBool_.Count != 0) { - result.repeatedBool_.Add(other.repeatedBool_); - } - if (other.repeatedString_.Count != 0) { - result.repeatedString_.Add(other.repeatedString_); - } - if (other.repeatedBytes_.Count != 0) { - result.repeatedBytes_.Add(other.repeatedBytes_); - } - if (other.repeatedNestedMessage_.Count != 0) { - result.repeatedNestedMessage_.Add(other.repeatedNestedMessage_); - } - if (other.repeatedForeignMessage_.Count != 0) { - result.repeatedForeignMessage_.Add(other.repeatedForeignMessage_); - } - if (other.repeatedProto2Message_.Count != 0) { - result.repeatedProto2Message_.Add(other.repeatedProto2Message_); - } - if (other.repeatedNestedEnum_.Count != 0) { - result.repeatedNestedEnum_.Add(other.repeatedNestedEnum_); - } - if (other.repeatedForeignEnum_.Count != 0) { - result.repeatedForeignEnum_.Add(other.repeatedForeignEnum_); - } - if (other.repeatedStringPiece_.Count != 0) { - result.repeatedStringPiece_.Add(other.repeatedStringPiece_); - } - if (other.repeatedCord_.Count != 0) { - result.repeatedCord_.Add(other.repeatedCord_); - } - if (other.repeatedLazyMessage_.Count != 0) { - result.repeatedLazyMessage_.Add(other.repeatedLazyMessage_); - } - if (other.HasOneofUint32) { - OneofUint32 = other.OneofUint32; - } - if (other.HasOneofNestedMessage) { - MergeOneofNestedMessage(other.OneofNestedMessage); - } - if (other.HasOneofString) { - OneofString = other.OneofString; - } - if (other.HasOneofEnum) { - OneofEnum = other.OneofEnum; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testAllTypesFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testAllTypesFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasOptionalInt32 = input.ReadInt32(ref result.optionalInt32_); - break; - } - case 16: { - result.hasOptionalInt64 = input.ReadInt64(ref result.optionalInt64_); - break; - } - case 24: { - result.hasOptionalUint32 = input.ReadUInt32(ref result.optionalUint32_); - break; - } - case 32: { - result.hasOptionalUint64 = input.ReadUInt64(ref result.optionalUint64_); - break; - } - case 40: { - result.hasOptionalSint32 = input.ReadSInt32(ref result.optionalSint32_); - break; - } - case 48: { - result.hasOptionalSint64 = input.ReadSInt64(ref result.optionalSint64_); - break; - } - case 61: { - result.hasOptionalFixed32 = input.ReadFixed32(ref result.optionalFixed32_); - break; - } - case 65: { - result.hasOptionalFixed64 = input.ReadFixed64(ref result.optionalFixed64_); - break; - } - case 77: { - result.hasOptionalSfixed32 = input.ReadSFixed32(ref result.optionalSfixed32_); - break; - } - case 81: { - result.hasOptionalSfixed64 = input.ReadSFixed64(ref result.optionalSfixed64_); - break; - } - case 93: { - result.hasOptionalFloat = input.ReadFloat(ref result.optionalFloat_); - break; - } - case 97: { - result.hasOptionalDouble = input.ReadDouble(ref result.optionalDouble_); - break; - } - case 104: { - result.hasOptionalBool = input.ReadBool(ref result.optionalBool_); - break; - } - case 114: { - result.hasOptionalString = input.ReadString(ref result.optionalString_); - break; - } - case 122: { - result.hasOptionalBytes = input.ReadBytes(ref result.optionalBytes_); - break; - } - case 146: { - global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(); - if (result.hasOptionalNestedMessage) { - subBuilder.MergeFrom(OptionalNestedMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalNestedMessage = subBuilder.BuildPartial(); - break; - } - case 154: { - global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder(); - if (result.hasOptionalForeignMessage) { - subBuilder.MergeFrom(OptionalForeignMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalForeignMessage = subBuilder.BuildPartial(); - break; - } - case 162: { - global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.CreateBuilder(); - if (result.hasOptionalProto2Message) { - subBuilder.MergeFrom(OptionalProto2Message); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalProto2Message = subBuilder.BuildPartial(); - break; - } - case 168: { - object unknown; - if(input.ReadEnum(ref result.optionalNestedEnum_, out unknown)) { - result.hasOptionalNestedEnum = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(21, (ulong)(int)unknown); - } - break; - } - case 176: { - object unknown; - if(input.ReadEnum(ref result.optionalForeignEnum_, out unknown)) { - result.hasOptionalForeignEnum = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(22, (ulong)(int)unknown); - } - break; - } - case 194: { - result.hasOptionalStringPiece = input.ReadString(ref result.optionalStringPiece_); - break; - } - case 202: { - result.hasOptionalCord = input.ReadString(ref result.optionalCord_); - break; - } - case 242: { - global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(); - if (result.hasOptionalLazyMessage) { - subBuilder.MergeFrom(OptionalLazyMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalLazyMessage = subBuilder.BuildPartial(); - break; - } - case 250: - case 248: { - input.ReadInt32Array(tag, field_name, result.repeatedInt32_); - break; - } - case 258: - case 256: { - input.ReadInt64Array(tag, field_name, result.repeatedInt64_); - break; - } - case 266: - case 264: { - input.ReadUInt32Array(tag, field_name, result.repeatedUint32_); - break; - } - case 274: - case 272: { - input.ReadUInt64Array(tag, field_name, result.repeatedUint64_); - break; - } - case 282: - case 280: { - input.ReadSInt32Array(tag, field_name, result.repeatedSint32_); - break; - } - case 290: - case 288: { - input.ReadSInt64Array(tag, field_name, result.repeatedSint64_); - break; - } - case 298: - case 301: { - input.ReadFixed32Array(tag, field_name, result.repeatedFixed32_); - break; - } - case 306: - case 305: { - input.ReadFixed64Array(tag, field_name, result.repeatedFixed64_); - break; - } - case 314: - case 317: { - input.ReadSFixed32Array(tag, field_name, result.repeatedSfixed32_); - break; - } - case 322: - case 321: { - input.ReadSFixed64Array(tag, field_name, result.repeatedSfixed64_); - break; - } - case 330: - case 333: { - input.ReadFloatArray(tag, field_name, result.repeatedFloat_); - break; - } - case 338: - case 337: { - input.ReadDoubleArray(tag, field_name, result.repeatedDouble_); - break; - } - case 346: - case 344: { - input.ReadBoolArray(tag, field_name, result.repeatedBool_); - break; - } - case 354: { - input.ReadStringArray(tag, field_name, result.repeatedString_); - break; - } - case 362: { - input.ReadBytesArray(tag, field_name, result.repeatedBytes_); - break; - } - case 386: { - input.ReadMessageArray(tag, field_name, result.repeatedNestedMessage_, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance, extensionRegistry); - break; - } - case 394: { - input.ReadMessageArray(tag, field_name, result.repeatedForeignMessage_, global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance, extensionRegistry); - break; - } - case 402: { - input.ReadMessageArray(tag, field_name, result.repeatedProto2Message_, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance, extensionRegistry); - break; - } - case 410: - case 408: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedNestedEnum_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(51, (ulong)(int)rawValue); - } - break; - } - case 418: - case 416: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedForeignEnum_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(52, (ulong)(int)rawValue); - } - break; - } - case 434: { - input.ReadStringArray(tag, field_name, result.repeatedStringPiece_); - break; - } - case 442: { - input.ReadStringArray(tag, field_name, result.repeatedCord_); - break; - } - case 458: { - input.ReadMessageArray(tag, field_name, result.repeatedLazyMessage_, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance, extensionRegistry); - break; - } - case 888: { - result.hasOneofUint32 = input.ReadUInt32(ref result.oneofUint32_); - break; - } - case 898: { - global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(); - if (result.hasOneofNestedMessage) { - subBuilder.MergeFrom(OneofNestedMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OneofNestedMessage = subBuilder.BuildPartial(); - break; - } - case 906: { - result.hasOneofString = input.ReadString(ref result.oneofString_); - break; - } - case 912: { - object unknown; - if(input.ReadEnum(ref result.oneofEnum_, out unknown)) { - result.hasOneofEnum = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(114, (ulong)(int)unknown); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasOptionalInt32 { - get { return result.hasOptionalInt32; } - } - public int OptionalInt32 { - get { return result.OptionalInt32; } - set { SetOptionalInt32(value); } - } - public Builder SetOptionalInt32(int value) { - PrepareBuilder(); - result.hasOptionalInt32 = true; - result.optionalInt32_ = value; - return this; - } - public Builder ClearOptionalInt32() { - PrepareBuilder(); - result.hasOptionalInt32 = false; - result.optionalInt32_ = 0; - return this; - } - - public bool HasOptionalInt64 { - get { return result.hasOptionalInt64; } - } - public long OptionalInt64 { - get { return result.OptionalInt64; } - set { SetOptionalInt64(value); } - } - public Builder SetOptionalInt64(long value) { - PrepareBuilder(); - result.hasOptionalInt64 = true; - result.optionalInt64_ = value; - return this; - } - public Builder ClearOptionalInt64() { - PrepareBuilder(); - result.hasOptionalInt64 = false; - result.optionalInt64_ = 0L; - return this; - } - - public bool HasOptionalUint32 { - get { return result.hasOptionalUint32; } - } - [global::System.CLSCompliant(false)] - public uint OptionalUint32 { - get { return result.OptionalUint32; } - set { SetOptionalUint32(value); } - } - [global::System.CLSCompliant(false)] - public Builder SetOptionalUint32(uint value) { - PrepareBuilder(); - result.hasOptionalUint32 = true; - result.optionalUint32_ = value; - return this; - } - public Builder ClearOptionalUint32() { - PrepareBuilder(); - result.hasOptionalUint32 = false; - result.optionalUint32_ = 0; - return this; - } - - public bool HasOptionalUint64 { - get { return result.hasOptionalUint64; } - } - [global::System.CLSCompliant(false)] - public ulong OptionalUint64 { - get { return result.OptionalUint64; } - set { SetOptionalUint64(value); } - } - [global::System.CLSCompliant(false)] - public Builder SetOptionalUint64(ulong value) { - PrepareBuilder(); - result.hasOptionalUint64 = true; - result.optionalUint64_ = value; - return this; - } - public Builder ClearOptionalUint64() { - PrepareBuilder(); - result.hasOptionalUint64 = false; - result.optionalUint64_ = 0UL; - return this; - } - - public bool HasOptionalSint32 { - get { return result.hasOptionalSint32; } - } - public int OptionalSint32 { - get { return result.OptionalSint32; } - set { SetOptionalSint32(value); } - } - public Builder SetOptionalSint32(int value) { - PrepareBuilder(); - result.hasOptionalSint32 = true; - result.optionalSint32_ = value; - return this; - } - public Builder ClearOptionalSint32() { - PrepareBuilder(); - result.hasOptionalSint32 = false; - result.optionalSint32_ = 0; - return this; - } - - public bool HasOptionalSint64 { - get { return result.hasOptionalSint64; } - } - public long OptionalSint64 { - get { return result.OptionalSint64; } - set { SetOptionalSint64(value); } - } - public Builder SetOptionalSint64(long value) { - PrepareBuilder(); - result.hasOptionalSint64 = true; - result.optionalSint64_ = value; - return this; - } - public Builder ClearOptionalSint64() { - PrepareBuilder(); - result.hasOptionalSint64 = false; - result.optionalSint64_ = 0L; - return this; - } - - public bool HasOptionalFixed32 { - get { return result.hasOptionalFixed32; } - } - [global::System.CLSCompliant(false)] - public uint OptionalFixed32 { - get { return result.OptionalFixed32; } - set { SetOptionalFixed32(value); } - } - [global::System.CLSCompliant(false)] - public Builder SetOptionalFixed32(uint value) { - PrepareBuilder(); - result.hasOptionalFixed32 = true; - result.optionalFixed32_ = value; - return this; - } - public Builder ClearOptionalFixed32() { - PrepareBuilder(); - result.hasOptionalFixed32 = false; - result.optionalFixed32_ = 0; - return this; - } - - public bool HasOptionalFixed64 { - get { return result.hasOptionalFixed64; } - } - [global::System.CLSCompliant(false)] - public ulong OptionalFixed64 { - get { return result.OptionalFixed64; } - set { SetOptionalFixed64(value); } - } - [global::System.CLSCompliant(false)] - public Builder SetOptionalFixed64(ulong value) { - PrepareBuilder(); - result.hasOptionalFixed64 = true; - result.optionalFixed64_ = value; - return this; - } - public Builder ClearOptionalFixed64() { - PrepareBuilder(); - result.hasOptionalFixed64 = false; - result.optionalFixed64_ = 0UL; - return this; - } - - public bool HasOptionalSfixed32 { - get { return result.hasOptionalSfixed32; } - } - public int OptionalSfixed32 { - get { return result.OptionalSfixed32; } - set { SetOptionalSfixed32(value); } - } - public Builder SetOptionalSfixed32(int value) { - PrepareBuilder(); - result.hasOptionalSfixed32 = true; - result.optionalSfixed32_ = value; - return this; - } - public Builder ClearOptionalSfixed32() { - PrepareBuilder(); - result.hasOptionalSfixed32 = false; - result.optionalSfixed32_ = 0; - return this; - } - - public bool HasOptionalSfixed64 { - get { return result.hasOptionalSfixed64; } - } - public long OptionalSfixed64 { - get { return result.OptionalSfixed64; } - set { SetOptionalSfixed64(value); } - } - public Builder SetOptionalSfixed64(long value) { - PrepareBuilder(); - result.hasOptionalSfixed64 = true; - result.optionalSfixed64_ = value; - return this; - } - public Builder ClearOptionalSfixed64() { - PrepareBuilder(); - result.hasOptionalSfixed64 = false; - result.optionalSfixed64_ = 0L; - return this; - } - - public bool HasOptionalFloat { - get { return result.hasOptionalFloat; } - } - public float OptionalFloat { - get { return result.OptionalFloat; } - set { SetOptionalFloat(value); } - } - public Builder SetOptionalFloat(float value) { - PrepareBuilder(); - result.hasOptionalFloat = true; - result.optionalFloat_ = value; - return this; - } - public Builder ClearOptionalFloat() { - PrepareBuilder(); - result.hasOptionalFloat = false; - result.optionalFloat_ = 0F; - return this; - } - - public bool HasOptionalDouble { - get { return result.hasOptionalDouble; } - } - public double OptionalDouble { - get { return result.OptionalDouble; } - set { SetOptionalDouble(value); } - } - public Builder SetOptionalDouble(double value) { - PrepareBuilder(); - result.hasOptionalDouble = true; - result.optionalDouble_ = value; - return this; - } - public Builder ClearOptionalDouble() { - PrepareBuilder(); - result.hasOptionalDouble = false; - result.optionalDouble_ = 0D; - return this; - } - - public bool HasOptionalBool { - get { return result.hasOptionalBool; } - } - public bool OptionalBool { - get { return result.OptionalBool; } - set { SetOptionalBool(value); } - } - public Builder SetOptionalBool(bool value) { - PrepareBuilder(); - result.hasOptionalBool = true; - result.optionalBool_ = value; - return this; - } - public Builder ClearOptionalBool() { - PrepareBuilder(); - result.hasOptionalBool = false; - result.optionalBool_ = false; - return this; - } - - public bool HasOptionalString { - get { return result.hasOptionalString; } - } - public string OptionalString { - get { return result.OptionalString; } - set { SetOptionalString(value); } - } - public Builder SetOptionalString(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalString = true; - result.optionalString_ = value; - return this; - } - public Builder ClearOptionalString() { - PrepareBuilder(); - result.hasOptionalString = false; - result.optionalString_ = ""; - return this; - } - - public bool HasOptionalBytes { - get { return result.hasOptionalBytes; } - } - public pb::ByteString OptionalBytes { - get { return result.OptionalBytes; } - set { SetOptionalBytes(value); } - } - public Builder SetOptionalBytes(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalBytes = true; - result.optionalBytes_ = value; - return this; - } - public Builder ClearOptionalBytes() { - PrepareBuilder(); - result.hasOptionalBytes = false; - result.optionalBytes_ = pb::ByteString.Empty; - return this; - } - - public bool HasOptionalNestedMessage { - get { return result.hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return result.OptionalNestedMessage; } - set { SetOptionalNestedMessage(value); } - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = value; - return this; - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalNestedMessage && - result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) { - result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial(); - } else { - result.optionalNestedMessage_ = value; - } - result.hasOptionalNestedMessage = true; - return this; - } - public Builder ClearOptionalNestedMessage() { - PrepareBuilder(); - result.hasOptionalNestedMessage = false; - result.optionalNestedMessage_ = null; - return this; - } - - public bool HasOptionalForeignMessage { - get { return result.hasOptionalForeignMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignMessage OptionalForeignMessage { - get { return result.OptionalForeignMessage; } - set { SetOptionalForeignMessage(value); } - } - public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalForeignMessage = true; - result.optionalForeignMessage_ = value; - return this; - } - public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalForeignMessage = true; - result.optionalForeignMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalForeignMessage && - result.optionalForeignMessage_ != global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) { - result.optionalForeignMessage_ = global::Google.ProtocolBuffers.TestProtos.ForeignMessage.CreateBuilder(result.optionalForeignMessage_).MergeFrom(value).BuildPartial(); - } else { - result.optionalForeignMessage_ = value; - } - result.hasOptionalForeignMessage = true; - return this; - } - public Builder ClearOptionalForeignMessage() { - PrepareBuilder(); - result.hasOptionalForeignMessage = false; - result.optionalForeignMessage_ = null; - return this; - } - - public bool HasOptionalProto2Message { - get { return result.hasOptionalProto2Message; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes OptionalProto2Message { - get { return result.OptionalProto2Message; } - set { SetOptionalProto2Message(value); } - } - public Builder SetOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalProto2Message = true; - result.optionalProto2Message_ = value; - return this; - } - public Builder SetOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalProto2Message = true; - result.optionalProto2Message_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalProto2Message && - result.optionalProto2Message_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance) { - result.optionalProto2Message_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.CreateBuilder(result.optionalProto2Message_).MergeFrom(value).BuildPartial(); - } else { - result.optionalProto2Message_ = value; - } - result.hasOptionalProto2Message = true; - return this; - } - public Builder ClearOptionalProto2Message() { - PrepareBuilder(); - result.hasOptionalProto2Message = false; - result.optionalProto2Message_ = null; - return this; - } - - public bool HasOptionalNestedEnum { - get { return result.hasOptionalNestedEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return result.OptionalNestedEnum; } - set { SetOptionalNestedEnum(value); } - } - public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.hasOptionalNestedEnum = true; - result.optionalNestedEnum_ = value; - return this; - } - public Builder ClearOptionalNestedEnum() { - PrepareBuilder(); - result.hasOptionalNestedEnum = false; - result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO; - return this; - } - - public bool HasOptionalForeignEnum { - get { return result.hasOptionalForeignEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignEnum OptionalForeignEnum { - get { return result.OptionalForeignEnum; } - set { SetOptionalForeignEnum(value); } - } - public Builder SetOptionalForeignEnum(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) { - PrepareBuilder(); - result.hasOptionalForeignEnum = true; - result.optionalForeignEnum_ = value; - return this; - } - public Builder ClearOptionalForeignEnum() { - PrepareBuilder(); - result.hasOptionalForeignEnum = false; - result.optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.ForeignEnum.FOREIGN_FOO; - return this; - } - - public bool HasOptionalStringPiece { - get { return result.hasOptionalStringPiece; } - } - public string OptionalStringPiece { - get { return result.OptionalStringPiece; } - set { SetOptionalStringPiece(value); } - } - public Builder SetOptionalStringPiece(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalStringPiece = true; - result.optionalStringPiece_ = value; - return this; - } - public Builder ClearOptionalStringPiece() { - PrepareBuilder(); - result.hasOptionalStringPiece = false; - result.optionalStringPiece_ = ""; - return this; - } - - public bool HasOptionalCord { - get { return result.hasOptionalCord; } - } - public string OptionalCord { - get { return result.OptionalCord; } - set { SetOptionalCord(value); } - } - public Builder SetOptionalCord(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalCord = true; - result.optionalCord_ = value; - return this; - } - public Builder ClearOptionalCord() { - PrepareBuilder(); - result.hasOptionalCord = false; - result.optionalCord_ = ""; - return this; - } - - public bool HasOptionalLazyMessage { - get { return result.hasOptionalLazyMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OptionalLazyMessage { - get { return result.OptionalLazyMessage; } - set { SetOptionalLazyMessage(value); } - } - public Builder SetOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalLazyMessage = true; - result.optionalLazyMessage_ = value; - return this; - } - public Builder SetOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalLazyMessage = true; - result.optionalLazyMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalLazyMessage && - result.optionalLazyMessage_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) { - result.optionalLazyMessage_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalLazyMessage_).MergeFrom(value).BuildPartial(); - } else { - result.optionalLazyMessage_ = value; - } - result.hasOptionalLazyMessage = true; - return this; - } - public Builder ClearOptionalLazyMessage() { - PrepareBuilder(); - result.hasOptionalLazyMessage = false; - result.optionalLazyMessage_ = null; - return this; - } - - public pbc::IPopsicleList RepeatedInt32List { - get { return PrepareBuilder().repeatedInt32_; } - } - public int RepeatedInt32Count { - get { return result.RepeatedInt32Count; } - } - public int GetRepeatedInt32(int index) { - return result.GetRepeatedInt32(index); - } - public Builder SetRepeatedInt32(int index, int value) { - PrepareBuilder(); - result.repeatedInt32_[index] = value; - return this; - } - public Builder AddRepeatedInt32(int value) { - PrepareBuilder(); - result.repeatedInt32_.Add(value); - return this; - } - public Builder AddRangeRepeatedInt32(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedInt32_.Add(values); - return this; - } - public Builder ClearRepeatedInt32() { - PrepareBuilder(); - result.repeatedInt32_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedInt64List { - get { return PrepareBuilder().repeatedInt64_; } - } - public int RepeatedInt64Count { - get { return result.RepeatedInt64Count; } - } - public long GetRepeatedInt64(int index) { - return result.GetRepeatedInt64(index); - } - public Builder SetRepeatedInt64(int index, long value) { - PrepareBuilder(); - result.repeatedInt64_[index] = value; - return this; - } - public Builder AddRepeatedInt64(long value) { - PrepareBuilder(); - result.repeatedInt64_.Add(value); - return this; - } - public Builder AddRangeRepeatedInt64(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedInt64_.Add(values); - return this; - } - public Builder ClearRepeatedInt64() { - PrepareBuilder(); - result.repeatedInt64_.Clear(); - return this; - } - - [global::System.CLSCompliant(false)] - public pbc::IPopsicleList RepeatedUint32List { - get { return PrepareBuilder().repeatedUint32_; } - } - public int RepeatedUint32Count { - get { return result.RepeatedUint32Count; } - } - [global::System.CLSCompliant(false)] - public uint GetRepeatedUint32(int index) { - return result.GetRepeatedUint32(index); - } - [global::System.CLSCompliant(false)] - public Builder SetRepeatedUint32(int index, uint value) { - PrepareBuilder(); - result.repeatedUint32_[index] = value; - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRepeatedUint32(uint value) { - PrepareBuilder(); - result.repeatedUint32_.Add(value); - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRangeRepeatedUint32(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedUint32_.Add(values); - return this; - } - public Builder ClearRepeatedUint32() { - PrepareBuilder(); - result.repeatedUint32_.Clear(); - return this; - } - - [global::System.CLSCompliant(false)] - public pbc::IPopsicleList RepeatedUint64List { - get { return PrepareBuilder().repeatedUint64_; } - } - public int RepeatedUint64Count { - get { return result.RepeatedUint64Count; } - } - [global::System.CLSCompliant(false)] - public ulong GetRepeatedUint64(int index) { - return result.GetRepeatedUint64(index); - } - [global::System.CLSCompliant(false)] - public Builder SetRepeatedUint64(int index, ulong value) { - PrepareBuilder(); - result.repeatedUint64_[index] = value; - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRepeatedUint64(ulong value) { - PrepareBuilder(); - result.repeatedUint64_.Add(value); - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRangeRepeatedUint64(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedUint64_.Add(values); - return this; - } - public Builder ClearRepeatedUint64() { - PrepareBuilder(); - result.repeatedUint64_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedSint32List { - get { return PrepareBuilder().repeatedSint32_; } - } - public int RepeatedSint32Count { - get { return result.RepeatedSint32Count; } - } - public int GetRepeatedSint32(int index) { - return result.GetRepeatedSint32(index); - } - public Builder SetRepeatedSint32(int index, int value) { - PrepareBuilder(); - result.repeatedSint32_[index] = value; - return this; - } - public Builder AddRepeatedSint32(int value) { - PrepareBuilder(); - result.repeatedSint32_.Add(value); - return this; - } - public Builder AddRangeRepeatedSint32(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedSint32_.Add(values); - return this; - } - public Builder ClearRepeatedSint32() { - PrepareBuilder(); - result.repeatedSint32_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedSint64List { - get { return PrepareBuilder().repeatedSint64_; } - } - public int RepeatedSint64Count { - get { return result.RepeatedSint64Count; } - } - public long GetRepeatedSint64(int index) { - return result.GetRepeatedSint64(index); - } - public Builder SetRepeatedSint64(int index, long value) { - PrepareBuilder(); - result.repeatedSint64_[index] = value; - return this; - } - public Builder AddRepeatedSint64(long value) { - PrepareBuilder(); - result.repeatedSint64_.Add(value); - return this; - } - public Builder AddRangeRepeatedSint64(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedSint64_.Add(values); - return this; - } - public Builder ClearRepeatedSint64() { - PrepareBuilder(); - result.repeatedSint64_.Clear(); - return this; - } - - [global::System.CLSCompliant(false)] - public pbc::IPopsicleList RepeatedFixed32List { - get { return PrepareBuilder().repeatedFixed32_; } - } - public int RepeatedFixed32Count { - get { return result.RepeatedFixed32Count; } - } - [global::System.CLSCompliant(false)] - public uint GetRepeatedFixed32(int index) { - return result.GetRepeatedFixed32(index); - } - [global::System.CLSCompliant(false)] - public Builder SetRepeatedFixed32(int index, uint value) { - PrepareBuilder(); - result.repeatedFixed32_[index] = value; - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRepeatedFixed32(uint value) { - PrepareBuilder(); - result.repeatedFixed32_.Add(value); - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRangeRepeatedFixed32(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedFixed32_.Add(values); - return this; - } - public Builder ClearRepeatedFixed32() { - PrepareBuilder(); - result.repeatedFixed32_.Clear(); - return this; - } - - [global::System.CLSCompliant(false)] - public pbc::IPopsicleList RepeatedFixed64List { - get { return PrepareBuilder().repeatedFixed64_; } - } - public int RepeatedFixed64Count { - get { return result.RepeatedFixed64Count; } - } - [global::System.CLSCompliant(false)] - public ulong GetRepeatedFixed64(int index) { - return result.GetRepeatedFixed64(index); - } - [global::System.CLSCompliant(false)] - public Builder SetRepeatedFixed64(int index, ulong value) { - PrepareBuilder(); - result.repeatedFixed64_[index] = value; - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRepeatedFixed64(ulong value) { - PrepareBuilder(); - result.repeatedFixed64_.Add(value); - return this; - } - [global::System.CLSCompliant(false)] - public Builder AddRangeRepeatedFixed64(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedFixed64_.Add(values); - return this; - } - public Builder ClearRepeatedFixed64() { - PrepareBuilder(); - result.repeatedFixed64_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedSfixed32List { - get { return PrepareBuilder().repeatedSfixed32_; } - } - public int RepeatedSfixed32Count { - get { return result.RepeatedSfixed32Count; } - } - public int GetRepeatedSfixed32(int index) { - return result.GetRepeatedSfixed32(index); - } - public Builder SetRepeatedSfixed32(int index, int value) { - PrepareBuilder(); - result.repeatedSfixed32_[index] = value; - return this; - } - public Builder AddRepeatedSfixed32(int value) { - PrepareBuilder(); - result.repeatedSfixed32_.Add(value); - return this; - } - public Builder AddRangeRepeatedSfixed32(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedSfixed32_.Add(values); - return this; - } - public Builder ClearRepeatedSfixed32() { - PrepareBuilder(); - result.repeatedSfixed32_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedSfixed64List { - get { return PrepareBuilder().repeatedSfixed64_; } - } - public int RepeatedSfixed64Count { - get { return result.RepeatedSfixed64Count; } - } - public long GetRepeatedSfixed64(int index) { - return result.GetRepeatedSfixed64(index); - } - public Builder SetRepeatedSfixed64(int index, long value) { - PrepareBuilder(); - result.repeatedSfixed64_[index] = value; - return this; - } - public Builder AddRepeatedSfixed64(long value) { - PrepareBuilder(); - result.repeatedSfixed64_.Add(value); - return this; - } - public Builder AddRangeRepeatedSfixed64(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedSfixed64_.Add(values); - return this; - } - public Builder ClearRepeatedSfixed64() { - PrepareBuilder(); - result.repeatedSfixed64_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedFloatList { - get { return PrepareBuilder().repeatedFloat_; } - } - public int RepeatedFloatCount { - get { return result.RepeatedFloatCount; } - } - public float GetRepeatedFloat(int index) { - return result.GetRepeatedFloat(index); - } - public Builder SetRepeatedFloat(int index, float value) { - PrepareBuilder(); - result.repeatedFloat_[index] = value; - return this; - } - public Builder AddRepeatedFloat(float value) { - PrepareBuilder(); - result.repeatedFloat_.Add(value); - return this; - } - public Builder AddRangeRepeatedFloat(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedFloat_.Add(values); - return this; - } - public Builder ClearRepeatedFloat() { - PrepareBuilder(); - result.repeatedFloat_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedDoubleList { - get { return PrepareBuilder().repeatedDouble_; } - } - public int RepeatedDoubleCount { - get { return result.RepeatedDoubleCount; } - } - public double GetRepeatedDouble(int index) { - return result.GetRepeatedDouble(index); - } - public Builder SetRepeatedDouble(int index, double value) { - PrepareBuilder(); - result.repeatedDouble_[index] = value; - return this; - } - public Builder AddRepeatedDouble(double value) { - PrepareBuilder(); - result.repeatedDouble_.Add(value); - return this; - } - public Builder AddRangeRepeatedDouble(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedDouble_.Add(values); - return this; - } - public Builder ClearRepeatedDouble() { - PrepareBuilder(); - result.repeatedDouble_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedBoolList { - get { return PrepareBuilder().repeatedBool_; } - } - public int RepeatedBoolCount { - get { return result.RepeatedBoolCount; } - } - public bool GetRepeatedBool(int index) { - return result.GetRepeatedBool(index); - } - public Builder SetRepeatedBool(int index, bool value) { - PrepareBuilder(); - result.repeatedBool_[index] = value; - return this; - } - public Builder AddRepeatedBool(bool value) { - PrepareBuilder(); - result.repeatedBool_.Add(value); - return this; - } - public Builder AddRangeRepeatedBool(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedBool_.Add(values); - return this; - } - public Builder ClearRepeatedBool() { - PrepareBuilder(); - result.repeatedBool_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedStringList { - get { return PrepareBuilder().repeatedString_; } - } - public int RepeatedStringCount { - get { return result.RepeatedStringCount; } - } - public string GetRepeatedString(int index) { - return result.GetRepeatedString(index); - } - public Builder SetRepeatedString(int index, string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedString_[index] = value; - return this; - } - public Builder AddRepeatedString(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedString_.Add(value); - return this; - } - public Builder AddRangeRepeatedString(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedString_.Add(values); - return this; - } - public Builder ClearRepeatedString() { - PrepareBuilder(); - result.repeatedString_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedBytesList { - get { return PrepareBuilder().repeatedBytes_; } - } - public int RepeatedBytesCount { - get { return result.RepeatedBytesCount; } - } - public pb::ByteString GetRepeatedBytes(int index) { - return result.GetRepeatedBytes(index); - } - public Builder SetRepeatedBytes(int index, pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedBytes_[index] = value; - return this; - } - public Builder AddRepeatedBytes(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedBytes_.Add(value); - return this; - } - public Builder AddRangeRepeatedBytes(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedBytes_.Add(values); - return this; - } - public Builder ClearRepeatedBytes() { - PrepareBuilder(); - result.repeatedBytes_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedNestedMessageList { - get { return PrepareBuilder().repeatedNestedMessage_; } - } - public int RepeatedNestedMessageCount { - get { return result.RepeatedNestedMessageCount; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) { - return result.GetRepeatedNestedMessage(index); - } - public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedNestedMessage_[index] = value; - return this; - } - public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedNestedMessage_[index] = builderForValue.Build(); - return this; - } - public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedNestedMessage_.Add(value); - return this; - } - public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedNestedMessage_.Add(builderForValue.Build()); - return this; - } - public Builder AddRangeRepeatedNestedMessage(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedNestedMessage_.Add(values); - return this; - } - public Builder ClearRepeatedNestedMessage() { - PrepareBuilder(); - result.repeatedNestedMessage_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedForeignMessageList { - get { return PrepareBuilder().repeatedForeignMessage_; } - } - public int RepeatedForeignMessageCount { - get { return result.RepeatedForeignMessageCount; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignMessage GetRepeatedForeignMessage(int index) { - return result.GetRepeatedForeignMessage(index); - } - public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedForeignMessage_[index] = value; - return this; - } - public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedForeignMessage_[index] = builderForValue.Build(); - return this; - } - public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedForeignMessage_.Add(value); - return this; - } - public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedForeignMessage_.Add(builderForValue.Build()); - return this; - } - public Builder AddRangeRepeatedForeignMessage(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedForeignMessage_.Add(values); - return this; - } - public Builder ClearRepeatedForeignMessage() { - PrepareBuilder(); - result.repeatedForeignMessage_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedProto2MessageList { - get { return PrepareBuilder().repeatedProto2Message_; } - } - public int RepeatedProto2MessageCount { - get { return result.RepeatedProto2MessageCount; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetRepeatedProto2Message(int index) { - return result.GetRepeatedProto2Message(index); - } - public Builder SetRepeatedProto2Message(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedProto2Message_[index] = value; - return this; - } - public Builder SetRepeatedProto2Message(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedProto2Message_[index] = builderForValue.Build(); - return this; - } - public Builder AddRepeatedProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedProto2Message_.Add(value); - return this; - } - public Builder AddRepeatedProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedProto2Message_.Add(builderForValue.Build()); - return this; - } - public Builder AddRangeRepeatedProto2Message(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedProto2Message_.Add(values); - return this; - } - public Builder ClearRepeatedProto2Message() { - PrepareBuilder(); - result.repeatedProto2Message_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedNestedEnumList { - get { return PrepareBuilder().repeatedNestedEnum_; } - } - public int RepeatedNestedEnumCount { - get { return result.RepeatedNestedEnumCount; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) { - return result.GetRepeatedNestedEnum(index); - } - public Builder SetRepeatedNestedEnum(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.repeatedNestedEnum_[index] = value; - return this; - } - public Builder AddRepeatedNestedEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.repeatedNestedEnum_.Add(value); - return this; - } - public Builder AddRangeRepeatedNestedEnum(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedNestedEnum_.Add(values); - return this; - } - public Builder ClearRepeatedNestedEnum() { - PrepareBuilder(); - result.repeatedNestedEnum_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedForeignEnumList { - get { return PrepareBuilder().repeatedForeignEnum_; } - } - public int RepeatedForeignEnumCount { - get { return result.RepeatedForeignEnumCount; } - } - public global::Google.ProtocolBuffers.TestProtos.ForeignEnum GetRepeatedForeignEnum(int index) { - return result.GetRepeatedForeignEnum(index); - } - public Builder SetRepeatedForeignEnum(int index, global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) { - PrepareBuilder(); - result.repeatedForeignEnum_[index] = value; - return this; - } - public Builder AddRepeatedForeignEnum(global::Google.ProtocolBuffers.TestProtos.ForeignEnum value) { - PrepareBuilder(); - result.repeatedForeignEnum_.Add(value); - return this; - } - public Builder AddRangeRepeatedForeignEnum(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedForeignEnum_.Add(values); - return this; - } - public Builder ClearRepeatedForeignEnum() { - PrepareBuilder(); - result.repeatedForeignEnum_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedStringPieceList { - get { return PrepareBuilder().repeatedStringPiece_; } - } - public int RepeatedStringPieceCount { - get { return result.RepeatedStringPieceCount; } - } - public string GetRepeatedStringPiece(int index) { - return result.GetRepeatedStringPiece(index); - } - public Builder SetRepeatedStringPiece(int index, string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedStringPiece_[index] = value; - return this; - } - public Builder AddRepeatedStringPiece(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedStringPiece_.Add(value); - return this; - } - public Builder AddRangeRepeatedStringPiece(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedStringPiece_.Add(values); - return this; - } - public Builder ClearRepeatedStringPiece() { - PrepareBuilder(); - result.repeatedStringPiece_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedCordList { - get { return PrepareBuilder().repeatedCord_; } - } - public int RepeatedCordCount { - get { return result.RepeatedCordCount; } - } - public string GetRepeatedCord(int index) { - return result.GetRepeatedCord(index); - } - public Builder SetRepeatedCord(int index, string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedCord_[index] = value; - return this; - } - public Builder AddRepeatedCord(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedCord_.Add(value); - return this; - } - public Builder AddRangeRepeatedCord(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedCord_.Add(values); - return this; - } - public Builder ClearRepeatedCord() { - PrepareBuilder(); - result.repeatedCord_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedLazyMessageList { - get { return PrepareBuilder().repeatedLazyMessage_; } - } - public int RepeatedLazyMessageCount { - get { return result.RepeatedLazyMessageCount; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage GetRepeatedLazyMessage(int index) { - return result.GetRepeatedLazyMessage(index); - } - public Builder SetRepeatedLazyMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedLazyMessage_[index] = value; - return this; - } - public Builder SetRepeatedLazyMessage(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedLazyMessage_[index] = builderForValue.Build(); - return this; - } - public Builder AddRepeatedLazyMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.repeatedLazyMessage_.Add(value); - return this; - } - public Builder AddRepeatedLazyMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.repeatedLazyMessage_.Add(builderForValue.Build()); - return this; - } - public Builder AddRangeRepeatedLazyMessage(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedLazyMessage_.Add(values); - return this; - } - public Builder ClearRepeatedLazyMessage() { - PrepareBuilder(); - result.repeatedLazyMessage_.Clear(); - return this; - } - - public bool HasOneofUint32 { - get { return result.hasOneofUint32; } - } - [global::System.CLSCompliant(false)] - public uint OneofUint32 { - get { return result.OneofUint32; } - set { SetOneofUint32(value); } - } - [global::System.CLSCompliant(false)] - public Builder SetOneofUint32(uint value) { - PrepareBuilder(); - result.hasOneofUint32 = true; - result.oneofUint32_ = value; - return this; - } - public Builder ClearOneofUint32() { - PrepareBuilder(); - result.hasOneofUint32 = false; - result.oneofUint32_ = 0; - return this; - } - - public bool HasOneofNestedMessage { - get { return result.hasOneofNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage OneofNestedMessage { - get { return result.OneofNestedMessage; } - set { SetOneofNestedMessage(value); } - } - public Builder SetOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOneofNestedMessage = true; - result.oneofNestedMessage_ = value; - return this; - } - public Builder SetOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOneofNestedMessage = true; - result.oneofNestedMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOneofNestedMessage && - result.oneofNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.DefaultInstance) { - result.oneofNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedMessage.CreateBuilder(result.oneofNestedMessage_).MergeFrom(value).BuildPartial(); - } else { - result.oneofNestedMessage_ = value; - } - result.hasOneofNestedMessage = true; - return this; - } - public Builder ClearOneofNestedMessage() { - PrepareBuilder(); - result.hasOneofNestedMessage = false; - result.oneofNestedMessage_ = null; - return this; - } - - public bool HasOneofString { - get { return result.hasOneofString; } - } - public string OneofString { - get { return result.OneofString; } - set { SetOneofString(value); } - } - public Builder SetOneofString(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOneofString = true; - result.oneofString_ = value; - return this; - } - public Builder ClearOneofString() { - PrepareBuilder(); - result.hasOneofString = false; - result.oneofString_ = ""; - return this; - } - - public bool HasOneofEnum { - get { return result.hasOneofEnum; } - } - public global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum OneofEnum { - get { return result.OneofEnum; } - set { SetOneofEnum(value); } - } - public Builder SetOneofEnum(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.hasOneofEnum = true; - result.oneofEnum_ = value; - return this; - } - public Builder ClearOneofEnum() { - PrepareBuilder(); - result.hasOneofEnum = false; - result.oneofEnum_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Types.NestedEnum.FOO; - return this; - } - } - static TestAllTypes() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestProto2Required : pb::GeneratedMessage { - private TestProto2Required() { } - private static readonly TestProto2Required defaultInstance = new TestProto2Required().MakeReadOnly(); - private static readonly string[] _testProto2RequiredFieldNames = new string[] { "proto2" }; - private static readonly uint[] _testProto2RequiredFieldTags = new uint[] { 10 }; - public static TestProto2Required DefaultInstance { - get { return defaultInstance; } - } - - public override TestProto2Required DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestProto2Required ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable; } - } - - public const int Proto2FieldNumber = 1; - private bool hasProto2; - private global::Google.ProtocolBuffers.TestProtos.TestRequired proto2_; - public bool HasProto2 { - get { return hasProto2; } - } - public global::Google.ProtocolBuffers.TestProtos.TestRequired Proto2 { - get { return proto2_ ?? global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance; } - } - - public override bool IsInitialized { - get { - if (HasProto2) { - if (!Proto2.IsInitialized) return false; - } - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testProto2RequiredFieldNames; - if (hasProto2) { - output.WriteMessage(1, field_names[0], Proto2); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasProto2) { - size += pb::CodedOutputStream.ComputeMessageSize(1, Proto2); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestProto2Required ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestProto2Required ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestProto2Required ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestProto2Required ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestProto2Required ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestProto2Required ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestProto2Required ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestProto2Required ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestProto2Required ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestProto2Required ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestProto2Required MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestProto2Required prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestProto2Required cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestProto2Required result; - - private TestProto2Required PrepareBuilder() { - if (resultIsReadOnly) { - TestProto2Required original = result; - result = new TestProto2Required(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestProto2Required MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestProto2Required.Descriptor; } - } - - public override TestProto2Required DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestProto2Required.DefaultInstance; } - } - - public override TestProto2Required BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestProto2Required) { - return MergeFrom((TestProto2Required) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestProto2Required other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestProto2Required.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasProto2) { - MergeProto2(other.Proto2); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testProto2RequiredFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testProto2RequiredFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 10: { - global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder(); - if (result.hasProto2) { - subBuilder.MergeFrom(Proto2); - } - input.ReadMessage(subBuilder, extensionRegistry); - Proto2 = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasProto2 { - get { return result.hasProto2; } - } - public global::Google.ProtocolBuffers.TestProtos.TestRequired Proto2 { - get { return result.Proto2; } - set { SetProto2(value); } - } - public Builder SetProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasProto2 = true; - result.proto2_ = value; - return this; - } - public Builder SetProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasProto2 = true; - result.proto2_ = builderForValue.Build(); - return this; - } - public Builder MergeProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasProto2 && - result.proto2_ != global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance) { - result.proto2_ = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder(result.proto2_).MergeFrom(value).BuildPartial(); - } else { - result.proto2_ = value; - } - result.hasProto2 = true; - return this; - } - public Builder ClearProto2() { - PrepareBuilder(); - result.hasProto2 = false; - result.proto2_ = null; - return this; - } - } - static TestProto2Required() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class ForeignMessage : pb::GeneratedMessage { - private ForeignMessage() { } - private static readonly ForeignMessage defaultInstance = new ForeignMessage().MakeReadOnly(); - private static readonly string[] _foreignMessageFieldNames = new string[] { "c" }; - private static readonly uint[] _foreignMessageFieldTags = new uint[] { 8 }; - public static ForeignMessage DefaultInstance { - get { return defaultInstance; } - } - - public override ForeignMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override ForeignMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable; } - } - - public const int CFieldNumber = 1; - private bool hasC; - private int c_; - public bool HasC { - get { return hasC; } - } - public int C { - get { return c_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _foreignMessageFieldNames; - if (hasC) { - output.WriteInt32(1, field_names[0], C); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasC) { - size += pb::CodedOutputStream.ComputeInt32Size(1, C); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static ForeignMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static ForeignMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static ForeignMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static ForeignMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static ForeignMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static ForeignMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static ForeignMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static ForeignMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static ForeignMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static ForeignMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private ForeignMessage MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(ForeignMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(ForeignMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private ForeignMessage result; - - private ForeignMessage PrepareBuilder() { - if (resultIsReadOnly) { - ForeignMessage original = result; - result = new ForeignMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override ForeignMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.ForeignMessage.Descriptor; } - } - - public override ForeignMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance; } - } - - public override ForeignMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is ForeignMessage) { - return MergeFrom((ForeignMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(ForeignMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.ForeignMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasC) { - C = other.C; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_foreignMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _foreignMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasC = input.ReadInt32(ref result.c_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasC { - get { return result.hasC; } - } - public int C { - get { return result.C; } - set { SetC(value); } - } - public Builder SetC(int value) { - PrepareBuilder(); - result.hasC = true; - result.c_ = value; - return this; - } - public Builder ClearC() { - PrepareBuilder(); - result.hasC = false; - result.c_ = 0; - return this; - } - } - static ForeignMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestNoFieldPresence.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum.cs deleted file mode 100644 index c0f4995e..00000000 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum.cs +++ /dev/null @@ -1,1320 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/protobuf/unittest_preserve_unknown_enum.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class UnittestPreserveUnknownEnum { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static UnittestPreserveUnknownEnum() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CjRnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfcHJlc2VydmVfdW5rbm93bl9l", - "bnVtLnByb3RvEiVwcm90bzNfcHJlc2VydmVfdW5rbm93bl9lbnVtX3VuaXR0", - "ZXN0IsEDCglNeU1lc3NhZ2USOAoBZRgBIAEoDjItLnByb3RvM19wcmVzZXJ2", - "ZV91bmtub3duX2VudW1fdW5pdHRlc3QuTXlFbnVtEkEKCnJlcGVhdGVkX2UY", - "AiADKA4yLS5wcm90bzNfcHJlc2VydmVfdW5rbm93bl9lbnVtX3VuaXR0ZXN0", - "Lk15RW51bRJMChFyZXBlYXRlZF9wYWNrZWRfZRgDIAMoDjItLnByb3RvM19w", - "cmVzZXJ2ZV91bmtub3duX2VudW1fdW5pdHRlc3QuTXlFbnVtQgIQARJcChxy", - "ZXBlYXRlZF9wYWNrZWRfdW5leHBlY3RlZF9lGAQgAygOMjYucHJvdG8zX3By", - "ZXNlcnZlX3Vua25vd25fZW51bV91bml0dGVzdC5NeUVudW1QbHVzRXh0cmES", - "QgoJb25lb2ZfZV8xGAUgASgOMi0ucHJvdG8zX3ByZXNlcnZlX3Vua25vd25f", - "ZW51bV91bml0dGVzdC5NeUVudW1IABJCCglvbmVvZl9lXzIYBiABKA4yLS5w", - "cm90bzNfcHJlc2VydmVfdW5rbm93bl9lbnVtX3VuaXR0ZXN0Lk15RW51bUgA", - "QgMKAW8i+wMKEk15TWVzc2FnZVBsdXNFeHRyYRJBCgFlGAEgASgOMjYucHJv", - "dG8zX3ByZXNlcnZlX3Vua25vd25fZW51bV91bml0dGVzdC5NeUVudW1QbHVz", - "RXh0cmESSgoKcmVwZWF0ZWRfZRgCIAMoDjI2LnByb3RvM19wcmVzZXJ2ZV91", - "bmtub3duX2VudW1fdW5pdHRlc3QuTXlFbnVtUGx1c0V4dHJhElUKEXJlcGVh", - "dGVkX3BhY2tlZF9lGAMgAygOMjYucHJvdG8zX3ByZXNlcnZlX3Vua25vd25f", - "ZW51bV91bml0dGVzdC5NeUVudW1QbHVzRXh0cmFCAhABEmAKHHJlcGVhdGVk", - "X3BhY2tlZF91bmV4cGVjdGVkX2UYBCADKA4yNi5wcm90bzNfcHJlc2VydmVf", - "dW5rbm93bl9lbnVtX3VuaXR0ZXN0Lk15RW51bVBsdXNFeHRyYUICEAESSwoJ", - "b25lb2ZfZV8xGAUgASgOMjYucHJvdG8zX3ByZXNlcnZlX3Vua25vd25fZW51", - "bV91bml0dGVzdC5NeUVudW1QbHVzRXh0cmFIABJLCglvbmVvZl9lXzIYBiAB", - "KA4yNi5wcm90bzNfcHJlc2VydmVfdW5rbm93bl9lbnVtX3VuaXR0ZXN0Lk15", - "RW51bVBsdXNFeHRyYUgAQgMKAW8qIwoGTXlFbnVtEgcKA0ZPTxAAEgcKA0JB", - "UhABEgcKA0JBWhACKj8KD015RW51bVBsdXNFeHRyYRIJCgVFX0ZPTxAAEgkK", - "BUVfQkFSEAESCQoFRV9CQVoQAhILCgdFX0VYVFJBEANCJKoCIUdvb2dsZS5Q", - "cm90b2NvbEJ1ZmZlcnMuVGVzdFByb3Rvc2IGcHJvdG8z")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__Descriptor = Descriptor.MessageTypes[0]; - internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__Descriptor, - new string[] { "E", "RepeatedE", "RepeatedPackedE", "RepeatedPackedUnexpectedE", "OneofE1", "OneofE2", }); - internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__Descriptor = Descriptor.MessageTypes[1]; - internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__Descriptor, - new string[] { "E", "RepeatedE", "RepeatedPackedE", "RepeatedPackedUnexpectedE", "OneofE1", "OneofE2", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Enums - public enum MyEnum { - FOO = 0, - BAR = 1, - BAZ = 2, - } - - public enum MyEnumPlusExtra { - E_FOO = 0, - E_BAR = 1, - E_BAZ = 2, - E_EXTRA = 3, - } - - #endregion - - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class MyMessage : pb::GeneratedMessage { - private MyMessage() { } - private static readonly MyMessage defaultInstance = new MyMessage().MakeReadOnly(); - private static readonly string[] _myMessageFieldNames = new string[] { "e", "oneof_e_1", "oneof_e_2", "repeated_e", "repeated_packed_e", "repeated_packed_unexpected_e" }; - private static readonly uint[] _myMessageFieldTags = new uint[] { 8, 40, 48, 16, 26, 32 }; - public static MyMessage DefaultInstance { - get { return defaultInstance; } - } - - public override MyMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override MyMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.internal__static_proto3_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable; } - } - - public const int EFieldNumber = 1; - private bool hasE; - private global::Google.ProtocolBuffers.TestProtos.MyEnum e_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasE { - get { return hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum E { - get { return e_; } - } - - public const int RepeatedEFieldNumber = 2; - private pbc::PopsicleList repeatedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedEList { - get { return pbc::Lists.AsReadOnly(repeatedE_); } - } - public int RepeatedECount { - get { return repeatedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedE(int index) { - return repeatedE_[index]; - } - - public const int RepeatedPackedEFieldNumber = 3; - private int repeatedPackedEMemoizedSerializedSize; - private pbc::PopsicleList repeatedPackedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedE_); } - } - public int RepeatedPackedECount { - get { return repeatedPackedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedE(int index) { - return repeatedPackedE_[index]; - } - - public const int RepeatedPackedUnexpectedEFieldNumber = 4; - private pbc::PopsicleList repeatedPackedUnexpectedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedUnexpectedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedUnexpectedE_); } - } - public int RepeatedPackedUnexpectedECount { - get { return repeatedPackedUnexpectedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedUnexpectedE(int index) { - return repeatedPackedUnexpectedE_[index]; - } - - public const int OneofE1FieldNumber = 5; - private bool hasOneofE1; - private global::Google.ProtocolBuffers.TestProtos.MyEnum oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasOneofE1 { - get { return hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE1 { - get { return oneofE1_; } - } - - public const int OneofE2FieldNumber = 6; - private bool hasOneofE2; - private global::Google.ProtocolBuffers.TestProtos.MyEnum oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasOneofE2 { - get { return hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE2 { - get { return oneofE2_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _myMessageFieldNames; - if (hasE) { - output.WriteEnum(1, field_names[0], (int) E, E); - } - if (repeatedE_.Count > 0) { - output.WriteEnumArray(2, field_names[3], repeatedE_); - } - if (repeatedPackedE_.Count > 0) { - output.WritePackedEnumArray(3, field_names[4], repeatedPackedEMemoizedSerializedSize, repeatedPackedE_); - } - if (repeatedPackedUnexpectedE_.Count > 0) { - output.WriteEnumArray(4, field_names[5], repeatedPackedUnexpectedE_); - } - if (hasOneofE1) { - output.WriteEnum(5, field_names[1], (int) OneofE1, OneofE1); - } - if (hasOneofE2) { - output.WriteEnum(6, field_names[2], (int) OneofE2, OneofE2); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasE) { - size += pb::CodedOutputStream.ComputeEnumSize(1, (int) E); - } - { - int dataSize = 0; - if (repeatedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnum element in repeatedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * repeatedE_.Count; - } - } - { - int dataSize = 0; - if (repeatedPackedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnum element in repeatedPackedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1; - size += pb::CodedOutputStream.ComputeRawVarint32Size((uint) dataSize); - } - repeatedPackedEMemoizedSerializedSize = dataSize; - } - { - int dataSize = 0; - if (repeatedPackedUnexpectedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra element in repeatedPackedUnexpectedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * repeatedPackedUnexpectedE_.Count; - } - } - if (hasOneofE1) { - size += pb::CodedOutputStream.ComputeEnumSize(5, (int) OneofE1); - } - if (hasOneofE2) { - size += pb::CodedOutputStream.ComputeEnumSize(6, (int) OneofE2); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static MyMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static MyMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private MyMessage MakeReadOnly() { - repeatedE_.MakeReadOnly(); - repeatedPackedE_.MakeReadOnly(); - repeatedPackedUnexpectedE_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(MyMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(MyMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private MyMessage result; - - private MyMessage PrepareBuilder() { - if (resultIsReadOnly) { - MyMessage original = result; - result = new MyMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override MyMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessage.Descriptor; } - } - - public override MyMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessage.DefaultInstance; } - } - - public override MyMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is MyMessage) { - return MergeFrom((MyMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(MyMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.MyMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasE) { - E = other.E; - } - if (other.repeatedE_.Count != 0) { - result.repeatedE_.Add(other.repeatedE_); - } - if (other.repeatedPackedE_.Count != 0) { - result.repeatedPackedE_.Add(other.repeatedPackedE_); - } - if (other.repeatedPackedUnexpectedE_.Count != 0) { - result.repeatedPackedUnexpectedE_.Add(other.repeatedPackedUnexpectedE_); - } - if (other.HasOneofE1) { - OneofE1 = other.OneofE1; - } - if (other.HasOneofE2) { - OneofE2 = other.OneofE2; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_myMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _myMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - object unknown; - if(input.ReadEnum(ref result.e_, out unknown)) { - result.hasE = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(1, (ulong)(int)unknown); - } - break; - } - case 18: - case 16: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(2, (ulong)(int)rawValue); - } - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - case 34: - case 32: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedUnexpectedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(4, (ulong)(int)rawValue); - } - break; - } - case 40: { - object unknown; - if(input.ReadEnum(ref result.oneofE1_, out unknown)) { - result.hasOneofE1 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(5, (ulong)(int)unknown); - } - break; - } - case 48: { - object unknown; - if(input.ReadEnum(ref result.oneofE2_, out unknown)) { - result.hasOneofE2 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(6, (ulong)(int)unknown); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasE { - get { return result.hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum E { - get { return result.E; } - set { SetE(value); } - } - public Builder SetE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasE = true; - result.e_ = value; - return this; - } - public Builder ClearE() { - PrepareBuilder(); - result.hasE = false; - result.e_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - - public pbc::IPopsicleList RepeatedEList { - get { return PrepareBuilder().repeatedE_; } - } - public int RepeatedECount { - get { return result.RepeatedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedE(int index) { - return result.GetRepeatedE(index); - } - public Builder SetRepeatedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedE_[index] = value; - return this; - } - public Builder AddRepeatedE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedE_.Add(values); - return this; - } - public Builder ClearRepeatedE() { - PrepareBuilder(); - result.repeatedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedEList { - get { return PrepareBuilder().repeatedPackedE_; } - } - public int RepeatedPackedECount { - get { return result.RepeatedPackedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedE(int index) { - return result.GetRepeatedPackedE(index); - } - public Builder SetRepeatedPackedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedE() { - PrepareBuilder(); - result.repeatedPackedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedUnexpectedEList { - get { return PrepareBuilder().repeatedPackedUnexpectedE_; } - } - public int RepeatedPackedUnexpectedECount { - get { return result.RepeatedPackedUnexpectedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedUnexpectedE(int index) { - return result.GetRepeatedPackedUnexpectedE(index); - } - public Builder SetRepeatedPackedUnexpectedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedUnexpectedE(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedUnexpectedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedUnexpectedE() { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Clear(); - return this; - } - - public bool HasOneofE1 { - get { return result.hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE1 { - get { return result.OneofE1; } - set { SetOneofE1(value); } - } - public Builder SetOneofE1(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasOneofE1 = true; - result.oneofE1_ = value; - return this; - } - public Builder ClearOneofE1() { - PrepareBuilder(); - result.hasOneofE1 = false; - result.oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - - public bool HasOneofE2 { - get { return result.hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE2 { - get { return result.OneofE2; } - set { SetOneofE2(value); } - } - public Builder SetOneofE2(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasOneofE2 = true; - result.oneofE2_ = value; - return this; - } - public Builder ClearOneofE2() { - PrepareBuilder(); - result.hasOneofE2 = false; - result.oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - } - static MyMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class MyMessagePlusExtra : pb::GeneratedMessage { - private MyMessagePlusExtra() { } - private static readonly MyMessagePlusExtra defaultInstance = new MyMessagePlusExtra().MakeReadOnly(); - private static readonly string[] _myMessagePlusExtraFieldNames = new string[] { "e", "oneof_e_1", "oneof_e_2", "repeated_e", "repeated_packed_e", "repeated_packed_unexpected_e" }; - private static readonly uint[] _myMessagePlusExtraFieldTags = new uint[] { 8, 40, 48, 16, 26, 34 }; - public static MyMessagePlusExtra DefaultInstance { - get { return defaultInstance; } - } - - public override MyMessagePlusExtra DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override MyMessagePlusExtra ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.internal__static_proto3_preserve_unknown_enum_unittest_MyMessagePlusExtra__FieldAccessorTable; } - } - - public const int EFieldNumber = 1; - private bool hasE; - private global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra e_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - public bool HasE { - get { return hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra E { - get { return e_; } - } - - public const int RepeatedEFieldNumber = 2; - private pbc::PopsicleList repeatedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedEList { - get { return pbc::Lists.AsReadOnly(repeatedE_); } - } - public int RepeatedECount { - get { return repeatedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedE(int index) { - return repeatedE_[index]; - } - - public const int RepeatedPackedEFieldNumber = 3; - private int repeatedPackedEMemoizedSerializedSize; - private pbc::PopsicleList repeatedPackedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedE_); } - } - public int RepeatedPackedECount { - get { return repeatedPackedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedE(int index) { - return repeatedPackedE_[index]; - } - - public const int RepeatedPackedUnexpectedEFieldNumber = 4; - private int repeatedPackedUnexpectedEMemoizedSerializedSize; - private pbc::PopsicleList repeatedPackedUnexpectedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedUnexpectedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedUnexpectedE_); } - } - public int RepeatedPackedUnexpectedECount { - get { return repeatedPackedUnexpectedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedUnexpectedE(int index) { - return repeatedPackedUnexpectedE_[index]; - } - - public const int OneofE1FieldNumber = 5; - private bool hasOneofE1; - private global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - public bool HasOneofE1 { - get { return hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra OneofE1 { - get { return oneofE1_; } - } - - public const int OneofE2FieldNumber = 6; - private bool hasOneofE2; - private global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - public bool HasOneofE2 { - get { return hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra OneofE2 { - get { return oneofE2_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _myMessagePlusExtraFieldNames; - if (hasE) { - output.WriteEnum(1, field_names[0], (int) E, E); - } - if (repeatedE_.Count > 0) { - output.WriteEnumArray(2, field_names[3], repeatedE_); - } - if (repeatedPackedE_.Count > 0) { - output.WritePackedEnumArray(3, field_names[4], repeatedPackedEMemoizedSerializedSize, repeatedPackedE_); - } - if (repeatedPackedUnexpectedE_.Count > 0) { - output.WritePackedEnumArray(4, field_names[5], repeatedPackedUnexpectedEMemoizedSerializedSize, repeatedPackedUnexpectedE_); - } - if (hasOneofE1) { - output.WriteEnum(5, field_names[1], (int) OneofE1, OneofE1); - } - if (hasOneofE2) { - output.WriteEnum(6, field_names[2], (int) OneofE2, OneofE2); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasE) { - size += pb::CodedOutputStream.ComputeEnumSize(1, (int) E); - } - { - int dataSize = 0; - if (repeatedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra element in repeatedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * repeatedE_.Count; - } - } - { - int dataSize = 0; - if (repeatedPackedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra element in repeatedPackedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1; - size += pb::CodedOutputStream.ComputeRawVarint32Size((uint) dataSize); - } - repeatedPackedEMemoizedSerializedSize = dataSize; - } - { - int dataSize = 0; - if (repeatedPackedUnexpectedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra element in repeatedPackedUnexpectedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1; - size += pb::CodedOutputStream.ComputeRawVarint32Size((uint) dataSize); - } - repeatedPackedUnexpectedEMemoizedSerializedSize = dataSize; - } - if (hasOneofE1) { - size += pb::CodedOutputStream.ComputeEnumSize(5, (int) OneofE1); - } - if (hasOneofE2) { - size += pb::CodedOutputStream.ComputeEnumSize(6, (int) OneofE2); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static MyMessagePlusExtra ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static MyMessagePlusExtra ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static MyMessagePlusExtra ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessagePlusExtra ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private MyMessagePlusExtra MakeReadOnly() { - repeatedE_.MakeReadOnly(); - repeatedPackedE_.MakeReadOnly(); - repeatedPackedUnexpectedE_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(MyMessagePlusExtra prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(MyMessagePlusExtra cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private MyMessagePlusExtra result; - - private MyMessagePlusExtra PrepareBuilder() { - if (resultIsReadOnly) { - MyMessagePlusExtra original = result; - result = new MyMessagePlusExtra(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override MyMessagePlusExtra MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessagePlusExtra.Descriptor; } - } - - public override MyMessagePlusExtra DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessagePlusExtra.DefaultInstance; } - } - - public override MyMessagePlusExtra BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is MyMessagePlusExtra) { - return MergeFrom((MyMessagePlusExtra) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(MyMessagePlusExtra other) { - if (other == global::Google.ProtocolBuffers.TestProtos.MyMessagePlusExtra.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasE) { - E = other.E; - } - if (other.repeatedE_.Count != 0) { - result.repeatedE_.Add(other.repeatedE_); - } - if (other.repeatedPackedE_.Count != 0) { - result.repeatedPackedE_.Add(other.repeatedPackedE_); - } - if (other.repeatedPackedUnexpectedE_.Count != 0) { - result.repeatedPackedUnexpectedE_.Add(other.repeatedPackedUnexpectedE_); - } - if (other.HasOneofE1) { - OneofE1 = other.OneofE1; - } - if (other.HasOneofE2) { - OneofE2 = other.OneofE2; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_myMessagePlusExtraFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _myMessagePlusExtraFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - object unknown; - if(input.ReadEnum(ref result.e_, out unknown)) { - result.hasE = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(1, (ulong)(int)unknown); - } - break; - } - case 18: - case 16: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(2, (ulong)(int)rawValue); - } - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - case 34: - case 32: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedUnexpectedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(4, (ulong)(int)rawValue); - } - break; - } - case 40: { - object unknown; - if(input.ReadEnum(ref result.oneofE1_, out unknown)) { - result.hasOneofE1 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(5, (ulong)(int)unknown); - } - break; - } - case 48: { - object unknown; - if(input.ReadEnum(ref result.oneofE2_, out unknown)) { - result.hasOneofE2 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(6, (ulong)(int)unknown); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasE { - get { return result.hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra E { - get { return result.E; } - set { SetE(value); } - } - public Builder SetE(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.hasE = true; - result.e_ = value; - return this; - } - public Builder ClearE() { - PrepareBuilder(); - result.hasE = false; - result.e_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - return this; - } - - public pbc::IPopsicleList RepeatedEList { - get { return PrepareBuilder().repeatedE_; } - } - public int RepeatedECount { - get { return result.RepeatedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedE(int index) { - return result.GetRepeatedE(index); - } - public Builder SetRepeatedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedE_[index] = value; - return this; - } - public Builder AddRepeatedE(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedE_.Add(values); - return this; - } - public Builder ClearRepeatedE() { - PrepareBuilder(); - result.repeatedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedEList { - get { return PrepareBuilder().repeatedPackedE_; } - } - public int RepeatedPackedECount { - get { return result.RepeatedPackedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedE(int index) { - return result.GetRepeatedPackedE(index); - } - public Builder SetRepeatedPackedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedE(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedE() { - PrepareBuilder(); - result.repeatedPackedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedUnexpectedEList { - get { return PrepareBuilder().repeatedPackedUnexpectedE_; } - } - public int RepeatedPackedUnexpectedECount { - get { return result.RepeatedPackedUnexpectedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra GetRepeatedPackedUnexpectedE(int index) { - return result.GetRepeatedPackedUnexpectedE(index); - } - public Builder SetRepeatedPackedUnexpectedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedUnexpectedE(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedUnexpectedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedUnexpectedE() { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Clear(); - return this; - } - - public bool HasOneofE1 { - get { return result.hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra OneofE1 { - get { return result.OneofE1; } - set { SetOneofE1(value); } - } - public Builder SetOneofE1(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.hasOneofE1 = true; - result.oneofE1_ = value; - return this; - } - public Builder ClearOneofE1() { - PrepareBuilder(); - result.hasOneofE1 = false; - result.oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - return this; - } - - public bool HasOneofE2 { - get { return result.hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra OneofE2 { - get { return result.OneofE2; } - set { SetOneofE2(value); } - } - public Builder SetOneofE2(global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra value) { - PrepareBuilder(); - result.hasOneofE2 = true; - result.oneofE2_ = value; - return this; - } - public Builder ClearOneofE2() { - PrepareBuilder(); - result.hasOneofE2 = false; - result.oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnumPlusExtra.E_FOO; - return this; - } - } - static MyMessagePlusExtra() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum2.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum2.cs deleted file mode 100644 index b7ab97d9..00000000 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestPreserveUnknownEnum2.cs +++ /dev/null @@ -1,684 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: google/protobuf/unittest_preserve_unknown_enum2.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class UnittestPreserveUnknownEnum2 { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static UnittestPreserveUnknownEnum2() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CjVnb29nbGUvcHJvdG9idWYvdW5pdHRlc3RfcHJlc2VydmVfdW5rbm93bl9l", - "bnVtMi5wcm90bxIlcHJvdG8yX3ByZXNlcnZlX3Vua25vd25fZW51bV91bml0", - "dGVzdCK4AwoJTXlNZXNzYWdlEjgKAWUYASABKA4yLS5wcm90bzJfcHJlc2Vy", - "dmVfdW5rbm93bl9lbnVtX3VuaXR0ZXN0Lk15RW51bRJBCgpyZXBlYXRlZF9l", - "GAIgAygOMi0ucHJvdG8yX3ByZXNlcnZlX3Vua25vd25fZW51bV91bml0dGVz", - "dC5NeUVudW0STAoRcmVwZWF0ZWRfcGFja2VkX2UYAyADKA4yLS5wcm90bzJf", - "cHJlc2VydmVfdW5rbm93bl9lbnVtX3VuaXR0ZXN0Lk15RW51bUICEAESUwoc", - "cmVwZWF0ZWRfcGFja2VkX3VuZXhwZWN0ZWRfZRgEIAMoDjItLnByb3RvMl9w", - "cmVzZXJ2ZV91bmtub3duX2VudW1fdW5pdHRlc3QuTXlFbnVtEkIKCW9uZW9m", - "X2VfMRgFIAEoDjItLnByb3RvMl9wcmVzZXJ2ZV91bmtub3duX2VudW1fdW5p", - "dHRlc3QuTXlFbnVtSAASQgoJb25lb2ZfZV8yGAYgASgOMi0ucHJvdG8yX3By", - "ZXNlcnZlX3Vua25vd25fZW51bV91bml0dGVzdC5NeUVudW1IAEIDCgFvKiMK", - "Bk15RW51bRIHCgNGT08QABIHCgNCQVIQARIHCgNCQVoQAkIkqgIhR29vZ2xl", - "LlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9z")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__Descriptor = Descriptor.MessageTypes[0]; - internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__Descriptor, - new string[] { "E", "RepeatedE", "RepeatedPackedE", "RepeatedPackedUnexpectedE", "OneofE1", "OneofE2", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Enums - public enum MyEnum { - FOO = 0, - BAR = 1, - BAZ = 2, - } - - #endregion - - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class MyMessage : pb::GeneratedMessage { - private MyMessage() { } - private static readonly MyMessage defaultInstance = new MyMessage().MakeReadOnly(); - private static readonly string[] _myMessageFieldNames = new string[] { "e", "oneof_e_1", "oneof_e_2", "repeated_e", "repeated_packed_e", "repeated_packed_unexpected_e" }; - private static readonly uint[] _myMessageFieldTags = new uint[] { 8, 40, 48, 16, 26, 32 }; - public static MyMessage DefaultInstance { - get { return defaultInstance; } - } - - public override MyMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override MyMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum2.internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum2.internal__static_proto2_preserve_unknown_enum_unittest_MyMessage__FieldAccessorTable; } - } - - public const int EFieldNumber = 1; - private bool hasE; - private global::Google.ProtocolBuffers.TestProtos.MyEnum e_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasE { - get { return hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum E { - get { return e_; } - } - - public const int RepeatedEFieldNumber = 2; - private pbc::PopsicleList repeatedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedEList { - get { return pbc::Lists.AsReadOnly(repeatedE_); } - } - public int RepeatedECount { - get { return repeatedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedE(int index) { - return repeatedE_[index]; - } - - public const int RepeatedPackedEFieldNumber = 3; - private int repeatedPackedEMemoizedSerializedSize; - private pbc::PopsicleList repeatedPackedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedE_); } - } - public int RepeatedPackedECount { - get { return repeatedPackedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedE(int index) { - return repeatedPackedE_[index]; - } - - public const int RepeatedPackedUnexpectedEFieldNumber = 4; - private pbc::PopsicleList repeatedPackedUnexpectedE_ = new pbc::PopsicleList(); - public scg::IList RepeatedPackedUnexpectedEList { - get { return pbc::Lists.AsReadOnly(repeatedPackedUnexpectedE_); } - } - public int RepeatedPackedUnexpectedECount { - get { return repeatedPackedUnexpectedE_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedUnexpectedE(int index) { - return repeatedPackedUnexpectedE_[index]; - } - - public const int OneofE1FieldNumber = 5; - private bool hasOneofE1; - private global::Google.ProtocolBuffers.TestProtos.MyEnum oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasOneofE1 { - get { return hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE1 { - get { return oneofE1_; } - } - - public const int OneofE2FieldNumber = 6; - private bool hasOneofE2; - private global::Google.ProtocolBuffers.TestProtos.MyEnum oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - public bool HasOneofE2 { - get { return hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE2 { - get { return oneofE2_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _myMessageFieldNames; - if (hasE) { - output.WriteEnum(1, field_names[0], (int) E, E); - } - if (repeatedE_.Count > 0) { - output.WriteEnumArray(2, field_names[3], repeatedE_); - } - if (repeatedPackedE_.Count > 0) { - output.WritePackedEnumArray(3, field_names[4], repeatedPackedEMemoizedSerializedSize, repeatedPackedE_); - } - if (repeatedPackedUnexpectedE_.Count > 0) { - output.WriteEnumArray(4, field_names[5], repeatedPackedUnexpectedE_); - } - if (hasOneofE1) { - output.WriteEnum(5, field_names[1], (int) OneofE1, OneofE1); - } - if (hasOneofE2) { - output.WriteEnum(6, field_names[2], (int) OneofE2, OneofE2); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasE) { - size += pb::CodedOutputStream.ComputeEnumSize(1, (int) E); - } - { - int dataSize = 0; - if (repeatedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnum element in repeatedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * repeatedE_.Count; - } - } - { - int dataSize = 0; - if (repeatedPackedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnum element in repeatedPackedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1; - size += pb::CodedOutputStream.ComputeRawVarint32Size((uint) dataSize); - } - repeatedPackedEMemoizedSerializedSize = dataSize; - } - { - int dataSize = 0; - if (repeatedPackedUnexpectedE_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.MyEnum element in repeatedPackedUnexpectedE_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * repeatedPackedUnexpectedE_.Count; - } - } - if (hasOneofE1) { - size += pb::CodedOutputStream.ComputeEnumSize(5, (int) OneofE1); - } - if (hasOneofE2) { - size += pb::CodedOutputStream.ComputeEnumSize(6, (int) OneofE2); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static MyMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static MyMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static MyMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private MyMessage MakeReadOnly() { - repeatedE_.MakeReadOnly(); - repeatedPackedE_.MakeReadOnly(); - repeatedPackedUnexpectedE_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(MyMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(MyMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private MyMessage result; - - private MyMessage PrepareBuilder() { - if (resultIsReadOnly) { - MyMessage original = result; - result = new MyMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override MyMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessage.Descriptor; } - } - - public override MyMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.MyMessage.DefaultInstance; } - } - - public override MyMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is MyMessage) { - return MergeFrom((MyMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(MyMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.MyMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasE) { - E = other.E; - } - if (other.repeatedE_.Count != 0) { - result.repeatedE_.Add(other.repeatedE_); - } - if (other.repeatedPackedE_.Count != 0) { - result.repeatedPackedE_.Add(other.repeatedPackedE_); - } - if (other.repeatedPackedUnexpectedE_.Count != 0) { - result.repeatedPackedUnexpectedE_.Add(other.repeatedPackedUnexpectedE_); - } - if (other.HasOneofE1) { - OneofE1 = other.OneofE1; - } - if (other.HasOneofE2) { - OneofE2 = other.OneofE2; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_myMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _myMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - object unknown; - if(input.ReadEnum(ref result.e_, out unknown)) { - result.hasE = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(1, (ulong)(int)unknown); - } - break; - } - case 18: - case 16: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(2, (ulong)(int)rawValue); - } - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - case 34: - case 32: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.repeatedPackedUnexpectedE_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(4, (ulong)(int)rawValue); - } - break; - } - case 40: { - object unknown; - if(input.ReadEnum(ref result.oneofE1_, out unknown)) { - result.hasOneofE1 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(5, (ulong)(int)unknown); - } - break; - } - case 48: { - object unknown; - if(input.ReadEnum(ref result.oneofE2_, out unknown)) { - result.hasOneofE2 = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(6, (ulong)(int)unknown); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasE { - get { return result.hasE; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum E { - get { return result.E; } - set { SetE(value); } - } - public Builder SetE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasE = true; - result.e_ = value; - return this; - } - public Builder ClearE() { - PrepareBuilder(); - result.hasE = false; - result.e_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - - public pbc::IPopsicleList RepeatedEList { - get { return PrepareBuilder().repeatedE_; } - } - public int RepeatedECount { - get { return result.RepeatedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedE(int index) { - return result.GetRepeatedE(index); - } - public Builder SetRepeatedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedE_[index] = value; - return this; - } - public Builder AddRepeatedE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedE_.Add(values); - return this; - } - public Builder ClearRepeatedE() { - PrepareBuilder(); - result.repeatedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedEList { - get { return PrepareBuilder().repeatedPackedE_; } - } - public int RepeatedPackedECount { - get { return result.RepeatedPackedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedE(int index) { - return result.GetRepeatedPackedE(index); - } - public Builder SetRepeatedPackedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedE() { - PrepareBuilder(); - result.repeatedPackedE_.Clear(); - return this; - } - - public pbc::IPopsicleList RepeatedPackedUnexpectedEList { - get { return PrepareBuilder().repeatedPackedUnexpectedE_; } - } - public int RepeatedPackedUnexpectedECount { - get { return result.RepeatedPackedUnexpectedECount; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum GetRepeatedPackedUnexpectedE(int index) { - return result.GetRepeatedPackedUnexpectedE(index); - } - public Builder SetRepeatedPackedUnexpectedE(int index, global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_[index] = value; - return this; - } - public Builder AddRepeatedPackedUnexpectedE(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(value); - return this; - } - public Builder AddRangeRepeatedPackedUnexpectedE(scg::IEnumerable values) { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Add(values); - return this; - } - public Builder ClearRepeatedPackedUnexpectedE() { - PrepareBuilder(); - result.repeatedPackedUnexpectedE_.Clear(); - return this; - } - - public bool HasOneofE1 { - get { return result.hasOneofE1; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE1 { - get { return result.OneofE1; } - set { SetOneofE1(value); } - } - public Builder SetOneofE1(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasOneofE1 = true; - result.oneofE1_ = value; - return this; - } - public Builder ClearOneofE1() { - PrepareBuilder(); - result.hasOneofE1 = false; - result.oneofE1_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - - public bool HasOneofE2 { - get { return result.hasOneofE2; } - } - public global::Google.ProtocolBuffers.TestProtos.MyEnum OneofE2 { - get { return result.OneofE2; } - set { SetOneofE2(value); } - } - public Builder SetOneofE2(global::Google.ProtocolBuffers.TestProtos.MyEnum value) { - PrepareBuilder(); - result.hasOneofE2 = true; - result.oneofE2_ = value; - return this; - } - public Builder ClearOneofE2() { - PrepareBuilder(); - result.hasOneofE2 = false; - result.oneofE2_ = global::Google.ProtocolBuffers.TestProtos.MyEnum.FOO; - return this; - } - } - static MyMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestPreserveUnknownEnum2.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasXmltest.cs b/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasXmltest.cs deleted file mode 100644 index 70bdbfa9..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestExtrasXmltest.cs +++ /dev/null @@ -1,2277 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: unittest_extras_xmltest.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class UnittestExtrasXmltest { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - registry.Add(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionEnum); - registry.Add(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionText); - registry.Add(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionNumber); - registry.Add(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionMessage); - } - #endregion - #region Extensions - public const int ExtensionEnumFieldNumber = 101; - public static pb::GeneratedExtensionBase ExtensionEnum; - public const int ExtensionTextFieldNumber = 102; - public static pb::GeneratedExtensionBase ExtensionText; - public const int ExtensionNumberFieldNumber = 103; - public static pb::GeneratedExtensionBase> ExtensionNumber; - public const int ExtensionMessageFieldNumber = 199; - public static pb::GeneratedExtensionBase ExtensionMessage; - #endregion - - #region Static variables - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlChild__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlChild__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlNoFields__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlNoFields__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlRescursive__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlRescursive__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlMessage__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlMessage_Children__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlMessage_Children__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_protobuf_unittest_extra_TestXmlExtension__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_protobuf_unittest_extra_TestXmlExtension__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static UnittestExtrasXmltest() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "Ch11bml0dGVzdF9leHRyYXNfeG1sdGVzdC5wcm90bxIXcHJvdG9idWZfdW5p", - "dHRlc3RfZXh0cmEiVQoMVGVzdFhtbENoaWxkEjUKB29wdGlvbnMYAyADKA4y", - "JC5wcm90b2J1Zl91bml0dGVzdF9leHRyYS5FbnVtT3B0aW9ucxIOCgZiaW5h", - "cnkYBCABKAwiEQoPVGVzdFhtbE5vRmllbGRzIk4KEVRlc3RYbWxSZXNjdXJz", - "aXZlEjkKBWNoaWxkGAEgASgLMioucHJvdG9idWZfdW5pdHRlc3RfZXh0cmEu", - "VGVzdFhtbFJlc2N1cnNpdmUitwIKDlRlc3RYbWxNZXNzYWdlEg4KBm51bWJl", - "chgGIAEoAxIPCgdudW1iZXJzGAIgAygFEgwKBHRleHQYAyABKAkSEgoJdGV4", - "dGxpbmVzGLwFIAMoCRINCgV2YWxpZBgFIAEoCBI0CgVjaGlsZBgBIAEoCzIl", - "LnByb3RvYnVmX3VuaXR0ZXN0X2V4dHJhLlRlc3RYbWxDaGlsZBJDCghjaGls", - "ZHJlbhiRAyADKAoyMC5wcm90b2J1Zl91bml0dGVzdF9leHRyYS5UZXN0WG1s", - "TWVzc2FnZS5DaGlsZHJlbhpRCghDaGlsZHJlbhI1CgdvcHRpb25zGAMgAygO", - "MiQucHJvdG9idWZfdW5pdHRlc3RfZXh0cmEuRW51bU9wdGlvbnMSDgoGYmlu", - "YXJ5GAQgASgMKgUIZBDIASIiChBUZXN0WG1sRXh0ZW5zaW9uEg4KBm51bWJl", - "chgBIAIoBSoqCgtFbnVtT3B0aW9ucxIHCgNPTkUQABIHCgNUV08QARIJCgVU", - "SFJFRRACOmUKDmV4dGVuc2lvbl9lbnVtEicucHJvdG9idWZfdW5pdHRlc3Rf", - "ZXh0cmEuVGVzdFhtbE1lc3NhZ2UYZSABKA4yJC5wcm90b2J1Zl91bml0dGVz", - "dF9leHRyYS5FbnVtT3B0aW9uczo/Cg5leHRlbnNpb25fdGV4dBInLnByb3Rv", - "YnVmX3VuaXR0ZXN0X2V4dHJhLlRlc3RYbWxNZXNzYWdlGGYgASgJOkUKEGV4", - "dGVuc2lvbl9udW1iZXISJy5wcm90b2J1Zl91bml0dGVzdF9leHRyYS5UZXN0", - "WG1sTWVzc2FnZRhnIAMoBUICEAE6bgoRZXh0ZW5zaW9uX21lc3NhZ2USJy5w", - "cm90b2J1Zl91bml0dGVzdF9leHRyYS5UZXN0WG1sTWVzc2FnZRjHASABKAsy", - "KS5wcm90b2J1Zl91bml0dGVzdF9leHRyYS5UZXN0WG1sRXh0ZW5zaW9uQiZI", - "AaoCIUdvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFByb3Rvcw==")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_protobuf_unittest_extra_TestXmlChild__Descriptor = Descriptor.MessageTypes[0]; - internal__static_protobuf_unittest_extra_TestXmlChild__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlChild__Descriptor, - new string[] { "Options", "Binary", }); - internal__static_protobuf_unittest_extra_TestXmlNoFields__Descriptor = Descriptor.MessageTypes[1]; - internal__static_protobuf_unittest_extra_TestXmlNoFields__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlNoFields__Descriptor, - new string[] { }); - internal__static_protobuf_unittest_extra_TestXmlRescursive__Descriptor = Descriptor.MessageTypes[2]; - internal__static_protobuf_unittest_extra_TestXmlRescursive__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlRescursive__Descriptor, - new string[] { "Child", }); - internal__static_protobuf_unittest_extra_TestXmlMessage__Descriptor = Descriptor.MessageTypes[3]; - internal__static_protobuf_unittest_extra_TestXmlMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlMessage__Descriptor, - new string[] { "Number", "Numbers", "Text", "Textlines", "Valid", "Child", "Children", }); - internal__static_protobuf_unittest_extra_TestXmlMessage_Children__Descriptor = internal__static_protobuf_unittest_extra_TestXmlMessage__Descriptor.NestedTypes[0]; - internal__static_protobuf_unittest_extra_TestXmlMessage_Children__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlMessage_Children__Descriptor, - new string[] { "Options", "Binary", }); - internal__static_protobuf_unittest_extra_TestXmlExtension__Descriptor = Descriptor.MessageTypes[4]; - internal__static_protobuf_unittest_extra_TestXmlExtension__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_protobuf_unittest_extra_TestXmlExtension__Descriptor, - new string[] { "Number", }); - global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionEnum = pb::GeneratedSingleExtension.CreateInstance(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor.Extensions[0]); - global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionText = pb::GeneratedSingleExtension.CreateInstance(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor.Extensions[1]); - global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionNumber = pb::GeneratedRepeatExtension.CreateInstance(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor.Extensions[2]); - global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.ExtensionMessage = pb::GeneratedSingleExtension.CreateInstance(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor.Extensions[3]); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Enums - public enum EnumOptions { - ONE = 0, - TWO = 1, - THREE = 2, - } - - #endregion - - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestXmlChild : pb::GeneratedMessage { - private TestXmlChild() { } - private static readonly TestXmlChild defaultInstance = new TestXmlChild().MakeReadOnly(); - private static readonly string[] _testXmlChildFieldNames = new string[] { "binary", "options" }; - private static readonly uint[] _testXmlChildFieldTags = new uint[] { 34, 24 }; - public static TestXmlChild DefaultInstance { - get { return defaultInstance; } - } - - public override TestXmlChild DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestXmlChild ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlChild__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlChild__FieldAccessorTable; } - } - - public const int OptionsFieldNumber = 3; - private pbc::PopsicleList options_ = new pbc::PopsicleList(); - public scg::IList OptionsList { - get { return pbc::Lists.AsReadOnly(options_); } - } - public int OptionsCount { - get { return options_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.EnumOptions GetOptions(int index) { - return options_[index]; - } - - public const int BinaryFieldNumber = 4; - private bool hasBinary; - private pb::ByteString binary_ = pb::ByteString.Empty; - public bool HasBinary { - get { return hasBinary; } - } - public pb::ByteString Binary { - get { return binary_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testXmlChildFieldNames; - if (options_.Count > 0) { - output.WriteEnumArray(3, field_names[1], options_); - } - if (hasBinary) { - output.WriteBytes(4, field_names[0], Binary); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - { - int dataSize = 0; - if (options_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.EnumOptions element in options_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * options_.Count; - } - } - if (hasBinary) { - size += pb::CodedOutputStream.ComputeBytesSize(4, Binary); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestXmlChild ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlChild ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlChild ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlChild ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlChild ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlChild ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestXmlChild ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestXmlChild ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestXmlChild ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlChild ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestXmlChild MakeReadOnly() { - options_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestXmlChild prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestXmlChild cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestXmlChild result; - - private TestXmlChild PrepareBuilder() { - if (resultIsReadOnly) { - TestXmlChild original = result; - result = new TestXmlChild(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestXmlChild MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlChild.Descriptor; } - } - - public override TestXmlChild DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance; } - } - - public override TestXmlChild BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestXmlChild) { - return MergeFrom((TestXmlChild) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestXmlChild other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance) return this; - PrepareBuilder(); - if (other.options_.Count != 0) { - result.options_.Add(other.options_); - } - if (other.HasBinary) { - Binary = other.Binary; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testXmlChildFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testXmlChildFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.options_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - case 34: { - result.hasBinary = input.ReadBytes(ref result.binary_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public pbc::IPopsicleList OptionsList { - get { return PrepareBuilder().options_; } - } - public int OptionsCount { - get { return result.OptionsCount; } - } - public global::Google.ProtocolBuffers.TestProtos.EnumOptions GetOptions(int index) { - return result.GetOptions(index); - } - public Builder SetOptions(int index, global::Google.ProtocolBuffers.TestProtos.EnumOptions value) { - PrepareBuilder(); - result.options_[index] = value; - return this; - } - public Builder AddOptions(global::Google.ProtocolBuffers.TestProtos.EnumOptions value) { - PrepareBuilder(); - result.options_.Add(value); - return this; - } - public Builder AddRangeOptions(scg::IEnumerable values) { - PrepareBuilder(); - result.options_.Add(values); - return this; - } - public Builder ClearOptions() { - PrepareBuilder(); - result.options_.Clear(); - return this; - } - - public bool HasBinary { - get { return result.hasBinary; } - } - public pb::ByteString Binary { - get { return result.Binary; } - set { SetBinary(value); } - } - public Builder SetBinary(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasBinary = true; - result.binary_ = value; - return this; - } - public Builder ClearBinary() { - PrepareBuilder(); - result.hasBinary = false; - result.binary_ = pb::ByteString.Empty; - return this; - } - } - static TestXmlChild() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestXmlNoFields : pb::GeneratedMessage { - private TestXmlNoFields() { } - private static readonly TestXmlNoFields defaultInstance = new TestXmlNoFields().MakeReadOnly(); - private static readonly string[] _testXmlNoFieldsFieldNames = new string[] { }; - private static readonly uint[] _testXmlNoFieldsFieldTags = new uint[] { }; - public static TestXmlNoFields DefaultInstance { - get { return defaultInstance; } - } - - public override TestXmlNoFields DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestXmlNoFields ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlNoFields__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlNoFields__FieldAccessorTable; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testXmlNoFieldsFieldNames; - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestXmlNoFields ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestXmlNoFields ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestXmlNoFields ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlNoFields ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestXmlNoFields MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestXmlNoFields prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestXmlNoFields cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestXmlNoFields result; - - private TestXmlNoFields PrepareBuilder() { - if (resultIsReadOnly) { - TestXmlNoFields original = result; - result = new TestXmlNoFields(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestXmlNoFields MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlNoFields.Descriptor; } - } - - public override TestXmlNoFields DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlNoFields.DefaultInstance; } - } - - public override TestXmlNoFields BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestXmlNoFields) { - return MergeFrom((TestXmlNoFields) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestXmlNoFields other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlNoFields.DefaultInstance) return this; - PrepareBuilder(); - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testXmlNoFieldsFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testXmlNoFieldsFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - } - static TestXmlNoFields() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestXmlRescursive : pb::GeneratedMessage { - private TestXmlRescursive() { } - private static readonly TestXmlRescursive defaultInstance = new TestXmlRescursive().MakeReadOnly(); - private static readonly string[] _testXmlRescursiveFieldNames = new string[] { "child" }; - private static readonly uint[] _testXmlRescursiveFieldTags = new uint[] { 10 }; - public static TestXmlRescursive DefaultInstance { - get { return defaultInstance; } - } - - public override TestXmlRescursive DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestXmlRescursive ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlRescursive__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlRescursive__FieldAccessorTable; } - } - - public const int ChildFieldNumber = 1; - private bool hasChild; - private global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive child_; - public bool HasChild { - get { return hasChild; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive Child { - get { return child_ ?? global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testXmlRescursiveFieldNames; - if (hasChild) { - output.WriteMessage(1, field_names[0], Child); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasChild) { - size += pb::CodedOutputStream.ComputeMessageSize(1, Child); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestXmlRescursive ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestXmlRescursive ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestXmlRescursive ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlRescursive ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestXmlRescursive MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestXmlRescursive prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestXmlRescursive cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestXmlRescursive result; - - private TestXmlRescursive PrepareBuilder() { - if (resultIsReadOnly) { - TestXmlRescursive original = result; - result = new TestXmlRescursive(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestXmlRescursive MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.Descriptor; } - } - - public override TestXmlRescursive DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance; } - } - - public override TestXmlRescursive BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestXmlRescursive) { - return MergeFrom((TestXmlRescursive) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestXmlRescursive other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasChild) { - MergeChild(other.Child); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testXmlRescursiveFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testXmlRescursiveFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 10: { - global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.CreateBuilder(); - if (result.hasChild) { - subBuilder.MergeFrom(Child); - } - input.ReadMessage(subBuilder, extensionRegistry); - Child = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasChild { - get { return result.hasChild; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive Child { - get { return result.Child; } - set { SetChild(value); } - } - public Builder SetChild(global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasChild = true; - result.child_ = value; - return this; - } - public Builder SetChild(global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasChild = true; - result.child_ = builderForValue.Build(); - return this; - } - public Builder MergeChild(global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasChild && - result.child_ != global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.DefaultInstance) { - result.child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlRescursive.CreateBuilder(result.child_).MergeFrom(value).BuildPartial(); - } else { - result.child_ = value; - } - result.hasChild = true; - return this; - } - public Builder ClearChild() { - PrepareBuilder(); - result.hasChild = false; - result.child_ = null; - return this; - } - } - static TestXmlRescursive() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestXmlMessage : pb::ExtendableMessage { - private TestXmlMessage() { } - private static readonly TestXmlMessage defaultInstance = new TestXmlMessage().MakeReadOnly(); - private static readonly string[] _testXmlMessageFieldNames = new string[] { "child", "children", "number", "numbers", "text", "textlines", "valid" }; - private static readonly uint[] _testXmlMessageFieldTags = new uint[] { 10, 3211, 48, 16, 26, 5602, 40 }; - public static TestXmlMessage DefaultInstance { - get { return defaultInstance; } - } - - public override TestXmlMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestXmlMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlMessage__FieldAccessorTable; } - } - - #region Nested types - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class Types { - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Children : pb::GeneratedMessage { - private Children() { } - private static readonly Children defaultInstance = new Children().MakeReadOnly(); - private static readonly string[] _childrenFieldNames = new string[] { "binary", "options" }; - private static readonly uint[] _childrenFieldTags = new uint[] { 34, 24 }; - public static Children DefaultInstance { - get { return defaultInstance; } - } - - public override Children DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override Children ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlMessage_Children__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlMessage_Children__FieldAccessorTable; } - } - - public const int OptionsFieldNumber = 3; - private pbc::PopsicleList options_ = new pbc::PopsicleList(); - public scg::IList OptionsList { - get { return pbc::Lists.AsReadOnly(options_); } - } - public int OptionsCount { - get { return options_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.EnumOptions GetOptions(int index) { - return options_[index]; - } - - public const int BinaryFieldNumber = 4; - private bool hasBinary; - private pb::ByteString binary_ = pb::ByteString.Empty; - public bool HasBinary { - get { return hasBinary; } - } - public pb::ByteString Binary { - get { return binary_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _childrenFieldNames; - if (options_.Count > 0) { - output.WriteEnumArray(3, field_names[1], options_); - } - if (hasBinary) { - output.WriteBytes(4, field_names[0], Binary); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - { - int dataSize = 0; - if (options_.Count > 0) { - foreach (global::Google.ProtocolBuffers.TestProtos.EnumOptions element in options_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * options_.Count; - } - } - if (hasBinary) { - size += pb::CodedOutputStream.ComputeBytesSize(4, Binary); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static Children ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static Children ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static Children ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static Children ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static Children ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static Children ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static Children ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static Children ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static Children ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static Children ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private Children MakeReadOnly() { - options_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(Children prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(Children cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private Children result; - - private Children PrepareBuilder() { - if (resultIsReadOnly) { - Children original = result; - result = new Children(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override Children MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.Descriptor; } - } - - public override Children DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.DefaultInstance; } - } - - public override Children BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is Children) { - return MergeFrom((Children) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(Children other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.DefaultInstance) return this; - PrepareBuilder(); - if (other.options_.Count != 0) { - result.options_.Add(other.options_); - } - if (other.HasBinary) { - Binary = other.Binary; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_childrenFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _childrenFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.options_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - case 34: { - result.hasBinary = input.ReadBytes(ref result.binary_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public pbc::IPopsicleList OptionsList { - get { return PrepareBuilder().options_; } - } - public int OptionsCount { - get { return result.OptionsCount; } - } - public global::Google.ProtocolBuffers.TestProtos.EnumOptions GetOptions(int index) { - return result.GetOptions(index); - } - public Builder SetOptions(int index, global::Google.ProtocolBuffers.TestProtos.EnumOptions value) { - PrepareBuilder(); - result.options_[index] = value; - return this; - } - public Builder AddOptions(global::Google.ProtocolBuffers.TestProtos.EnumOptions value) { - PrepareBuilder(); - result.options_.Add(value); - return this; - } - public Builder AddRangeOptions(scg::IEnumerable values) { - PrepareBuilder(); - result.options_.Add(values); - return this; - } - public Builder ClearOptions() { - PrepareBuilder(); - result.options_.Clear(); - return this; - } - - public bool HasBinary { - get { return result.hasBinary; } - } - public pb::ByteString Binary { - get { return result.Binary; } - set { SetBinary(value); } - } - public Builder SetBinary(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasBinary = true; - result.binary_ = value; - return this; - } - public Builder ClearBinary() { - PrepareBuilder(); - result.hasBinary = false; - result.binary_ = pb::ByteString.Empty; - return this; - } - } - static Children() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - } - #endregion - - public const int NumberFieldNumber = 6; - private bool hasNumber; - private long number_; - public bool HasNumber { - get { return hasNumber; } - } - public long Number { - get { return number_; } - } - - public const int NumbersFieldNumber = 2; - private pbc::PopsicleList numbers_ = new pbc::PopsicleList(); - public scg::IList NumbersList { - get { return pbc::Lists.AsReadOnly(numbers_); } - } - public int NumbersCount { - get { return numbers_.Count; } - } - public int GetNumbers(int index) { - return numbers_[index]; - } - - public const int TextFieldNumber = 3; - private bool hasText; - private string text_ = ""; - public bool HasText { - get { return hasText; } - } - public string Text { - get { return text_; } - } - - public const int TextlinesFieldNumber = 700; - private pbc::PopsicleList textlines_ = new pbc::PopsicleList(); - public scg::IList TextlinesList { - get { return pbc::Lists.AsReadOnly(textlines_); } - } - public int TextlinesCount { - get { return textlines_.Count; } - } - public string GetTextlines(int index) { - return textlines_[index]; - } - - public const int ValidFieldNumber = 5; - private bool hasValid; - private bool valid_; - public bool HasValid { - get { return hasValid; } - } - public bool Valid { - get { return valid_; } - } - - public const int ChildFieldNumber = 1; - private bool hasChild; - private global::Google.ProtocolBuffers.TestProtos.TestXmlChild child_; - public bool HasChild { - get { return hasChild; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlChild Child { - get { return child_ ?? global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance; } - } - - public const int ChildrenFieldNumber = 401; - private pbc::PopsicleList children_ = new pbc::PopsicleList(); - public scg::IList ChildrenList { - get { return children_; } - } - public int ChildrenCount { - get { return children_.Count; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children GetChildren(int index) { - return children_[index]; - } - - public override bool IsInitialized { - get { - if (!ExtensionsAreInitialized) return false; - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testXmlMessageFieldNames; - pb::ExtendableMessage.ExtensionWriter extensionWriter = CreateExtensionWriter(this); - if (hasChild) { - output.WriteMessage(1, field_names[0], Child); - } - if (numbers_.Count > 0) { - output.WriteInt32Array(2, field_names[3], numbers_); - } - if (hasText) { - output.WriteString(3, field_names[4], Text); - } - if (hasValid) { - output.WriteBool(5, field_names[6], Valid); - } - if (hasNumber) { - output.WriteInt64(6, field_names[2], Number); - } - extensionWriter.WriteUntil(200, output); - if (children_.Count > 0) { - output.WriteGroupArray(401, field_names[1], children_); - } - if (textlines_.Count > 0) { - output.WriteStringArray(700, field_names[5], textlines_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasNumber) { - size += pb::CodedOutputStream.ComputeInt64Size(6, Number); - } - { - int dataSize = 0; - foreach (int element in NumbersList) { - dataSize += pb::CodedOutputStream.ComputeInt32SizeNoTag(element); - } - size += dataSize; - size += 1 * numbers_.Count; - } - if (hasText) { - size += pb::CodedOutputStream.ComputeStringSize(3, Text); - } - { - int dataSize = 0; - foreach (string element in TextlinesList) { - dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); - } - size += dataSize; - size += 2 * textlines_.Count; - } - if (hasValid) { - size += pb::CodedOutputStream.ComputeBoolSize(5, Valid); - } - if (hasChild) { - size += pb::CodedOutputStream.ComputeMessageSize(1, Child); - } - foreach (global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children element in ChildrenList) { - size += pb::CodedOutputStream.ComputeGroupSize(401, element); - } - size += ExtensionsSerializedSize; - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestXmlMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestXmlMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestXmlMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestXmlMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestXmlMessage MakeReadOnly() { - numbers_.MakeReadOnly(); - textlines_.MakeReadOnly(); - children_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestXmlMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::ExtendableBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestXmlMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestXmlMessage result; - - private TestXmlMessage PrepareBuilder() { - if (resultIsReadOnly) { - TestXmlMessage original = result; - result = new TestXmlMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestXmlMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Descriptor; } - } - - public override TestXmlMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.DefaultInstance; } - } - - public override TestXmlMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestXmlMessage) { - return MergeFrom((TestXmlMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestXmlMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasNumber) { - Number = other.Number; - } - if (other.numbers_.Count != 0) { - result.numbers_.Add(other.numbers_); - } - if (other.HasText) { - Text = other.Text; - } - if (other.textlines_.Count != 0) { - result.textlines_.Add(other.textlines_); - } - if (other.HasValid) { - Valid = other.Valid; - } - if (other.HasChild) { - MergeChild(other.Child); - } - if (other.children_.Count != 0) { - result.children_.Add(other.children_); - } - this.MergeExtensionFields(other); - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testXmlMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testXmlMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 10: { - global::Google.ProtocolBuffers.TestProtos.TestXmlChild.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestXmlChild.CreateBuilder(); - if (result.hasChild) { - subBuilder.MergeFrom(Child); - } - input.ReadMessage(subBuilder, extensionRegistry); - Child = subBuilder.BuildPartial(); - break; - } - case 18: - case 16: { - input.ReadInt32Array(tag, field_name, result.numbers_); - break; - } - case 26: { - result.hasText = input.ReadString(ref result.text_); - break; - } - case 40: { - result.hasValid = input.ReadBool(ref result.valid_); - break; - } - case 48: { - result.hasNumber = input.ReadInt64(ref result.number_); - break; - } - case 3211: { - input.ReadGroupArray(tag, field_name, result.children_, global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.DefaultInstance, extensionRegistry); - break; - } - case 5602: { - input.ReadStringArray(tag, field_name, result.textlines_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasNumber { - get { return result.hasNumber; } - } - public long Number { - get { return result.Number; } - set { SetNumber(value); } - } - public Builder SetNumber(long value) { - PrepareBuilder(); - result.hasNumber = true; - result.number_ = value; - return this; - } - public Builder ClearNumber() { - PrepareBuilder(); - result.hasNumber = false; - result.number_ = 0L; - return this; - } - - public pbc::IPopsicleList NumbersList { - get { return PrepareBuilder().numbers_; } - } - public int NumbersCount { - get { return result.NumbersCount; } - } - public int GetNumbers(int index) { - return result.GetNumbers(index); - } - public Builder SetNumbers(int index, int value) { - PrepareBuilder(); - result.numbers_[index] = value; - return this; - } - public Builder AddNumbers(int value) { - PrepareBuilder(); - result.numbers_.Add(value); - return this; - } - public Builder AddRangeNumbers(scg::IEnumerable values) { - PrepareBuilder(); - result.numbers_.Add(values); - return this; - } - public Builder ClearNumbers() { - PrepareBuilder(); - result.numbers_.Clear(); - return this; - } - - public bool HasText { - get { return result.hasText; } - } - public string Text { - get { return result.Text; } - set { SetText(value); } - } - public Builder SetText(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasText = true; - result.text_ = value; - return this; - } - public Builder ClearText() { - PrepareBuilder(); - result.hasText = false; - result.text_ = ""; - return this; - } - - public pbc::IPopsicleList TextlinesList { - get { return PrepareBuilder().textlines_; } - } - public int TextlinesCount { - get { return result.TextlinesCount; } - } - public string GetTextlines(int index) { - return result.GetTextlines(index); - } - public Builder SetTextlines(int index, string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.textlines_[index] = value; - return this; - } - public Builder AddTextlines(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.textlines_.Add(value); - return this; - } - public Builder AddRangeTextlines(scg::IEnumerable values) { - PrepareBuilder(); - result.textlines_.Add(values); - return this; - } - public Builder ClearTextlines() { - PrepareBuilder(); - result.textlines_.Clear(); - return this; - } - - public bool HasValid { - get { return result.hasValid; } - } - public bool Valid { - get { return result.Valid; } - set { SetValid(value); } - } - public Builder SetValid(bool value) { - PrepareBuilder(); - result.hasValid = true; - result.valid_ = value; - return this; - } - public Builder ClearValid() { - PrepareBuilder(); - result.hasValid = false; - result.valid_ = false; - return this; - } - - public bool HasChild { - get { return result.hasChild; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlChild Child { - get { return result.Child; } - set { SetChild(value); } - } - public Builder SetChild(global::Google.ProtocolBuffers.TestProtos.TestXmlChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasChild = true; - result.child_ = value; - return this; - } - public Builder SetChild(global::Google.ProtocolBuffers.TestProtos.TestXmlChild.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasChild = true; - result.child_ = builderForValue.Build(); - return this; - } - public Builder MergeChild(global::Google.ProtocolBuffers.TestProtos.TestXmlChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasChild && - result.child_ != global::Google.ProtocolBuffers.TestProtos.TestXmlChild.DefaultInstance) { - result.child_ = global::Google.ProtocolBuffers.TestProtos.TestXmlChild.CreateBuilder(result.child_).MergeFrom(value).BuildPartial(); - } else { - result.child_ = value; - } - result.hasChild = true; - return this; - } - public Builder ClearChild() { - PrepareBuilder(); - result.hasChild = false; - result.child_ = null; - return this; - } - - public pbc::IPopsicleList ChildrenList { - get { return PrepareBuilder().children_; } - } - public int ChildrenCount { - get { return result.ChildrenCount; } - } - public global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children GetChildren(int index) { - return result.GetChildren(index); - } - public Builder SetChildren(int index, global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.children_[index] = value; - return this; - } - public Builder SetChildren(int index, global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.children_[index] = builderForValue.Build(); - return this; - } - public Builder AddChildren(global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.children_.Add(value); - return this; - } - public Builder AddChildren(global::Google.ProtocolBuffers.TestProtos.TestXmlMessage.Types.Children.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.children_.Add(builderForValue.Build()); - return this; - } - public Builder AddRangeChildren(scg::IEnumerable values) { - PrepareBuilder(); - result.children_.Add(values); - return this; - } - public Builder ClearChildren() { - PrepareBuilder(); - result.children_.Clear(); - return this; - } - } - static TestXmlMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestXmlExtension : pb::GeneratedMessage { - private TestXmlExtension() { } - private static readonly TestXmlExtension defaultInstance = new TestXmlExtension().MakeReadOnly(); - private static readonly string[] _testXmlExtensionFieldNames = new string[] { "number" }; - private static readonly uint[] _testXmlExtensionFieldTags = new uint[] { 8 }; - public static TestXmlExtension DefaultInstance { - get { return defaultInstance; } - } - - public override TestXmlExtension DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestXmlExtension ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlExtension__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.internal__static_protobuf_unittest_extra_TestXmlExtension__FieldAccessorTable; } - } - - public const int NumberFieldNumber = 1; - private bool hasNumber; - private int number_; - public bool HasNumber { - get { return hasNumber; } - } - public int Number { - get { return number_; } - } - - public override bool IsInitialized { - get { - if (!hasNumber) return false; - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testXmlExtensionFieldNames; - if (hasNumber) { - output.WriteInt32(1, field_names[0], Number); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasNumber) { - size += pb::CodedOutputStream.ComputeInt32Size(1, Number); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestXmlExtension ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestXmlExtension ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestXmlExtension ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestXmlExtension ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestXmlExtension ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestXmlExtension MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestXmlExtension prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestXmlExtension cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestXmlExtension result; - - private TestXmlExtension PrepareBuilder() { - if (resultIsReadOnly) { - TestXmlExtension original = result; - result = new TestXmlExtension(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestXmlExtension MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlExtension.Descriptor; } - } - - public override TestXmlExtension DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.TestXmlExtension.DefaultInstance; } - } - - public override TestXmlExtension BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestXmlExtension) { - return MergeFrom((TestXmlExtension) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestXmlExtension other) { - if (other == global::Google.ProtocolBuffers.TestProtos.TestXmlExtension.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasNumber) { - Number = other.Number; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testXmlExtensionFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testXmlExtensionFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasNumber = input.ReadInt32(ref result.number_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasNumber { - get { return result.hasNumber; } - } - public int Number { - get { return result.Number; } - set { SetNumber(value); } - } - public Builder SetNumber(int value) { - PrepareBuilder(); - result.hasNumber = true; - result.number_ = value; - return this; - } - public Builder ClearNumber() { - PrepareBuilder(); - result.hasNumber = false; - result.number_ = 0; - return this; - } - } - static TestXmlExtension() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.UnittestExtrasXmltest.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestIssues.cs b/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestIssues.cs deleted file mode 100644 index e0bc151b..00000000 --- a/csharp/src/ProtocolBuffersLite.Test/TestProtos/UnittestIssues.cs +++ /dev/null @@ -1,3437 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: unittest_issues.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace UnitTest.Issues.TestProtos { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class UnittestIssues { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_unittest_issues_A__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_A__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_B__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_B__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_AB__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_AB__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_NumberField__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_NumberField__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_MyMessageAReferenceB__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_MyMessageAReferenceB__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_MyMessageBReferenceA__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_MyMessageBReferenceA__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_NegativeEnumMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_DeprecatedChild__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_unittest_issues_ItemField__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_unittest_issues_ItemField__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static UnittestIssues() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "ChV1bml0dGVzdF9pc3N1ZXMucHJvdG8SD3VuaXR0ZXN0X2lzc3VlcyIPCgFB", - "EgoKAl9BGAEgASgFIg8KAUISCgoCQl8YASABKAUiEQoCQUISCwoDYV9iGAEg", - "ASgFIhoKC051bWJlckZpZWxkEgsKA18wMRgBIAEoBSJMChRNeU1lc3NhZ2VB", - "UmVmZXJlbmNlQhI0CgV2YWx1ZRgBIAIoCzIlLnVuaXR0ZXN0X2lzc3Vlcy5N", - "eU1lc3NhZ2VCUmVmZXJlbmNlQSJMChRNeU1lc3NhZ2VCUmVmZXJlbmNlQRI0", - "CgV2YWx1ZRgBIAIoCzIlLnVuaXR0ZXN0X2lzc3Vlcy5NeU1lc3NhZ2VBUmVm", - "ZXJlbmNlQiKsAQoTTmVnYXRpdmVFbnVtTWVzc2FnZRIsCgV2YWx1ZRgBIAEo", - "DjIdLnVuaXR0ZXN0X2lzc3Vlcy5OZWdhdGl2ZUVudW0SLQoGdmFsdWVzGAIg", - "AygOMh0udW5pdHRlc3RfaXNzdWVzLk5lZ2F0aXZlRW51bRI4Cg1wYWNrZWRf", - "dmFsdWVzGAMgAygOMh0udW5pdHRlc3RfaXNzdWVzLk5lZ2F0aXZlRW51bUIC", - "EAEiEQoPRGVwcmVjYXRlZENoaWxkIrkCChdEZXByZWNhdGVkRmllbGRzTWVz", - "c2FnZRIaCg5QcmltaXRpdmVWYWx1ZRgBIAEoBUICGAESGgoOUHJpbWl0aXZl", - "QXJyYXkYAiADKAVCAhgBEjoKDE1lc3NhZ2VWYWx1ZRgDIAEoCzIgLnVuaXR0", - "ZXN0X2lzc3Vlcy5EZXByZWNhdGVkQ2hpbGRCAhgBEjoKDE1lc3NhZ2VBcnJh", - "eRgEIAMoCzIgLnVuaXR0ZXN0X2lzc3Vlcy5EZXByZWNhdGVkQ2hpbGRCAhgB", - "EjYKCUVudW1WYWx1ZRgFIAEoDjIfLnVuaXR0ZXN0X2lzc3Vlcy5EZXByZWNh", - "dGVkRW51bUICGAESNgoJRW51bUFycmF5GAYgAygOMh8udW5pdHRlc3RfaXNz", - "dWVzLkRlcHJlY2F0ZWRFbnVtQgIYASIZCglJdGVtRmllbGQSDAoEaXRlbRgB", - "IAEoBSpHCgxOZWdhdGl2ZUVudW0SFgoJRml2ZUJlbG93EPv//////////wES", - "FQoITWludXNPbmUQ////////////ARIICgRaZXJvEAAqGQoORGVwcmVjYXRl", - "ZEVudW0SBwoDb25lEAFCH0gBqgIaVW5pdFRlc3QuSXNzdWVzLlRlc3RQcm90", - "b3M=")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_unittest_issues_A__Descriptor = Descriptor.MessageTypes[0]; - internal__static_unittest_issues_A__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_A__Descriptor, - new string[] { "A_", }); - internal__static_unittest_issues_B__Descriptor = Descriptor.MessageTypes[1]; - internal__static_unittest_issues_B__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_B__Descriptor, - new string[] { "B_", }); - internal__static_unittest_issues_AB__Descriptor = Descriptor.MessageTypes[2]; - internal__static_unittest_issues_AB__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_AB__Descriptor, - new string[] { "AB_", }); - internal__static_unittest_issues_NumberField__Descriptor = Descriptor.MessageTypes[3]; - internal__static_unittest_issues_NumberField__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_NumberField__Descriptor, - new string[] { "01", }); - internal__static_unittest_issues_MyMessageAReferenceB__Descriptor = Descriptor.MessageTypes[4]; - internal__static_unittest_issues_MyMessageAReferenceB__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_MyMessageAReferenceB__Descriptor, - new string[] { "Value", }); - internal__static_unittest_issues_MyMessageBReferenceA__Descriptor = Descriptor.MessageTypes[5]; - internal__static_unittest_issues_MyMessageBReferenceA__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_MyMessageBReferenceA__Descriptor, - new string[] { "Value", }); - internal__static_unittest_issues_NegativeEnumMessage__Descriptor = Descriptor.MessageTypes[6]; - internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_NegativeEnumMessage__Descriptor, - new string[] { "Value", "Values", "PackedValues", }); - internal__static_unittest_issues_DeprecatedChild__Descriptor = Descriptor.MessageTypes[7]; - internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_DeprecatedChild__Descriptor, - new string[] { }); - internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor = Descriptor.MessageTypes[8]; - internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor, - new string[] { "PrimitiveValue", "PrimitiveArray", "MessageValue", "MessageArray", "EnumValue", "EnumArray", }); - internal__static_unittest_issues_ItemField__Descriptor = Descriptor.MessageTypes[9]; - internal__static_unittest_issues_ItemField__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_unittest_issues_ItemField__Descriptor, - new string[] { "Item", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Enums - public enum NegativeEnum { - FiveBelow = -5, - MinusOne = -1, - Zero = 0, - } - - public enum DeprecatedEnum { - one = 1, - } - - #endregion - - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class A : pb::GeneratedMessage { - private A() { } - private static readonly A defaultInstance = new A().MakeReadOnly(); - private static readonly string[] _aFieldNames = new string[] { "_A" }; - private static readonly uint[] _aFieldTags = new uint[] { 8 }; - public static A DefaultInstance { - get { return defaultInstance; } - } - - public override A DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override A ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_A__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_A__FieldAccessorTable; } - } - - public const int A_FieldNumber = 1; - private bool hasA_; - private int A_; - public bool HasA_ { - get { return hasA_; } - } - public int A_ { - get { return A_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _aFieldNames; - if (hasA_) { - output.WriteInt32(1, field_names[0], A_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasA_) { - size += pb::CodedOutputStream.ComputeInt32Size(1, A_); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static A ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static A ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static A ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static A ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static A ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static A ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static A ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static A ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static A ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static A ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private A MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(A prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(A cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private A result; - - private A PrepareBuilder() { - if (resultIsReadOnly) { - A original = result; - result = new A(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override A MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.A.Descriptor; } - } - - public override A DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.A.DefaultInstance; } - } - - public override A BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is A) { - return MergeFrom((A) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(A other) { - if (other == global::UnitTest.Issues.TestProtos.A.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasA_) { - A_ = other.A_; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_aFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _aFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasA_ = input.ReadInt32(ref result.A_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasA_ { - get { return result.hasA_; } - } - public int A_ { - get { return result.A_; } - set { SetA_(value); } - } - public Builder SetA_(int value) { - PrepareBuilder(); - result.hasA_ = true; - result.A_ = value; - return this; - } - public Builder ClearA_() { - PrepareBuilder(); - result.hasA_ = false; - result.A_ = 0; - return this; - } - } - static A() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class B : pb::GeneratedMessage { - private B() { } - private static readonly B defaultInstance = new B().MakeReadOnly(); - private static readonly string[] _bFieldNames = new string[] { "B_" }; - private static readonly uint[] _bFieldTags = new uint[] { 8 }; - public static B DefaultInstance { - get { return defaultInstance; } - } - - public override B DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override B ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_B__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_B__FieldAccessorTable; } - } - - public const int B_FieldNumber = 1; - private bool hasB_; - private int b_; - public bool HasB_ { - get { return hasB_; } - } - public int B_ { - get { return b_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _bFieldNames; - if (hasB_) { - output.WriteInt32(1, field_names[0], B_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasB_) { - size += pb::CodedOutputStream.ComputeInt32Size(1, B_); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static B ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static B ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static B ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static B ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static B ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static B ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static B ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static B ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static B ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static B ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private B MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(B prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(B cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private B result; - - private B PrepareBuilder() { - if (resultIsReadOnly) { - B original = result; - result = new B(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override B MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.B.Descriptor; } - } - - public override B DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.B.DefaultInstance; } - } - - public override B BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is B) { - return MergeFrom((B) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(B other) { - if (other == global::UnitTest.Issues.TestProtos.B.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasB_) { - B_ = other.B_; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_bFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _bFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasB_ = input.ReadInt32(ref result.b_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasB_ { - get { return result.hasB_; } - } - public int B_ { - get { return result.B_; } - set { SetB_(value); } - } - public Builder SetB_(int value) { - PrepareBuilder(); - result.hasB_ = true; - result.b_ = value; - return this; - } - public Builder ClearB_() { - PrepareBuilder(); - result.hasB_ = false; - result.b_ = 0; - return this; - } - } - static B() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class AB : pb::GeneratedMessage { - private AB() { } - private static readonly AB defaultInstance = new AB().MakeReadOnly(); - private static readonly string[] _aBFieldNames = new string[] { "a_b" }; - private static readonly uint[] _aBFieldTags = new uint[] { 8 }; - public static AB DefaultInstance { - get { return defaultInstance; } - } - - public override AB DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override AB ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_AB__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_AB__FieldAccessorTable; } - } - - public const int AB_FieldNumber = 1; - private bool hasAB_; - private int aB_; - public bool HasAB_ { - get { return hasAB_; } - } - public int AB_ { - get { return aB_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _aBFieldNames; - if (hasAB_) { - output.WriteInt32(1, field_names[0], AB_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasAB_) { - size += pb::CodedOutputStream.ComputeInt32Size(1, AB_); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static AB ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static AB ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static AB ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static AB ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static AB ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static AB ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static AB ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static AB ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static AB ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static AB ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private AB MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(AB prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(AB cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private AB result; - - private AB PrepareBuilder() { - if (resultIsReadOnly) { - AB original = result; - result = new AB(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override AB MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.AB.Descriptor; } - } - - public override AB DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.AB.DefaultInstance; } - } - - public override AB BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is AB) { - return MergeFrom((AB) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(AB other) { - if (other == global::UnitTest.Issues.TestProtos.AB.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasAB_) { - AB_ = other.AB_; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_aBFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _aBFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasAB_ = input.ReadInt32(ref result.aB_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasAB_ { - get { return result.hasAB_; } - } - public int AB_ { - get { return result.AB_; } - set { SetAB_(value); } - } - public Builder SetAB_(int value) { - PrepareBuilder(); - result.hasAB_ = true; - result.aB_ = value; - return this; - } - public Builder ClearAB_() { - PrepareBuilder(); - result.hasAB_ = false; - result.aB_ = 0; - return this; - } - } - static AB() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class NumberField : pb::GeneratedMessage { - private NumberField() { } - private static readonly NumberField defaultInstance = new NumberField().MakeReadOnly(); - private static readonly string[] _numberFieldFieldNames = new string[] { "_01" }; - private static readonly uint[] _numberFieldFieldTags = new uint[] { 8 }; - public static NumberField DefaultInstance { - get { return defaultInstance; } - } - - public override NumberField DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override NumberField ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NumberField__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NumberField__FieldAccessorTable; } - } - - public const int 01FieldNumber = 1; - private bool has01; - private int 01_; - public bool Has01 { - get { return has01; } - } - public int 01 { - get { return 01_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _numberFieldFieldNames; - if (has01) { - output.WriteInt32(1, field_names[0], 01); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (has01) { - size += pb::CodedOutputStream.ComputeInt32Size(1, 01); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static NumberField ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NumberField ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NumberField ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NumberField ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NumberField ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NumberField ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static NumberField ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static NumberField ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static NumberField ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NumberField ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private NumberField MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(NumberField prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(NumberField cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private NumberField result; - - private NumberField PrepareBuilder() { - if (resultIsReadOnly) { - NumberField original = result; - result = new NumberField(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override NumberField MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.NumberField.Descriptor; } - } - - public override NumberField DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.NumberField.DefaultInstance; } - } - - public override NumberField BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is NumberField) { - return MergeFrom((NumberField) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(NumberField other) { - if (other == global::UnitTest.Issues.TestProtos.NumberField.DefaultInstance) return this; - PrepareBuilder(); - if (other.Has01) { - 01 = other.01; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_numberFieldFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _numberFieldFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.has01 = input.ReadInt32(ref result.01_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool Has01 { - get { return result.has01; } - } - public int 01 { - get { return result.01; } - set { Set01(value); } - } - public Builder Set01(int value) { - PrepareBuilder(); - result.has01 = true; - result.01_ = value; - return this; - } - public Builder Clear01() { - PrepareBuilder(); - result.has01 = false; - result.01_ = 0; - return this; - } - } - static NumberField() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class MyMessageAReferenceB : pb::GeneratedMessage { - private MyMessageAReferenceB() { } - private static readonly MyMessageAReferenceB defaultInstance = new MyMessageAReferenceB().MakeReadOnly(); - private static readonly string[] _myMessageAReferenceBFieldNames = new string[] { "value" }; - private static readonly uint[] _myMessageAReferenceBFieldTags = new uint[] { 10 }; - public static MyMessageAReferenceB DefaultInstance { - get { return defaultInstance; } - } - - public override MyMessageAReferenceB DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override MyMessageAReferenceB ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_MyMessageAReferenceB__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_MyMessageAReferenceB__FieldAccessorTable; } - } - - public const int ValueFieldNumber = 1; - private bool hasValue; - private global::UnitTest.Issues.TestProtos.MyMessageBReferenceA value_; - public bool HasValue { - get { return hasValue; } - } - public global::UnitTest.Issues.TestProtos.MyMessageBReferenceA Value { - get { return value_ ?? global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.DefaultInstance; } - } - - public override bool IsInitialized { - get { - if (!hasValue) return false; - if (!Value.IsInitialized) return false; - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _myMessageAReferenceBFieldNames; - if (hasValue) { - output.WriteMessage(1, field_names[0], Value); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasValue) { - size += pb::CodedOutputStream.ComputeMessageSize(1, Value); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static MyMessageAReferenceB ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static MyMessageAReferenceB ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static MyMessageAReferenceB ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessageAReferenceB ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private MyMessageAReferenceB MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(MyMessageAReferenceB prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(MyMessageAReferenceB cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private MyMessageAReferenceB result; - - private MyMessageAReferenceB PrepareBuilder() { - if (resultIsReadOnly) { - MyMessageAReferenceB original = result; - result = new MyMessageAReferenceB(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override MyMessageAReferenceB MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.Descriptor; } - } - - public override MyMessageAReferenceB DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.DefaultInstance; } - } - - public override MyMessageAReferenceB BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is MyMessageAReferenceB) { - return MergeFrom((MyMessageAReferenceB) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(MyMessageAReferenceB other) { - if (other == global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasValue) { - MergeValue(other.Value); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_myMessageAReferenceBFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _myMessageAReferenceBFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 10: { - global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.Builder subBuilder = global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.CreateBuilder(); - if (result.hasValue) { - subBuilder.MergeFrom(Value); - } - input.ReadMessage(subBuilder, extensionRegistry); - Value = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasValue { - get { return result.hasValue; } - } - public global::UnitTest.Issues.TestProtos.MyMessageBReferenceA Value { - get { return result.Value; } - set { SetValue(value); } - } - public Builder SetValue(global::UnitTest.Issues.TestProtos.MyMessageBReferenceA value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasValue = true; - result.value_ = value; - return this; - } - public Builder SetValue(global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasValue = true; - result.value_ = builderForValue.Build(); - return this; - } - public Builder MergeValue(global::UnitTest.Issues.TestProtos.MyMessageBReferenceA value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasValue && - result.value_ != global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.DefaultInstance) { - result.value_ = global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.CreateBuilder(result.value_).MergeFrom(value).BuildPartial(); - } else { - result.value_ = value; - } - result.hasValue = true; - return this; - } - public Builder ClearValue() { - PrepareBuilder(); - result.hasValue = false; - result.value_ = null; - return this; - } - } - static MyMessageAReferenceB() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class MyMessageBReferenceA : pb::GeneratedMessage { - private MyMessageBReferenceA() { } - private static readonly MyMessageBReferenceA defaultInstance = new MyMessageBReferenceA().MakeReadOnly(); - private static readonly string[] _myMessageBReferenceAFieldNames = new string[] { "value" }; - private static readonly uint[] _myMessageBReferenceAFieldTags = new uint[] { 10 }; - public static MyMessageBReferenceA DefaultInstance { - get { return defaultInstance; } - } - - public override MyMessageBReferenceA DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override MyMessageBReferenceA ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_MyMessageBReferenceA__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_MyMessageBReferenceA__FieldAccessorTable; } - } - - public const int ValueFieldNumber = 1; - private bool hasValue; - private global::UnitTest.Issues.TestProtos.MyMessageAReferenceB value_; - public bool HasValue { - get { return hasValue; } - } - public global::UnitTest.Issues.TestProtos.MyMessageAReferenceB Value { - get { return value_ ?? global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.DefaultInstance; } - } - - public override bool IsInitialized { - get { - if (!hasValue) return false; - if (!Value.IsInitialized) return false; - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _myMessageBReferenceAFieldNames; - if (hasValue) { - output.WriteMessage(1, field_names[0], Value); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasValue) { - size += pb::CodedOutputStream.ComputeMessageSize(1, Value); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static MyMessageBReferenceA ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static MyMessageBReferenceA ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static MyMessageBReferenceA ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static MyMessageBReferenceA ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private MyMessageBReferenceA MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(MyMessageBReferenceA prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(MyMessageBReferenceA cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private MyMessageBReferenceA result; - - private MyMessageBReferenceA PrepareBuilder() { - if (resultIsReadOnly) { - MyMessageBReferenceA original = result; - result = new MyMessageBReferenceA(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override MyMessageBReferenceA MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.Descriptor; } - } - - public override MyMessageBReferenceA DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.DefaultInstance; } - } - - public override MyMessageBReferenceA BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is MyMessageBReferenceA) { - return MergeFrom((MyMessageBReferenceA) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(MyMessageBReferenceA other) { - if (other == global::UnitTest.Issues.TestProtos.MyMessageBReferenceA.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasValue) { - MergeValue(other.Value); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_myMessageBReferenceAFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _myMessageBReferenceAFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 10: { - global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.Builder subBuilder = global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.CreateBuilder(); - if (result.hasValue) { - subBuilder.MergeFrom(Value); - } - input.ReadMessage(subBuilder, extensionRegistry); - Value = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasValue { - get { return result.hasValue; } - } - public global::UnitTest.Issues.TestProtos.MyMessageAReferenceB Value { - get { return result.Value; } - set { SetValue(value); } - } - public Builder SetValue(global::UnitTest.Issues.TestProtos.MyMessageAReferenceB value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasValue = true; - result.value_ = value; - return this; - } - public Builder SetValue(global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasValue = true; - result.value_ = builderForValue.Build(); - return this; - } - public Builder MergeValue(global::UnitTest.Issues.TestProtos.MyMessageAReferenceB value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasValue && - result.value_ != global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.DefaultInstance) { - result.value_ = global::UnitTest.Issues.TestProtos.MyMessageAReferenceB.CreateBuilder(result.value_).MergeFrom(value).BuildPartial(); - } else { - result.value_ = value; - } - result.hasValue = true; - return this; - } - public Builder ClearValue() { - PrepareBuilder(); - result.hasValue = false; - result.value_ = null; - return this; - } - } - static MyMessageBReferenceA() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class NegativeEnumMessage : pb::GeneratedMessage { - private NegativeEnumMessage() { } - private static readonly NegativeEnumMessage defaultInstance = new NegativeEnumMessage().MakeReadOnly(); - private static readonly string[] _negativeEnumMessageFieldNames = new string[] { "packed_values", "value", "values" }; - private static readonly uint[] _negativeEnumMessageFieldTags = new uint[] { 26, 8, 16 }; - public static NegativeEnumMessage DefaultInstance { - get { return defaultInstance; } - } - - public override NegativeEnumMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override NegativeEnumMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NegativeEnumMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_NegativeEnumMessage__FieldAccessorTable; } - } - - public const int ValueFieldNumber = 1; - private bool hasValue; - private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.FiveBelow; - public bool HasValue { - get { return hasValue; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum Value { - get { return value_; } - } - - public const int ValuesFieldNumber = 2; - private pbc::PopsicleList values_ = new pbc::PopsicleList(); - public scg::IList ValuesList { - get { return pbc::Lists.AsReadOnly(values_); } - } - public int ValuesCount { - get { return values_.Count; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum GetValues(int index) { - return values_[index]; - } - - public const int PackedValuesFieldNumber = 3; - private int packedValuesMemoizedSerializedSize; - private pbc::PopsicleList packedValues_ = new pbc::PopsicleList(); - public scg::IList PackedValuesList { - get { return pbc::Lists.AsReadOnly(packedValues_); } - } - public int PackedValuesCount { - get { return packedValues_.Count; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum GetPackedValues(int index) { - return packedValues_[index]; - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _negativeEnumMessageFieldNames; - if (hasValue) { - output.WriteEnum(1, field_names[1], (int) Value, Value); - } - if (values_.Count > 0) { - output.WriteEnumArray(2, field_names[2], values_); - } - if (packedValues_.Count > 0) { - output.WritePackedEnumArray(3, field_names[0], packedValuesMemoizedSerializedSize, packedValues_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasValue) { - size += pb::CodedOutputStream.ComputeEnumSize(1, (int) Value); - } - { - int dataSize = 0; - if (values_.Count > 0) { - foreach (global::UnitTest.Issues.TestProtos.NegativeEnum element in values_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * values_.Count; - } - } - { - int dataSize = 0; - if (packedValues_.Count > 0) { - foreach (global::UnitTest.Issues.TestProtos.NegativeEnum element in packedValues_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1; - size += pb::CodedOutputStream.ComputeRawVarint32Size((uint) dataSize); - } - packedValuesMemoizedSerializedSize = dataSize; - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static NegativeEnumMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static NegativeEnumMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static NegativeEnumMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NegativeEnumMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private NegativeEnumMessage MakeReadOnly() { - values_.MakeReadOnly(); - packedValues_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(NegativeEnumMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(NegativeEnumMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private NegativeEnumMessage result; - - private NegativeEnumMessage PrepareBuilder() { - if (resultIsReadOnly) { - NegativeEnumMessage original = result; - result = new NegativeEnumMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override NegativeEnumMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.NegativeEnumMessage.Descriptor; } - } - - public override NegativeEnumMessage DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.NegativeEnumMessage.DefaultInstance; } - } - - public override NegativeEnumMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is NegativeEnumMessage) { - return MergeFrom((NegativeEnumMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(NegativeEnumMessage other) { - if (other == global::UnitTest.Issues.TestProtos.NegativeEnumMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasValue) { - Value = other.Value; - } - if (other.values_.Count != 0) { - result.values_.Add(other.values_); - } - if (other.packedValues_.Count != 0) { - result.packedValues_.Add(other.packedValues_); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_negativeEnumMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _negativeEnumMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - object unknown; - if(input.ReadEnum(ref result.value_, out unknown)) { - result.hasValue = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(1, (ulong)(int)unknown); - } - break; - } - case 18: - case 16: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.values_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(2, (ulong)(int)rawValue); - } - break; - } - case 26: - case 24: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.packedValues_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(3, (ulong)(int)rawValue); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasValue { - get { return result.hasValue; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum Value { - get { return result.Value; } - set { SetValue(value); } - } - public Builder SetValue(global::UnitTest.Issues.TestProtos.NegativeEnum value) { - PrepareBuilder(); - result.hasValue = true; - result.value_ = value; - return this; - } - public Builder ClearValue() { - PrepareBuilder(); - result.hasValue = false; - result.value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.FiveBelow; - return this; - } - - public pbc::IPopsicleList ValuesList { - get { return PrepareBuilder().values_; } - } - public int ValuesCount { - get { return result.ValuesCount; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum GetValues(int index) { - return result.GetValues(index); - } - public Builder SetValues(int index, global::UnitTest.Issues.TestProtos.NegativeEnum value) { - PrepareBuilder(); - result.values_[index] = value; - return this; - } - public Builder AddValues(global::UnitTest.Issues.TestProtos.NegativeEnum value) { - PrepareBuilder(); - result.values_.Add(value); - return this; - } - public Builder AddRangeValues(scg::IEnumerable values) { - PrepareBuilder(); - result.values_.Add(values); - return this; - } - public Builder ClearValues() { - PrepareBuilder(); - result.values_.Clear(); - return this; - } - - public pbc::IPopsicleList PackedValuesList { - get { return PrepareBuilder().packedValues_; } - } - public int PackedValuesCount { - get { return result.PackedValuesCount; } - } - public global::UnitTest.Issues.TestProtos.NegativeEnum GetPackedValues(int index) { - return result.GetPackedValues(index); - } - public Builder SetPackedValues(int index, global::UnitTest.Issues.TestProtos.NegativeEnum value) { - PrepareBuilder(); - result.packedValues_[index] = value; - return this; - } - public Builder AddPackedValues(global::UnitTest.Issues.TestProtos.NegativeEnum value) { - PrepareBuilder(); - result.packedValues_.Add(value); - return this; - } - public Builder AddRangePackedValues(scg::IEnumerable values) { - PrepareBuilder(); - result.packedValues_.Add(values); - return this; - } - public Builder ClearPackedValues() { - PrepareBuilder(); - result.packedValues_.Clear(); - return this; - } - } - static NegativeEnumMessage() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class DeprecatedChild : pb::GeneratedMessage { - private DeprecatedChild() { } - private static readonly DeprecatedChild defaultInstance = new DeprecatedChild().MakeReadOnly(); - private static readonly string[] _deprecatedChildFieldNames = new string[] { }; - private static readonly uint[] _deprecatedChildFieldTags = new uint[] { }; - public static DeprecatedChild DefaultInstance { - get { return defaultInstance; } - } - - public override DeprecatedChild DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override DeprecatedChild ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedChild__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedChild__FieldAccessorTable; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _deprecatedChildFieldNames; - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static DeprecatedChild ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static DeprecatedChild ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static DeprecatedChild ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static DeprecatedChild ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static DeprecatedChild ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private DeprecatedChild MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(DeprecatedChild prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(DeprecatedChild cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private DeprecatedChild result; - - private DeprecatedChild PrepareBuilder() { - if (resultIsReadOnly) { - DeprecatedChild original = result; - result = new DeprecatedChild(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override DeprecatedChild MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.DeprecatedChild.Descriptor; } - } - - public override DeprecatedChild DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance; } - } - - public override DeprecatedChild BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is DeprecatedChild) { - return MergeFrom((DeprecatedChild) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(DeprecatedChild other) { - if (other == global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance) return this; - PrepareBuilder(); - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_deprecatedChildFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _deprecatedChildFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - } - static DeprecatedChild() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class DeprecatedFieldsMessage : pb::GeneratedMessage { - private DeprecatedFieldsMessage() { } - private static readonly DeprecatedFieldsMessage defaultInstance = new DeprecatedFieldsMessage().MakeReadOnly(); - private static readonly string[] _deprecatedFieldsMessageFieldNames = new string[] { "EnumArray", "EnumValue", "MessageArray", "MessageValue", "PrimitiveArray", "PrimitiveValue" }; - private static readonly uint[] _deprecatedFieldsMessageFieldTags = new uint[] { 48, 40, 34, 26, 16, 8 }; - public static DeprecatedFieldsMessage DefaultInstance { - get { return defaultInstance; } - } - - public override DeprecatedFieldsMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override DeprecatedFieldsMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedFieldsMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_DeprecatedFieldsMessage__FieldAccessorTable; } - } - - public const int PrimitiveValueFieldNumber = 1; - private bool hasPrimitiveValue; - private int primitiveValue_; - [global::System.ObsoleteAttribute()] - public bool HasPrimitiveValue { - get { return hasPrimitiveValue; } - } - [global::System.ObsoleteAttribute()] - public int PrimitiveValue { - get { return primitiveValue_; } - } - - public const int PrimitiveArrayFieldNumber = 2; - private pbc::PopsicleList primitiveArray_ = new pbc::PopsicleList(); - [global::System.ObsoleteAttribute()] - public scg::IList PrimitiveArrayList { - get { return pbc::Lists.AsReadOnly(primitiveArray_); } - } - [global::System.ObsoleteAttribute()] - public int PrimitiveArrayCount { - get { return primitiveArray_.Count; } - } - [global::System.ObsoleteAttribute()] - public int GetPrimitiveArray(int index) { - return primitiveArray_[index]; - } - - public const int MessageValueFieldNumber = 3; - private bool hasMessageValue; - private global::UnitTest.Issues.TestProtos.DeprecatedChild messageValue_; - [global::System.ObsoleteAttribute()] - public bool HasMessageValue { - get { return hasMessageValue; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue { - get { return messageValue_ ?? global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance; } - } - - public const int MessageArrayFieldNumber = 4; - private pbc::PopsicleList messageArray_ = new pbc::PopsicleList(); - [global::System.ObsoleteAttribute()] - public scg::IList MessageArrayList { - get { return messageArray_; } - } - [global::System.ObsoleteAttribute()] - public int MessageArrayCount { - get { return messageArray_.Count; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedChild GetMessageArray(int index) { - return messageArray_[index]; - } - - public const int EnumValueFieldNumber = 5; - private bool hasEnumValue; - private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.one; - [global::System.ObsoleteAttribute()] - public bool HasEnumValue { - get { return hasEnumValue; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { - get { return enumValue_; } - } - - public const int EnumArrayFieldNumber = 6; - private pbc::PopsicleList enumArray_ = new pbc::PopsicleList(); - [global::System.ObsoleteAttribute()] - public scg::IList EnumArrayList { - get { return pbc::Lists.AsReadOnly(enumArray_); } - } - [global::System.ObsoleteAttribute()] - public int EnumArrayCount { - get { return enumArray_.Count; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedEnum GetEnumArray(int index) { - return enumArray_[index]; - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _deprecatedFieldsMessageFieldNames; - if (hasPrimitiveValue) { - output.WriteInt32(1, field_names[5], PrimitiveValue); - } - if (primitiveArray_.Count > 0) { - output.WriteInt32Array(2, field_names[4], primitiveArray_); - } - if (hasMessageValue) { - output.WriteMessage(3, field_names[3], MessageValue); - } - if (messageArray_.Count > 0) { - output.WriteMessageArray(4, field_names[2], messageArray_); - } - if (hasEnumValue) { - output.WriteEnum(5, field_names[1], (int) EnumValue, EnumValue); - } - if (enumArray_.Count > 0) { - output.WriteEnumArray(6, field_names[0], enumArray_); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasPrimitiveValue) { - size += pb::CodedOutputStream.ComputeInt32Size(1, PrimitiveValue); - } - { - int dataSize = 0; - foreach (int element in PrimitiveArrayList) { - dataSize += pb::CodedOutputStream.ComputeInt32SizeNoTag(element); - } - size += dataSize; - size += 1 * primitiveArray_.Count; - } - if (hasMessageValue) { - size += pb::CodedOutputStream.ComputeMessageSize(3, MessageValue); - } - foreach (global::UnitTest.Issues.TestProtos.DeprecatedChild element in MessageArrayList) { - size += pb::CodedOutputStream.ComputeMessageSize(4, element); - } - if (hasEnumValue) { - size += pb::CodedOutputStream.ComputeEnumSize(5, (int) EnumValue); - } - { - int dataSize = 0; - if (enumArray_.Count > 0) { - foreach (global::UnitTest.Issues.TestProtos.DeprecatedEnum element in enumArray_) { - dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); - } - size += dataSize; - size += 1 * enumArray_.Count; - } - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static DeprecatedFieldsMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static DeprecatedFieldsMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private DeprecatedFieldsMessage MakeReadOnly() { - primitiveArray_.MakeReadOnly(); - messageArray_.MakeReadOnly(); - enumArray_.MakeReadOnly(); - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(DeprecatedFieldsMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(DeprecatedFieldsMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private DeprecatedFieldsMessage result; - - private DeprecatedFieldsMessage PrepareBuilder() { - if (resultIsReadOnly) { - DeprecatedFieldsMessage original = result; - result = new DeprecatedFieldsMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override DeprecatedFieldsMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.Descriptor; } - } - - public override DeprecatedFieldsMessage DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.DefaultInstance; } - } - - public override DeprecatedFieldsMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is DeprecatedFieldsMessage) { - return MergeFrom((DeprecatedFieldsMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(DeprecatedFieldsMessage other) { - if (other == global::UnitTest.Issues.TestProtos.DeprecatedFieldsMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasPrimitiveValue) { - PrimitiveValue = other.PrimitiveValue; - } - if (other.primitiveArray_.Count != 0) { - result.primitiveArray_.Add(other.primitiveArray_); - } - if (other.HasMessageValue) { - MergeMessageValue(other.MessageValue); - } - if (other.messageArray_.Count != 0) { - result.messageArray_.Add(other.messageArray_); - } - if (other.HasEnumValue) { - EnumValue = other.EnumValue; - } - if (other.enumArray_.Count != 0) { - result.enumArray_.Add(other.enumArray_); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_deprecatedFieldsMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _deprecatedFieldsMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasPrimitiveValue = input.ReadInt32(ref result.primitiveValue_); - break; - } - case 18: - case 16: { - input.ReadInt32Array(tag, field_name, result.primitiveArray_); - break; - } - case 26: { - global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder subBuilder = global::UnitTest.Issues.TestProtos.DeprecatedChild.CreateBuilder(); - if (result.hasMessageValue) { - subBuilder.MergeFrom(MessageValue); - } - input.ReadMessage(subBuilder, extensionRegistry); - MessageValue = subBuilder.BuildPartial(); - break; - } - case 34: { - input.ReadMessageArray(tag, field_name, result.messageArray_, global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance, extensionRegistry); - break; - } - case 40: { - object unknown; - if(input.ReadEnum(ref result.enumValue_, out unknown)) { - result.hasEnumValue = true; - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(5, (ulong)(int)unknown); - } - break; - } - case 50: - case 48: { - scg::ICollection unknownItems; - input.ReadEnumArray(tag, field_name, result.enumArray_, out unknownItems); - if (unknownItems != null) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - foreach (object rawValue in unknownItems) - if (rawValue is int) - unknownFields.MergeVarintField(6, (ulong)(int)rawValue); - } - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - [global::System.ObsoleteAttribute()] - public bool HasPrimitiveValue { - get { return result.hasPrimitiveValue; } - } - [global::System.ObsoleteAttribute()] - public int PrimitiveValue { - get { return result.PrimitiveValue; } - set { SetPrimitiveValue(value); } - } - [global::System.ObsoleteAttribute()] - public Builder SetPrimitiveValue(int value) { - PrepareBuilder(); - result.hasPrimitiveValue = true; - result.primitiveValue_ = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearPrimitiveValue() { - PrepareBuilder(); - result.hasPrimitiveValue = false; - result.primitiveValue_ = 0; - return this; - } - - [global::System.ObsoleteAttribute()] - public pbc::IPopsicleList PrimitiveArrayList { - get { return PrepareBuilder().primitiveArray_; } - } - [global::System.ObsoleteAttribute()] - public int PrimitiveArrayCount { - get { return result.PrimitiveArrayCount; } - } - [global::System.ObsoleteAttribute()] - public int GetPrimitiveArray(int index) { - return result.GetPrimitiveArray(index); - } - [global::System.ObsoleteAttribute()] - public Builder SetPrimitiveArray(int index, int value) { - PrepareBuilder(); - result.primitiveArray_[index] = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddPrimitiveArray(int value) { - PrepareBuilder(); - result.primitiveArray_.Add(value); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddRangePrimitiveArray(scg::IEnumerable values) { - PrepareBuilder(); - result.primitiveArray_.Add(values); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearPrimitiveArray() { - PrepareBuilder(); - result.primitiveArray_.Clear(); - return this; - } - - [global::System.ObsoleteAttribute()] - public bool HasMessageValue { - get { return result.hasMessageValue; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedChild MessageValue { - get { return result.MessageValue; } - set { SetMessageValue(value); } - } - [global::System.ObsoleteAttribute()] - public Builder SetMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasMessageValue = true; - result.messageValue_ = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder SetMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasMessageValue = true; - result.messageValue_ = builderForValue.Build(); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder MergeMessageValue(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasMessageValue && - result.messageValue_ != global::UnitTest.Issues.TestProtos.DeprecatedChild.DefaultInstance) { - result.messageValue_ = global::UnitTest.Issues.TestProtos.DeprecatedChild.CreateBuilder(result.messageValue_).MergeFrom(value).BuildPartial(); - } else { - result.messageValue_ = value; - } - result.hasMessageValue = true; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearMessageValue() { - PrepareBuilder(); - result.hasMessageValue = false; - result.messageValue_ = null; - return this; - } - - [global::System.ObsoleteAttribute()] - public pbc::IPopsicleList MessageArrayList { - get { return PrepareBuilder().messageArray_; } - } - [global::System.ObsoleteAttribute()] - public int MessageArrayCount { - get { return result.MessageArrayCount; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedChild GetMessageArray(int index) { - return result.GetMessageArray(index); - } - [global::System.ObsoleteAttribute()] - public Builder SetMessageArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.messageArray_[index] = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder SetMessageArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.messageArray_[index] = builderForValue.Build(); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddMessageArray(global::UnitTest.Issues.TestProtos.DeprecatedChild value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.messageArray_.Add(value); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddMessageArray(global::UnitTest.Issues.TestProtos.DeprecatedChild.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.messageArray_.Add(builderForValue.Build()); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddRangeMessageArray(scg::IEnumerable values) { - PrepareBuilder(); - result.messageArray_.Add(values); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearMessageArray() { - PrepareBuilder(); - result.messageArray_.Clear(); - return this; - } - - [global::System.ObsoleteAttribute()] - public bool HasEnumValue { - get { return result.hasEnumValue; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { - get { return result.EnumValue; } - set { SetEnumValue(value); } - } - [global::System.ObsoleteAttribute()] - public Builder SetEnumValue(global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { - PrepareBuilder(); - result.hasEnumValue = true; - result.enumValue_ = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearEnumValue() { - PrepareBuilder(); - result.hasEnumValue = false; - result.enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.one; - return this; - } - - [global::System.ObsoleteAttribute()] - public pbc::IPopsicleList EnumArrayList { - get { return PrepareBuilder().enumArray_; } - } - [global::System.ObsoleteAttribute()] - public int EnumArrayCount { - get { return result.EnumArrayCount; } - } - [global::System.ObsoleteAttribute()] - public global::UnitTest.Issues.TestProtos.DeprecatedEnum GetEnumArray(int index) { - return result.GetEnumArray(index); - } - [global::System.ObsoleteAttribute()] - public Builder SetEnumArray(int index, global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { - PrepareBuilder(); - result.enumArray_[index] = value; - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddEnumArray(global::UnitTest.Issues.TestProtos.DeprecatedEnum value) { - PrepareBuilder(); - result.enumArray_.Add(value); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder AddRangeEnumArray(scg::IEnumerable values) { - PrepareBuilder(); - result.enumArray_.Add(values); - return this; - } - [global::System.ObsoleteAttribute()] - public Builder ClearEnumArray() { - PrepareBuilder(); - result.enumArray_.Clear(); - return this; - } - } - static DeprecatedFieldsMessage() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class ItemField : pb::GeneratedMessage { - private ItemField() { } - private static readonly ItemField defaultInstance = new ItemField().MakeReadOnly(); - private static readonly string[] _itemFieldFieldNames = new string[] { "item" }; - private static readonly uint[] _itemFieldFieldTags = new uint[] { 8 }; - public static ItemField DefaultInstance { - get { return defaultInstance; } - } - - public override ItemField DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override ItemField ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_ItemField__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::UnitTest.Issues.TestProtos.UnittestIssues.internal__static_unittest_issues_ItemField__FieldAccessorTable; } - } - - public const int ItemFieldNumber = 1; - private bool hasItem; - private int item_; - public bool HasItem { - get { return hasItem; } - } - public int Item { - get { return item_; } - } - - public override bool IsInitialized { - get { - return true; - } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _itemFieldFieldNames; - if (hasItem) { - output.WriteInt32(1, field_names[0], Item); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (hasItem) { - size += pb::CodedOutputStream.ComputeInt32Size(1, Item); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static ItemField ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static ItemField ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static ItemField ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static ItemField ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static ItemField ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static ItemField ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static ItemField ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static ItemField ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static ItemField ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static ItemField ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private ItemField MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(ItemField prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(ItemField cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private ItemField result; - - private ItemField PrepareBuilder() { - if (resultIsReadOnly) { - ItemField original = result; - result = new ItemField(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override ItemField MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::UnitTest.Issues.TestProtos.ItemField.Descriptor; } - } - - public override ItemField DefaultInstanceForType { - get { return global::UnitTest.Issues.TestProtos.ItemField.DefaultInstance; } - } - - public override ItemField BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is ItemField) { - return MergeFrom((ItemField) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(ItemField other) { - if (other == global::UnitTest.Issues.TestProtos.ItemField.DefaultInstance) return this; - PrepareBuilder(); - if (other.HasItem) { - Item = other.Item; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_itemFieldFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _itemFieldFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - result.hasItem = input.ReadInt32(ref result.item_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public bool HasItem { - get { return result.hasItem; } - } - public int Item { - get { return result.Item; } - set { SetItem(value); } - } - public Builder SetItem(int value) { - PrepareBuilder(); - result.hasItem = true; - result.item_ = value; - return this; - } - public Builder ClearItem() { - PrepareBuilder(); - result.hasItem = false; - result.item_ = 0; - return this; - } - } - static ItemField() { - object.ReferenceEquals(global::UnitTest.Issues.TestProtos.UnittestIssues.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code -- cgit v1.2.3 From 6f7a782934c51a5fbcc3d6b25bf5a340ce86635b Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 12 May 2015 21:54:23 -0700 Subject: Regenerated UnittestDropUnknownFields.cs --- .../TestProtos/UnittestDropUnknownFields.cs | 95 ++++------------------ 1 file changed, 18 insertions(+), 77 deletions(-) (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs index 90e14640..3939c9a4 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs @@ -103,38 +103,24 @@ namespace Google.ProtocolBuffers.TestProtos { #endregion public const int Int32ValueFieldNumber = 1; - private bool hasInt32Value; private int int32Value_; - public bool HasInt32Value { - get { return hasInt32Value; } - } public int Int32Value { get { return int32Value_; } } public const int EnumValueFieldNumber = 2; - private bool hasEnumValue; private global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum enumValue_ = global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum.FOO; - public bool HasEnumValue { - get { return hasEnumValue; } - } public global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum EnumValue { get { return enumValue_; } } - public override bool IsInitialized { - get { - return true; - } - } - public override void WriteTo(pb::ICodedOutputStream output) { CalcSerializedSize(); string[] field_names = _fooFieldNames; - if (hasInt32Value) { + if (Int32Value != 0) { output.WriteInt32(1, field_names[1], Int32Value); } - if (hasEnumValue) { + if (EnumValue != global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum.FOO) { output.WriteEnum(2, field_names[0], (int) EnumValue, EnumValue); } UnknownFields.WriteTo(output); @@ -154,10 +140,10 @@ namespace Google.ProtocolBuffers.TestProtos { if (size != -1) return size; size = 0; - if (hasInt32Value) { + if (Int32Value != 0) { size += pb::CodedOutputStream.ComputeInt32Size(1, Int32Value); } - if (hasEnumValue) { + if (EnumValue != global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum.FOO) { size += pb::CodedOutputStream.ComputeEnumSize(2, (int) EnumValue); } size += UnknownFields.SerializedSize; @@ -282,10 +268,10 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(Foo other) { if (other == global::Google.ProtocolBuffers.TestProtos.Foo.DefaultInstance) return this; PrepareBuilder(); - if (other.HasInt32Value) { + if (other.Int32Value != 0) { Int32Value = other.Int32Value; } - if (other.HasEnumValue) { + if (other.EnumValue != global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum.FOO) { EnumValue = other.EnumValue; } this.MergeUnknownFields(other.UnknownFields); @@ -332,13 +318,12 @@ namespace Google.ProtocolBuffers.TestProtos { break; } case 8: { - result.hasInt32Value = input.ReadInt32(ref result.int32Value_); + input.ReadInt32(ref result.int32Value_); break; } case 16: { object unknown; if(input.ReadEnum(ref result.enumValue_, out unknown)) { - result.hasEnumValue = true; } else if(unknown is int) { if (unknownFields == null) { unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); @@ -357,42 +342,32 @@ namespace Google.ProtocolBuffers.TestProtos { } - public bool HasInt32Value { - get { return result.hasInt32Value; } - } public int Int32Value { get { return result.Int32Value; } set { SetInt32Value(value); } } public Builder SetInt32Value(int value) { PrepareBuilder(); - result.hasInt32Value = true; result.int32Value_ = value; return this; } public Builder ClearInt32Value() { PrepareBuilder(); - result.hasInt32Value = false; result.int32Value_ = 0; return this; } - public bool HasEnumValue { - get { return result.hasEnumValue; } - } public global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum EnumValue { get { return result.EnumValue; } set { SetEnumValue(value); } } public Builder SetEnumValue(global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum value) { PrepareBuilder(); - result.hasEnumValue = true; result.enumValue_ = value; return this; } public Builder ClearEnumValue() { PrepareBuilder(); - result.hasEnumValue = false; result.enumValue_ = global::Google.ProtocolBuffers.TestProtos.Foo.Types.NestedEnum.FOO; return this; } @@ -442,51 +417,33 @@ namespace Google.ProtocolBuffers.TestProtos { #endregion public const int Int32ValueFieldNumber = 1; - private bool hasInt32Value; private int int32Value_; - public bool HasInt32Value { - get { return hasInt32Value; } - } public int Int32Value { get { return int32Value_; } } public const int EnumValueFieldNumber = 2; - private bool hasEnumValue; private global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum enumValue_ = global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum.FOO; - public bool HasEnumValue { - get { return hasEnumValue; } - } public global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum EnumValue { get { return enumValue_; } } public const int ExtraInt32ValueFieldNumber = 3; - private bool hasExtraInt32Value; private int extraInt32Value_; - public bool HasExtraInt32Value { - get { return hasExtraInt32Value; } - } public int ExtraInt32Value { get { return extraInt32Value_; } } - public override bool IsInitialized { - get { - return true; - } - } - public override void WriteTo(pb::ICodedOutputStream output) { CalcSerializedSize(); string[] field_names = _fooWithExtraFieldsFieldNames; - if (hasInt32Value) { + if (Int32Value != 0) { output.WriteInt32(1, field_names[2], Int32Value); } - if (hasEnumValue) { + if (EnumValue != global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum.FOO) { output.WriteEnum(2, field_names[0], (int) EnumValue, EnumValue); } - if (hasExtraInt32Value) { + if (ExtraInt32Value != 0) { output.WriteInt32(3, field_names[1], ExtraInt32Value); } UnknownFields.WriteTo(output); @@ -506,13 +463,13 @@ namespace Google.ProtocolBuffers.TestProtos { if (size != -1) return size; size = 0; - if (hasInt32Value) { + if (Int32Value != 0) { size += pb::CodedOutputStream.ComputeInt32Size(1, Int32Value); } - if (hasEnumValue) { + if (EnumValue != global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum.FOO) { size += pb::CodedOutputStream.ComputeEnumSize(2, (int) EnumValue); } - if (hasExtraInt32Value) { + if (ExtraInt32Value != 0) { size += pb::CodedOutputStream.ComputeInt32Size(3, ExtraInt32Value); } size += UnknownFields.SerializedSize; @@ -637,13 +594,13 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(FooWithExtraFields other) { if (other == global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.DefaultInstance) return this; PrepareBuilder(); - if (other.HasInt32Value) { + if (other.Int32Value != 0) { Int32Value = other.Int32Value; } - if (other.HasEnumValue) { + if (other.EnumValue != global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum.FOO) { EnumValue = other.EnumValue; } - if (other.HasExtraInt32Value) { + if (other.ExtraInt32Value != 0) { ExtraInt32Value = other.ExtraInt32Value; } this.MergeUnknownFields(other.UnknownFields); @@ -690,13 +647,12 @@ namespace Google.ProtocolBuffers.TestProtos { break; } case 8: { - result.hasInt32Value = input.ReadInt32(ref result.int32Value_); + input.ReadInt32(ref result.int32Value_); break; } case 16: { object unknown; if(input.ReadEnum(ref result.enumValue_, out unknown)) { - result.hasEnumValue = true; } else if(unknown is int) { if (unknownFields == null) { unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); @@ -706,7 +662,7 @@ namespace Google.ProtocolBuffers.TestProtos { break; } case 24: { - result.hasExtraInt32Value = input.ReadInt32(ref result.extraInt32Value_); + input.ReadInt32(ref result.extraInt32Value_); break; } } @@ -719,62 +675,47 @@ namespace Google.ProtocolBuffers.TestProtos { } - public bool HasInt32Value { - get { return result.hasInt32Value; } - } public int Int32Value { get { return result.Int32Value; } set { SetInt32Value(value); } } public Builder SetInt32Value(int value) { PrepareBuilder(); - result.hasInt32Value = true; result.int32Value_ = value; return this; } public Builder ClearInt32Value() { PrepareBuilder(); - result.hasInt32Value = false; result.int32Value_ = 0; return this; } - public bool HasEnumValue { - get { return result.hasEnumValue; } - } public global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum EnumValue { get { return result.EnumValue; } set { SetEnumValue(value); } } public Builder SetEnumValue(global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum value) { PrepareBuilder(); - result.hasEnumValue = true; result.enumValue_ = value; return this; } public Builder ClearEnumValue() { PrepareBuilder(); - result.hasEnumValue = false; result.enumValue_ = global::Google.ProtocolBuffers.TestProtos.FooWithExtraFields.Types.NestedEnum.FOO; return this; } - public bool HasExtraInt32Value { - get { return result.hasExtraInt32Value; } - } public int ExtraInt32Value { get { return result.ExtraInt32Value; } set { SetExtraInt32Value(value); } } public Builder SetExtraInt32Value(int value) { PrepareBuilder(); - result.hasExtraInt32Value = true; result.extraInt32Value_ = value; return this; } public Builder ClearExtraInt32Value() { PrepareBuilder(); - result.hasExtraInt32Value = false; result.extraInt32Value_ = 0; return this; } -- cgit v1.2.3 From 998b5ba20d4bacb25c90f2afaddac3900a06d61b Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Wed, 13 May 2015 17:34:02 +0100 Subject: Remove the C#-specific field_presence_test.proto, using unittest_no_field_presence.proto instead. This is the start of establishing a C# namespace of "Google.ProtocolBuffers.TestProtos.Proto3" for proto3-syntax protos. We could optionally split the directory structure as well into Proto2 and Proto3 for clarity. --- .../google/protobuf/field_presence_test.proto | 21 - .../src/ProtocolBuffers.Test/FieldPresenceTest.cs | 4 +- .../ProtocolBuffers.Test.csproj | 2 +- .../TestProtos/FieldPresenceTest.cs | 782 ---- .../TestProtos/UnittestNoFieldPresence.cs | 3776 ++++++++++++++++++++ .../protobuf/unittest_no_field_presence.proto | 2 +- 6 files changed, 3780 insertions(+), 807 deletions(-) delete mode 100644 csharp/protos/google/protobuf/field_presence_test.proto delete mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs create mode 100644 csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/protos/google/protobuf/field_presence_test.proto b/csharp/protos/google/protobuf/field_presence_test.proto deleted file mode 100644 index 14d91312..00000000 --- a/csharp/protos/google/protobuf/field_presence_test.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; - -package Google.ProtocolBuffers.TestProtos.FieldPresence; - -// TODO(jieluo): Add repeated fields, oneof, maps to TestAllTypes -message TestAllTypes { - enum NestedEnum { - FOO = 0; - BAR = 1; - BAZ = 2; - } - message NestedMessage { - optional int32 value = 1; - } - - optional int32 optional_int32 = 1; - optional string optional_string = 2; - optional bytes optional_bytes = 3; - optional NestedEnum optional_nested_enum = 4; - optional NestedMessage optional_nested_message = 5; -} diff --git a/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs b/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs index 9c1fc6af..8f59334e 100644 --- a/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs +++ b/csharp/src/ProtocolBuffers.Test/FieldPresenceTest.cs @@ -33,7 +33,7 @@ using System; using Google.ProtocolBuffers.Descriptors; -using Google.ProtocolBuffers.TestProtos.FieldPresence; +using Google.ProtocolBuffers.TestProtos.Proto3; using NUnit.Framework; namespace Google.ProtocolBuffers @@ -177,7 +177,7 @@ namespace Google.ProtocolBuffers Assert.AreEqual(ByteString.Empty, message.OptionalBytes); Assert.AreEqual(TestAllTypes.Types.NestedEnum.FOO, message.OptionalNestedEnum); Assert.IsTrue(message.HasOptionalNestedMessage); - Assert.AreEqual(0, message.OptionalNestedMessage.Value); + Assert.AreEqual(0, message.OptionalNestedMessage.Bb); } } } diff --git a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj index dd28f34a..b4c562d1 100644 --- a/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj +++ b/csharp/src/ProtocolBuffers.Test/ProtocolBuffers.Test.csproj @@ -84,7 +84,6 @@ - @@ -96,6 +95,7 @@ + diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs deleted file mode 100644 index b4cb279d..00000000 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/FieldPresenceTest.cs +++ /dev/null @@ -1,782 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: protos/google/protobuf/field_presence_test.proto -#pragma warning disable 1591, 0612, 3021 -#region Designer generated code - -using pb = global::Google.ProtocolBuffers; -using pbc = global::Google.ProtocolBuffers.Collections; -using pbd = global::Google.ProtocolBuffers.Descriptors; -using scg = global::System.Collections.Generic; -namespace Google.ProtocolBuffers.TestProtos.FieldPresence { - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class FieldPresenceTest { - - #region Extension registration - public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { - } - #endregion - #region Static variables - internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; - internal static pbd::MessageDescriptor internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; - internal static pb::FieldAccess.FieldAccessorTable internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; - #endregion - #region Descriptor - public static pbd::FileDescriptor Descriptor { - get { return descriptor; } - } - private static pbd::FileDescriptor descriptor; - - static FieldPresenceTest() { - byte[] descriptorData = global::System.Convert.FromBase64String( - string.Concat( - "CjBwcm90b3MvZ29vZ2xlL3Byb3RvYnVmL2ZpZWxkX3ByZXNlbmNlX3Rlc3Qu", - "cHJvdG8SL0dvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFByb3Rvcy5GaWVs", - "ZFByZXNlbmNlIvYCCgxUZXN0QWxsVHlwZXMSFgoOb3B0aW9uYWxfaW50MzIY", - "ASABKAUSFwoPb3B0aW9uYWxfc3RyaW5nGAIgASgJEhYKDm9wdGlvbmFsX2J5", - "dGVzGAMgASgMEmYKFG9wdGlvbmFsX25lc3RlZF9lbnVtGAQgASgOMkguR29v", - "Z2xlLlByb3RvY29sQnVmZmVycy5UZXN0UHJvdG9zLkZpZWxkUHJlc2VuY2Uu", - "VGVzdEFsbFR5cGVzLk5lc3RlZEVudW0SbAoXb3B0aW9uYWxfbmVzdGVkX21l", - "c3NhZ2UYBSABKAsySy5Hb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRlc3RQcm90", - "b3MuRmllbGRQcmVzZW5jZS5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZRoe", - "Cg1OZXN0ZWRNZXNzYWdlEg0KBXZhbHVlGAEgASgFIicKCk5lc3RlZEVudW0S", - "BwoDRk9PEAASBwoDQkFSEAESBwoDQkFaEAJiBnByb3RvMw==")); - pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { - descriptor = root; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor = Descriptor.MessageTypes[0]; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor, - new string[] { "OptionalInt32", "OptionalString", "OptionalBytes", "OptionalNestedEnum", "OptionalNestedMessage", }); - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor = internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor.NestedTypes[0]; - internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable = - new pb::FieldAccess.FieldAccessorTable(internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor, - new string[] { "Value", }); - pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); - RegisterAllExtensions(registry); - return registry; - }; - pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, - new pbd::FileDescriptor[] { - }, assigner); - } - #endregion - - } - #region Messages - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class TestAllTypes : pb::GeneratedMessage { - private TestAllTypes() { } - private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly(); - private static readonly string[] _testAllTypesFieldNames = new string[] { "optional_bytes", "optional_int32", "optional_nested_enum", "optional_nested_message", "optional_string" }; - private static readonly uint[] _testAllTypesFieldTags = new uint[] { 26, 8, 32, 42, 18 }; - public static TestAllTypes DefaultInstance { - get { return defaultInstance; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override TestAllTypes ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes__FieldAccessorTable; } - } - - #region Nested types - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public static partial class Types { - public enum NestedEnum { - FOO = 0, - BAR = 1, - BAZ = 2, - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class NestedMessage : pb::GeneratedMessage { - private NestedMessage() { } - private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly(); - private static readonly string[] _nestedMessageFieldNames = new string[] { "value" }; - private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 }; - public static NestedMessage DefaultInstance { - get { return defaultInstance; } - } - - public override NestedMessage DefaultInstanceForType { - get { return DefaultInstance; } - } - - protected override NestedMessage ThisMessage { - get { return this; } - } - - public static pbd::MessageDescriptor Descriptor { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__Descriptor; } - } - - protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.internal__static_Google_ProtocolBuffers_TestProtos_FieldPresence_TestAllTypes_NestedMessage__FieldAccessorTable; } - } - - public const int ValueFieldNumber = 1; - private int value_; - public int Value { - get { return value_; } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _nestedMessageFieldNames; - if (Value != 0) { - output.WriteInt32(1, field_names[0], Value); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (Value != 0) { - size += pb::CodedOutputStream.ComputeInt32Size(1, Value); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static NestedMessage ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static NestedMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static NestedMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private NestedMessage MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(NestedMessage prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(NestedMessage cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private NestedMessage result; - - private NestedMessage PrepareBuilder() { - if (resultIsReadOnly) { - NestedMessage original = result; - result = new NestedMessage(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override NestedMessage MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Descriptor; } - } - - public override NestedMessage DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public override NestedMessage BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is NestedMessage) { - return MergeFrom((NestedMessage) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(NestedMessage other) { - if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) return this; - PrepareBuilder(); - if (other.Value != 0) { - Value = other.Value; - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_nestedMessageFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _nestedMessageFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - input.ReadInt32(ref result.value_); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public int Value { - get { return result.Value; } - set { SetValue(value); } - } - public Builder SetValue(int value) { - PrepareBuilder(); - result.value_ = value; - return this; - } - public Builder ClearValue() { - PrepareBuilder(); - result.value_ = 0; - return this; - } - } - static NestedMessage() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); - } - } - - } - #endregion - - public const int OptionalInt32FieldNumber = 1; - private int optionalInt32_; - public int OptionalInt32 { - get { return optionalInt32_; } - } - - public const int OptionalStringFieldNumber = 2; - private string optionalString_ = ""; - public string OptionalString { - get { return optionalString_; } - } - - public const int OptionalBytesFieldNumber = 3; - private pb::ByteString optionalBytes_ = pb::ByteString.Empty; - public pb::ByteString OptionalBytes { - get { return optionalBytes_; } - } - - public const int OptionalNestedEnumFieldNumber = 4; - private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return optionalNestedEnum_; } - } - - public const int OptionalNestedMessageFieldNumber = 5; - private bool hasOptionalNestedMessage; - private global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage optionalNestedMessage_; - public bool HasOptionalNestedMessage { - get { return hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return optionalNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance; } - } - - public override void WriteTo(pb::ICodedOutputStream output) { - CalcSerializedSize(); - string[] field_names = _testAllTypesFieldNames; - if (OptionalInt32 != 0) { - output.WriteInt32(1, field_names[1], OptionalInt32); - } - if (OptionalString != "") { - output.WriteString(2, field_names[4], OptionalString); - } - if (OptionalBytes != pb::ByteString.Empty) { - output.WriteBytes(3, field_names[0], OptionalBytes); - } - if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - output.WriteEnum(4, field_names[2], (int) OptionalNestedEnum, OptionalNestedEnum); - } - if (hasOptionalNestedMessage) { - output.WriteMessage(5, field_names[3], OptionalNestedMessage); - } - UnknownFields.WriteTo(output); - } - - private int memoizedSerializedSize = -1; - public override int SerializedSize { - get { - int size = memoizedSerializedSize; - if (size != -1) return size; - return CalcSerializedSize(); - } - } - - private int CalcSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (OptionalInt32 != 0) { - size += pb::CodedOutputStream.ComputeInt32Size(1, OptionalInt32); - } - if (OptionalString != "") { - size += pb::CodedOutputStream.ComputeStringSize(2, OptionalString); - } - if (OptionalBytes != pb::ByteString.Empty) { - size += pb::CodedOutputStream.ComputeBytesSize(3, OptionalBytes); - } - if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - size += pb::CodedOutputStream.ComputeEnumSize(4, (int) OptionalNestedEnum); - } - if (hasOptionalNestedMessage) { - size += pb::CodedOutputStream.ComputeMessageSize(5, OptionalNestedMessage); - } - size += UnknownFields.SerializedSize; - memoizedSerializedSize = size; - return size; - } - public static TestAllTypes ParseFrom(pb::ByteString data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data) { - return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); - } - public static TestAllTypes ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input) { - return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); - } - public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { - return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input) { - return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); - } - public static TestAllTypes ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); - } - private TestAllTypes MakeReadOnly() { - return this; - } - - public static Builder CreateBuilder() { return new Builder(); } - public override Builder ToBuilder() { return CreateBuilder(this); } - public override Builder CreateBuilderForType() { return new Builder(); } - public static Builder CreateBuilder(TestAllTypes prototype) { - return new Builder(prototype); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public sealed partial class Builder : pb::GeneratedBuilder { - protected override Builder ThisBuilder { - get { return this; } - } - public Builder() { - result = DefaultInstance; - resultIsReadOnly = true; - } - internal Builder(TestAllTypes cloneFrom) { - result = cloneFrom; - resultIsReadOnly = true; - } - - private bool resultIsReadOnly; - private TestAllTypes result; - - private TestAllTypes PrepareBuilder() { - if (resultIsReadOnly) { - TestAllTypes original = result; - result = new TestAllTypes(); - resultIsReadOnly = false; - MergeFrom(original); - } - return result; - } - - public override bool IsInitialized { - get { return result.IsInitialized; } - } - - protected override TestAllTypes MessageBeingBuilt { - get { return PrepareBuilder(); } - } - - public override Builder Clear() { - result = DefaultInstance; - resultIsReadOnly = true; - return this; - } - - public override Builder Clone() { - if (resultIsReadOnly) { - return new Builder(result); - } else { - return new Builder().MergeFrom(result); - } - } - - public override pbd::MessageDescriptor DescriptorForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Descriptor; } - } - - public override TestAllTypes DefaultInstanceForType { - get { return global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance; } - } - - public override TestAllTypes BuildPartial() { - if (resultIsReadOnly) { - return result; - } - resultIsReadOnly = true; - return result.MakeReadOnly(); - } - - public override Builder MergeFrom(pb::IMessage other) { - if (other is TestAllTypes) { - return MergeFrom((TestAllTypes) other); - } else { - base.MergeFrom(other); - return this; - } - } - - public override Builder MergeFrom(TestAllTypes other) { - if (other == global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.DefaultInstance) return this; - PrepareBuilder(); - if (other.OptionalInt32 != 0) { - OptionalInt32 = other.OptionalInt32; - } - if (other.OptionalString != "") { - OptionalString = other.OptionalString; - } - if (other.OptionalBytes != pb::ByteString.Empty) { - OptionalBytes = other.OptionalBytes; - } - if (other.OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO) { - OptionalNestedEnum = other.OptionalNestedEnum; - } - if (other.HasOptionalNestedMessage) { - MergeOptionalNestedMessage(other.OptionalNestedMessage); - } - this.MergeUnknownFields(other.UnknownFields); - return this; - } - - public override Builder MergeFrom(pb::ICodedInputStream input) { - return MergeFrom(input, pb::ExtensionRegistry.Empty); - } - - public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { - PrepareBuilder(); - pb::UnknownFieldSet.Builder unknownFields = null; - uint tag; - string field_name; - while (input.ReadTag(out tag, out field_name)) { - if(tag == 0 && field_name != null) { - int field_ordinal = global::System.Array.BinarySearch(_testAllTypesFieldNames, field_name, global::System.StringComparer.Ordinal); - if(field_ordinal >= 0) - tag = _testAllTypesFieldTags[field_ordinal]; - else { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - continue; - } - } - switch (tag) { - case 0: { - throw pb::InvalidProtocolBufferException.InvalidTag(); - } - default: { - if (pb::WireFormat.IsEndGroupTag(tag)) { - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); - break; - } - case 8: { - input.ReadInt32(ref result.optionalInt32_); - break; - } - case 18: { - input.ReadString(ref result.optionalString_); - break; - } - case 26: { - input.ReadBytes(ref result.optionalBytes_); - break; - } - case 32: { - object unknown; - if(input.ReadEnum(ref result.optionalNestedEnum_, out unknown)) { - } else if(unknown is int) { - if (unknownFields == null) { - unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); - } - unknownFields.MergeVarintField(4, (ulong)(int)unknown); - } - break; - } - case 42: { - global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(); - if (result.hasOptionalNestedMessage) { - subBuilder.MergeFrom(OptionalNestedMessage); - } - input.ReadMessage(subBuilder, extensionRegistry); - OptionalNestedMessage = subBuilder.BuildPartial(); - break; - } - } - } - - if (unknownFields != null) { - this.UnknownFields = unknownFields.Build(); - } - return this; - } - - - public int OptionalInt32 { - get { return result.OptionalInt32; } - set { SetOptionalInt32(value); } - } - public Builder SetOptionalInt32(int value) { - PrepareBuilder(); - result.optionalInt32_ = value; - return this; - } - public Builder ClearOptionalInt32() { - PrepareBuilder(); - result.optionalInt32_ = 0; - return this; - } - - public string OptionalString { - get { return result.OptionalString; } - set { SetOptionalString(value); } - } - public Builder SetOptionalString(string value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.optionalString_ = value; - return this; - } - public Builder ClearOptionalString() { - PrepareBuilder(); - result.optionalString_ = ""; - return this; - } - - public pb::ByteString OptionalBytes { - get { return result.OptionalBytes; } - set { SetOptionalBytes(value); } - } - public Builder SetOptionalBytes(pb::ByteString value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.optionalBytes_ = value; - return this; - } - public Builder ClearOptionalBytes() { - PrepareBuilder(); - result.optionalBytes_ = pb::ByteString.Empty; - return this; - } - - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum OptionalNestedEnum { - get { return result.OptionalNestedEnum; } - set { SetOptionalNestedEnum(value); } - } - public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum value) { - PrepareBuilder(); - result.optionalNestedEnum_ = value; - return this; - } - public Builder ClearOptionalNestedEnum() { - PrepareBuilder(); - result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedEnum.FOO; - return this; - } - - public bool HasOptionalNestedMessage { - get { return result.hasOptionalNestedMessage; } - } - public global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage OptionalNestedMessage { - get { return result.OptionalNestedMessage; } - set { SetOptionalNestedMessage(value); } - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = value; - return this; - } - public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.Builder builderForValue) { - pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); - PrepareBuilder(); - result.hasOptionalNestedMessage = true; - result.optionalNestedMessage_ = builderForValue.Build(); - return this; - } - public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage value) { - pb::ThrowHelper.ThrowIfNull(value, "value"); - PrepareBuilder(); - if (result.hasOptionalNestedMessage && - result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.DefaultInstance) { - result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.FieldPresence.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial(); - } else { - result.optionalNestedMessage_ = value; - } - result.hasOptionalNestedMessage = true; - return this; - } - public Builder ClearOptionalNestedMessage() { - PrepareBuilder(); - result.hasOptionalNestedMessage = false; - result.optionalNestedMessage_ = null; - return this; - } - } - static TestAllTypes() { - object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.FieldPresence.FieldPresenceTest.Descriptor, null); - } - } - - #endregion - -} - -#endregion Designer generated code diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs new file mode 100644 index 00000000..0d212b72 --- /dev/null +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestNoFieldPresence.cs @@ -0,0 +1,3776 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/protobuf/unittest_no_field_presence.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.ProtocolBuffers; +using pbc = global::Google.ProtocolBuffers.Collections; +using pbd = global::Google.ProtocolBuffers.Descriptors; +using scg = global::System.Collections.Generic; +namespace Google.ProtocolBuffers.TestProtos.Proto3 { + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static partial class UnittestNoFieldPresence { + + #region Extension registration + public static void RegisterAllExtensions(pb::ExtensionRegistry registry) { + } + #endregion + #region Static variables + internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable; + internal static pbd::MessageDescriptor internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor; + internal static pb::FieldAccess.FieldAccessorTable internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable; + #endregion + #region Descriptor + public static pbd::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbd::FileDescriptor descriptor; + + static UnittestNoFieldPresence() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CjBnb29nbGUvcHJvdG9idWYvdW5pdHRlc3Rfbm9fZmllbGRfcHJlc2VuY2Uu", + "cHJvdG8SH3Byb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QaHmdvb2ds", + "ZS9wcm90b2J1Zi91bml0dGVzdC5wcm90byKaEQoMVGVzdEFsbFR5cGVzEhYK", + "Dm9wdGlvbmFsX2ludDMyGAEgASgFEhYKDm9wdGlvbmFsX2ludDY0GAIgASgD", + "EhcKD29wdGlvbmFsX3VpbnQzMhgDIAEoDRIXCg9vcHRpb25hbF91aW50NjQY", + "BCABKAQSFwoPb3B0aW9uYWxfc2ludDMyGAUgASgREhcKD29wdGlvbmFsX3Np", + "bnQ2NBgGIAEoEhIYChBvcHRpb25hbF9maXhlZDMyGAcgASgHEhgKEG9wdGlv", + "bmFsX2ZpeGVkNjQYCCABKAYSGQoRb3B0aW9uYWxfc2ZpeGVkMzIYCSABKA8S", + "GQoRb3B0aW9uYWxfc2ZpeGVkNjQYCiABKBASFgoOb3B0aW9uYWxfZmxvYXQY", + "CyABKAISFwoPb3B0aW9uYWxfZG91YmxlGAwgASgBEhUKDW9wdGlvbmFsX2Jv", + "b2wYDSABKAgSFwoPb3B0aW9uYWxfc3RyaW5nGA4gASgJEhYKDm9wdGlvbmFs", + "X2J5dGVzGA8gASgMElwKF29wdGlvbmFsX25lc3RlZF9tZXNzYWdlGBIgASgL", + "MjsucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0dGVzdC5UZXN0QWxsVHlw", + "ZXMuTmVzdGVkTWVzc2FnZRJRChhvcHRpb25hbF9mb3JlaWduX21lc3NhZ2UY", + "EyABKAsyLy5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0LkZvcmVp", + "Z25NZXNzYWdlEkAKF29wdGlvbmFsX3Byb3RvMl9tZXNzYWdlGBQgASgLMh8u", + "cHJvdG9idWZfdW5pdHRlc3QuVGVzdEFsbFR5cGVzElYKFG9wdGlvbmFsX25l", + "c3RlZF9lbnVtGBUgASgOMjgucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0", + "dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkRW51bRJLChVvcHRpb25hbF9mb3Jl", + "aWduX2VudW0YFiABKA4yLC5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0", + "ZXN0LkZvcmVpZ25FbnVtEiEKFW9wdGlvbmFsX3N0cmluZ19waWVjZRgYIAEo", + "CUICCAISGQoNb3B0aW9uYWxfY29yZBgZIAEoCUICCAESXgoVb3B0aW9uYWxf", + "bGF6eV9tZXNzYWdlGB4gASgLMjsucHJvdG8yX25vZmllbGRwcmVzZW5jZV91", + "bml0dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkTWVzc2FnZUICKAESFgoOcmVw", + "ZWF0ZWRfaW50MzIYHyADKAUSFgoOcmVwZWF0ZWRfaW50NjQYICADKAMSFwoP", + "cmVwZWF0ZWRfdWludDMyGCEgAygNEhcKD3JlcGVhdGVkX3VpbnQ2NBgiIAMo", + "BBIXCg9yZXBlYXRlZF9zaW50MzIYIyADKBESFwoPcmVwZWF0ZWRfc2ludDY0", + "GCQgAygSEhgKEHJlcGVhdGVkX2ZpeGVkMzIYJSADKAcSGAoQcmVwZWF0ZWRf", + "Zml4ZWQ2NBgmIAMoBhIZChFyZXBlYXRlZF9zZml4ZWQzMhgnIAMoDxIZChFy", + "ZXBlYXRlZF9zZml4ZWQ2NBgoIAMoEBIWCg5yZXBlYXRlZF9mbG9hdBgpIAMo", + "AhIXCg9yZXBlYXRlZF9kb3VibGUYKiADKAESFQoNcmVwZWF0ZWRfYm9vbBgr", + "IAMoCBIXCg9yZXBlYXRlZF9zdHJpbmcYLCADKAkSFgoOcmVwZWF0ZWRfYnl0", + "ZXMYLSADKAwSXAoXcmVwZWF0ZWRfbmVzdGVkX21lc3NhZ2UYMCADKAsyOy5w", + "cm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0LlRlc3RBbGxUeXBlcy5O", + "ZXN0ZWRNZXNzYWdlElEKGHJlcGVhdGVkX2ZvcmVpZ25fbWVzc2FnZRgxIAMo", + "CzIvLnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QuRm9yZWlnbk1l", + "c3NhZ2USQAoXcmVwZWF0ZWRfcHJvdG8yX21lc3NhZ2UYMiADKAsyHy5wcm90", + "b2J1Zl91bml0dGVzdC5UZXN0QWxsVHlwZXMSVgoUcmVwZWF0ZWRfbmVzdGVk", + "X2VudW0YMyADKA4yOC5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0ZXN0", + "LlRlc3RBbGxUeXBlcy5OZXN0ZWRFbnVtEksKFXJlcGVhdGVkX2ZvcmVpZ25f", + "ZW51bRg0IAMoDjIsLnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3Qu", + "Rm9yZWlnbkVudW0SIQoVcmVwZWF0ZWRfc3RyaW5nX3BpZWNlGDYgAygJQgII", + "AhIZCg1yZXBlYXRlZF9jb3JkGDcgAygJQgIIARJeChVyZXBlYXRlZF9sYXp5", + "X21lc3NhZ2UYOSADKAsyOy5wcm90bzJfbm9maWVsZHByZXNlbmNlX3VuaXR0", + "ZXN0LlRlc3RBbGxUeXBlcy5OZXN0ZWRNZXNzYWdlQgIoARIWCgxvbmVvZl91", + "aW50MzIYbyABKA1IABJbChRvbmVvZl9uZXN0ZWRfbWVzc2FnZRhwIAEoCzI7", + "LnByb3RvMl9ub2ZpZWxkcHJlc2VuY2VfdW5pdHRlc3QuVGVzdEFsbFR5cGVz", + "Lk5lc3RlZE1lc3NhZ2VIABIWCgxvbmVvZl9zdHJpbmcYcSABKAlIABJOCgpv", + "bmVvZl9lbnVtGHIgASgOMjgucHJvdG8yX25vZmllbGRwcmVzZW5jZV91bml0", + "dGVzdC5UZXN0QWxsVHlwZXMuTmVzdGVkRW51bUgAGhsKDU5lc3RlZE1lc3Nh", + "Z2USCgoCYmIYASABKAUiJwoKTmVzdGVkRW51bRIHCgNGT08QABIHCgNCQVIQ", + "ARIHCgNCQVoQAkINCgtvbmVvZl9maWVsZCJFChJUZXN0UHJvdG8yUmVxdWly", + "ZWQSLwoGcHJvdG8yGAEgASgLMh8ucHJvdG9idWZfdW5pdHRlc3QuVGVzdFJl", + "cXVpcmVkIhsKDkZvcmVpZ25NZXNzYWdlEgkKAWMYASABKAUqQAoLRm9yZWln", + "bkVudW0SDwoLRk9SRUlHTl9GT08QABIPCgtGT1JFSUdOX0JBUhABEg8KC0ZP", + "UkVJR05fQkFaEAJCK6oCKEdvb2dsZS5Qcm90b2NvbEJ1ZmZlcnMuVGVzdFBy", + "b3Rvcy5Qcm90bzNiBnByb3RvMw==")); + pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { + descriptor = root; + internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor = Descriptor.MessageTypes[0]; + internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor, + new string[] { "OptionalInt32", "OptionalInt64", "OptionalUint32", "OptionalUint64", "OptionalSint32", "OptionalSint64", "OptionalFixed32", "OptionalFixed64", "OptionalSfixed32", "OptionalSfixed64", "OptionalFloat", "OptionalDouble", "OptionalBool", "OptionalString", "OptionalBytes", "OptionalNestedMessage", "OptionalForeignMessage", "OptionalProto2Message", "OptionalNestedEnum", "OptionalForeignEnum", "OptionalStringPiece", "OptionalCord", "OptionalLazyMessage", "RepeatedInt32", "RepeatedInt64", "RepeatedUint32", "RepeatedUint64", "RepeatedSint32", "RepeatedSint64", "RepeatedFixed32", "RepeatedFixed64", "RepeatedSfixed32", "RepeatedSfixed64", "RepeatedFloat", "RepeatedDouble", "RepeatedBool", "RepeatedString", "RepeatedBytes", "RepeatedNestedMessage", "RepeatedForeignMessage", "RepeatedProto2Message", "RepeatedNestedEnum", "RepeatedForeignEnum", "RepeatedStringPiece", "RepeatedCord", "RepeatedLazyMessage", "OneofUint32", "OneofNestedMessage", "OneofString", "OneofEnum", }); + internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor = internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor.NestedTypes[0]; + internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor, + new string[] { "Bb", }); + internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor = Descriptor.MessageTypes[1]; + internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor, + new string[] { "Proto2", }); + internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor = Descriptor.MessageTypes[2]; + internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable = + new pb::FieldAccess.FieldAccessorTable(internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor, + new string[] { "C", }); + pb::ExtensionRegistry registry = pb::ExtensionRegistry.CreateInstance(); + RegisterAllExtensions(registry); + global::Google.ProtocolBuffers.TestProtos.Unittest.RegisterAllExtensions(registry); + return registry; + }; + pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData, + new pbd::FileDescriptor[] { + global::Google.ProtocolBuffers.TestProtos.Unittest.Descriptor, + }, assigner); + } + #endregion + + } + #region Enums + public enum ForeignEnum { + FOREIGN_FOO = 0, + FOREIGN_BAR = 1, + FOREIGN_BAZ = 2, + } + + #endregion + + #region Messages + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class TestAllTypes : pb::GeneratedMessage { + private TestAllTypes() { } + private static readonly TestAllTypes defaultInstance = new TestAllTypes().MakeReadOnly(); + private static readonly string[] _testAllTypesFieldNames = new string[] { "oneof_enum", "oneof_nested_message", "oneof_string", "oneof_uint32", "optional_bool", "optional_bytes", "optional_cord", "optional_double", "optional_fixed32", "optional_fixed64", "optional_float", "optional_foreign_enum", "optional_foreign_message", "optional_int32", "optional_int64", "optional_lazy_message", "optional_nested_enum", "optional_nested_message", "optional_proto2_message", "optional_sfixed32", "optional_sfixed64", "optional_sint32", "optional_sint64", "optional_string", "optional_string_piece", "optional_uint32", "optional_uint64", "repeated_bool", "repeated_bytes", "repeated_cord", "repeated_double", "repeated_fixed32", "repeated_fixed64", "repeated_float", "repeated_foreign_enum", "repeated_foreign_message", "repeated_int32", "repeated_int64", "repeated_lazy_message", "repeated_nested_enum", "repeated_nested_message", "repeated_proto2_message", "repeated_sfixed32", "repeated_sfixed64", "repeated_sint32", "repeated_sint64", "repeated_string", "repeated_string_piece", "repeated_uint32", "repeated_uint64" }; + private static readonly uint[] _testAllTypesFieldTags = new uint[] { 912, 898, 906, 888, 104, 122, 202, 97, 61, 65, 93, 176, 154, 8, 16, 242, 168, 146, 162, 77, 81, 40, 48, 114, 194, 24, 32, 344, 362, 442, 337, 301, 305, 333, 416, 394, 248, 256, 458, 408, 386, 402, 317, 321, 280, 288, 354, 434, 264, 272 }; + public static TestAllTypes DefaultInstance { + get { return defaultInstance; } + } + + public override TestAllTypes DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override TestAllTypes ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes__FieldAccessorTable; } + } + + #region Nested types + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public static partial class Types { + public enum NestedEnum { + FOO = 0, + BAR = 1, + BAZ = 2, + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class NestedMessage : pb::GeneratedMessage { + private NestedMessage() { } + private static readonly NestedMessage defaultInstance = new NestedMessage().MakeReadOnly(); + private static readonly string[] _nestedMessageFieldNames = new string[] { "bb" }; + private static readonly uint[] _nestedMessageFieldTags = new uint[] { 8 }; + public static NestedMessage DefaultInstance { + get { return defaultInstance; } + } + + public override NestedMessage DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override NestedMessage ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestAllTypes_NestedMessage__FieldAccessorTable; } + } + + public const int BbFieldNumber = 1; + private int bb_; + public int Bb { + get { return bb_; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _nestedMessageFieldNames; + if (Bb != 0) { + output.WriteInt32(1, field_names[0], Bb); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (Bb != 0) { + size += pb::CodedOutputStream.ComputeInt32Size(1, Bb); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static NestedMessage ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static NestedMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static NestedMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static NestedMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static NestedMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private NestedMessage MakeReadOnly() { + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(NestedMessage prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(NestedMessage cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private NestedMessage result; + + private NestedMessage PrepareBuilder() { + if (resultIsReadOnly) { + NestedMessage original = result; + result = new NestedMessage(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override NestedMessage MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Descriptor; } + } + + public override NestedMessage DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public override NestedMessage BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is NestedMessage) { + return MergeFrom((NestedMessage) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(NestedMessage other) { + if (other == global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance) return this; + PrepareBuilder(); + if (other.Bb != 0) { + Bb = other.Bb; + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_nestedMessageFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _nestedMessageFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + input.ReadInt32(ref result.bb_); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public int Bb { + get { return result.Bb; } + set { SetBb(value); } + } + public Builder SetBb(int value) { + PrepareBuilder(); + result.bb_ = value; + return this; + } + public Builder ClearBb() { + PrepareBuilder(); + result.bb_ = 0; + return this; + } + } + static NestedMessage() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.Descriptor, null); + } + } + + } + #endregion + + public const int OptionalInt32FieldNumber = 1; + private int optionalInt32_; + public int OptionalInt32 { + get { return optionalInt32_; } + } + + public const int OptionalInt64FieldNumber = 2; + private long optionalInt64_; + public long OptionalInt64 { + get { return optionalInt64_; } + } + + public const int OptionalUint32FieldNumber = 3; + private uint optionalUint32_; + public uint OptionalUint32 { + get { return optionalUint32_; } + } + + public const int OptionalUint64FieldNumber = 4; + private ulong optionalUint64_; + public ulong OptionalUint64 { + get { return optionalUint64_; } + } + + public const int OptionalSint32FieldNumber = 5; + private int optionalSint32_; + public int OptionalSint32 { + get { return optionalSint32_; } + } + + public const int OptionalSint64FieldNumber = 6; + private long optionalSint64_; + public long OptionalSint64 { + get { return optionalSint64_; } + } + + public const int OptionalFixed32FieldNumber = 7; + private uint optionalFixed32_; + public uint OptionalFixed32 { + get { return optionalFixed32_; } + } + + public const int OptionalFixed64FieldNumber = 8; + private ulong optionalFixed64_; + public ulong OptionalFixed64 { + get { return optionalFixed64_; } + } + + public const int OptionalSfixed32FieldNumber = 9; + private int optionalSfixed32_; + public int OptionalSfixed32 { + get { return optionalSfixed32_; } + } + + public const int OptionalSfixed64FieldNumber = 10; + private long optionalSfixed64_; + public long OptionalSfixed64 { + get { return optionalSfixed64_; } + } + + public const int OptionalFloatFieldNumber = 11; + private float optionalFloat_; + public float OptionalFloat { + get { return optionalFloat_; } + } + + public const int OptionalDoubleFieldNumber = 12; + private double optionalDouble_; + public double OptionalDouble { + get { return optionalDouble_; } + } + + public const int OptionalBoolFieldNumber = 13; + private bool optionalBool_; + public bool OptionalBool { + get { return optionalBool_; } + } + + public const int OptionalStringFieldNumber = 14; + private string optionalString_ = ""; + public string OptionalString { + get { return optionalString_; } + } + + public const int OptionalBytesFieldNumber = 15; + private pb::ByteString optionalBytes_ = pb::ByteString.Empty; + public pb::ByteString OptionalBytes { + get { return optionalBytes_; } + } + + public const int OptionalNestedMessageFieldNumber = 18; + private bool hasOptionalNestedMessage; + private global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage optionalNestedMessage_; + public bool HasOptionalNestedMessage { + get { return hasOptionalNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OptionalNestedMessage { + get { return optionalNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public const int OptionalForeignMessageFieldNumber = 19; + private bool hasOptionalForeignMessage; + private global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage optionalForeignMessage_; + public bool HasOptionalForeignMessage { + get { return hasOptionalForeignMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage OptionalForeignMessage { + get { return optionalForeignMessage_ ?? global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.DefaultInstance; } + } + + public const int OptionalProto2MessageFieldNumber = 20; + private bool hasOptionalProto2Message; + private global::Google.ProtocolBuffers.TestProtos.TestAllTypes optionalProto2Message_; + public bool HasOptionalProto2Message { + get { return hasOptionalProto2Message; } + } + public global::Google.ProtocolBuffers.TestProtos.TestAllTypes OptionalProto2Message { + get { return optionalProto2Message_ ?? global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance; } + } + + public const int OptionalNestedEnumFieldNumber = 21; + private global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO; + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum OptionalNestedEnum { + get { return optionalNestedEnum_; } + } + + public const int OptionalForeignEnumFieldNumber = 22; + private global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum.FOREIGN_FOO; + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum OptionalForeignEnum { + get { return optionalForeignEnum_; } + } + + public const int OptionalStringPieceFieldNumber = 24; + private string optionalStringPiece_ = ""; + public string OptionalStringPiece { + get { return optionalStringPiece_; } + } + + public const int OptionalCordFieldNumber = 25; + private string optionalCord_ = ""; + public string OptionalCord { + get { return optionalCord_; } + } + + public const int OptionalLazyMessageFieldNumber = 30; + private bool hasOptionalLazyMessage; + private global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage optionalLazyMessage_; + public bool HasOptionalLazyMessage { + get { return hasOptionalLazyMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OptionalLazyMessage { + get { return optionalLazyMessage_ ?? global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public const int RepeatedInt32FieldNumber = 31; + private pbc::PopsicleList repeatedInt32_ = new pbc::PopsicleList(); + public scg::IList RepeatedInt32List { + get { return pbc::Lists.AsReadOnly(repeatedInt32_); } + } + public int RepeatedInt32Count { + get { return repeatedInt32_.Count; } + } + public int GetRepeatedInt32(int index) { + return repeatedInt32_[index]; + } + + public const int RepeatedInt64FieldNumber = 32; + private pbc::PopsicleList repeatedInt64_ = new pbc::PopsicleList(); + public scg::IList RepeatedInt64List { + get { return pbc::Lists.AsReadOnly(repeatedInt64_); } + } + public int RepeatedInt64Count { + get { return repeatedInt64_.Count; } + } + public long GetRepeatedInt64(int index) { + return repeatedInt64_[index]; + } + + public const int RepeatedUint32FieldNumber = 33; + private pbc::PopsicleList repeatedUint32_ = new pbc::PopsicleList(); + public scg::IList RepeatedUint32List { + get { return pbc::Lists.AsReadOnly(repeatedUint32_); } + } + public int RepeatedUint32Count { + get { return repeatedUint32_.Count; } + } + public uint GetRepeatedUint32(int index) { + return repeatedUint32_[index]; + } + + public const int RepeatedUint64FieldNumber = 34; + private pbc::PopsicleList repeatedUint64_ = new pbc::PopsicleList(); + public scg::IList RepeatedUint64List { + get { return pbc::Lists.AsReadOnly(repeatedUint64_); } + } + public int RepeatedUint64Count { + get { return repeatedUint64_.Count; } + } + public ulong GetRepeatedUint64(int index) { + return repeatedUint64_[index]; + } + + public const int RepeatedSint32FieldNumber = 35; + private pbc::PopsicleList repeatedSint32_ = new pbc::PopsicleList(); + public scg::IList RepeatedSint32List { + get { return pbc::Lists.AsReadOnly(repeatedSint32_); } + } + public int RepeatedSint32Count { + get { return repeatedSint32_.Count; } + } + public int GetRepeatedSint32(int index) { + return repeatedSint32_[index]; + } + + public const int RepeatedSint64FieldNumber = 36; + private pbc::PopsicleList repeatedSint64_ = new pbc::PopsicleList(); + public scg::IList RepeatedSint64List { + get { return pbc::Lists.AsReadOnly(repeatedSint64_); } + } + public int RepeatedSint64Count { + get { return repeatedSint64_.Count; } + } + public long GetRepeatedSint64(int index) { + return repeatedSint64_[index]; + } + + public const int RepeatedFixed32FieldNumber = 37; + private pbc::PopsicleList repeatedFixed32_ = new pbc::PopsicleList(); + public scg::IList RepeatedFixed32List { + get { return pbc::Lists.AsReadOnly(repeatedFixed32_); } + } + public int RepeatedFixed32Count { + get { return repeatedFixed32_.Count; } + } + public uint GetRepeatedFixed32(int index) { + return repeatedFixed32_[index]; + } + + public const int RepeatedFixed64FieldNumber = 38; + private pbc::PopsicleList repeatedFixed64_ = new pbc::PopsicleList(); + public scg::IList RepeatedFixed64List { + get { return pbc::Lists.AsReadOnly(repeatedFixed64_); } + } + public int RepeatedFixed64Count { + get { return repeatedFixed64_.Count; } + } + public ulong GetRepeatedFixed64(int index) { + return repeatedFixed64_[index]; + } + + public const int RepeatedSfixed32FieldNumber = 39; + private pbc::PopsicleList repeatedSfixed32_ = new pbc::PopsicleList(); + public scg::IList RepeatedSfixed32List { + get { return pbc::Lists.AsReadOnly(repeatedSfixed32_); } + } + public int RepeatedSfixed32Count { + get { return repeatedSfixed32_.Count; } + } + public int GetRepeatedSfixed32(int index) { + return repeatedSfixed32_[index]; + } + + public const int RepeatedSfixed64FieldNumber = 40; + private pbc::PopsicleList repeatedSfixed64_ = new pbc::PopsicleList(); + public scg::IList RepeatedSfixed64List { + get { return pbc::Lists.AsReadOnly(repeatedSfixed64_); } + } + public int RepeatedSfixed64Count { + get { return repeatedSfixed64_.Count; } + } + public long GetRepeatedSfixed64(int index) { + return repeatedSfixed64_[index]; + } + + public const int RepeatedFloatFieldNumber = 41; + private pbc::PopsicleList repeatedFloat_ = new pbc::PopsicleList(); + public scg::IList RepeatedFloatList { + get { return pbc::Lists.AsReadOnly(repeatedFloat_); } + } + public int RepeatedFloatCount { + get { return repeatedFloat_.Count; } + } + public float GetRepeatedFloat(int index) { + return repeatedFloat_[index]; + } + + public const int RepeatedDoubleFieldNumber = 42; + private pbc::PopsicleList repeatedDouble_ = new pbc::PopsicleList(); + public scg::IList RepeatedDoubleList { + get { return pbc::Lists.AsReadOnly(repeatedDouble_); } + } + public int RepeatedDoubleCount { + get { return repeatedDouble_.Count; } + } + public double GetRepeatedDouble(int index) { + return repeatedDouble_[index]; + } + + public const int RepeatedBoolFieldNumber = 43; + private pbc::PopsicleList repeatedBool_ = new pbc::PopsicleList(); + public scg::IList RepeatedBoolList { + get { return pbc::Lists.AsReadOnly(repeatedBool_); } + } + public int RepeatedBoolCount { + get { return repeatedBool_.Count; } + } + public bool GetRepeatedBool(int index) { + return repeatedBool_[index]; + } + + public const int RepeatedStringFieldNumber = 44; + private pbc::PopsicleList repeatedString_ = new pbc::PopsicleList(); + public scg::IList RepeatedStringList { + get { return pbc::Lists.AsReadOnly(repeatedString_); } + } + public int RepeatedStringCount { + get { return repeatedString_.Count; } + } + public string GetRepeatedString(int index) { + return repeatedString_[index]; + } + + public const int RepeatedBytesFieldNumber = 45; + private pbc::PopsicleList repeatedBytes_ = new pbc::PopsicleList(); + public scg::IList RepeatedBytesList { + get { return pbc::Lists.AsReadOnly(repeatedBytes_); } + } + public int RepeatedBytesCount { + get { return repeatedBytes_.Count; } + } + public pb::ByteString GetRepeatedBytes(int index) { + return repeatedBytes_[index]; + } + + public const int RepeatedNestedMessageFieldNumber = 48; + private pbc::PopsicleList repeatedNestedMessage_ = new pbc::PopsicleList(); + public scg::IList RepeatedNestedMessageList { + get { return repeatedNestedMessage_; } + } + public int RepeatedNestedMessageCount { + get { return repeatedNestedMessage_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) { + return repeatedNestedMessage_[index]; + } + + public const int RepeatedForeignMessageFieldNumber = 49; + private pbc::PopsicleList repeatedForeignMessage_ = new pbc::PopsicleList(); + public scg::IList RepeatedForeignMessageList { + get { return repeatedForeignMessage_; } + } + public int RepeatedForeignMessageCount { + get { return repeatedForeignMessage_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage GetRepeatedForeignMessage(int index) { + return repeatedForeignMessage_[index]; + } + + public const int RepeatedProto2MessageFieldNumber = 50; + private pbc::PopsicleList repeatedProto2Message_ = new pbc::PopsicleList(); + public scg::IList RepeatedProto2MessageList { + get { return repeatedProto2Message_; } + } + public int RepeatedProto2MessageCount { + get { return repeatedProto2Message_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetRepeatedProto2Message(int index) { + return repeatedProto2Message_[index]; + } + + public const int RepeatedNestedEnumFieldNumber = 51; + private pbc::PopsicleList repeatedNestedEnum_ = new pbc::PopsicleList(); + public scg::IList RepeatedNestedEnumList { + get { return pbc::Lists.AsReadOnly(repeatedNestedEnum_); } + } + public int RepeatedNestedEnumCount { + get { return repeatedNestedEnum_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) { + return repeatedNestedEnum_[index]; + } + + public const int RepeatedForeignEnumFieldNumber = 52; + private pbc::PopsicleList repeatedForeignEnum_ = new pbc::PopsicleList(); + public scg::IList RepeatedForeignEnumList { + get { return pbc::Lists.AsReadOnly(repeatedForeignEnum_); } + } + public int RepeatedForeignEnumCount { + get { return repeatedForeignEnum_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum GetRepeatedForeignEnum(int index) { + return repeatedForeignEnum_[index]; + } + + public const int RepeatedStringPieceFieldNumber = 54; + private pbc::PopsicleList repeatedStringPiece_ = new pbc::PopsicleList(); + public scg::IList RepeatedStringPieceList { + get { return pbc::Lists.AsReadOnly(repeatedStringPiece_); } + } + public int RepeatedStringPieceCount { + get { return repeatedStringPiece_.Count; } + } + public string GetRepeatedStringPiece(int index) { + return repeatedStringPiece_[index]; + } + + public const int RepeatedCordFieldNumber = 55; + private pbc::PopsicleList repeatedCord_ = new pbc::PopsicleList(); + public scg::IList RepeatedCordList { + get { return pbc::Lists.AsReadOnly(repeatedCord_); } + } + public int RepeatedCordCount { + get { return repeatedCord_.Count; } + } + public string GetRepeatedCord(int index) { + return repeatedCord_[index]; + } + + public const int RepeatedLazyMessageFieldNumber = 57; + private pbc::PopsicleList repeatedLazyMessage_ = new pbc::PopsicleList(); + public scg::IList RepeatedLazyMessageList { + get { return repeatedLazyMessage_; } + } + public int RepeatedLazyMessageCount { + get { return repeatedLazyMessage_.Count; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage GetRepeatedLazyMessage(int index) { + return repeatedLazyMessage_[index]; + } + + public const int OneofUint32FieldNumber = 111; + private uint oneofUint32_; + public uint OneofUint32 { + get { return oneofUint32_; } + } + + public const int OneofNestedMessageFieldNumber = 112; + private bool hasOneofNestedMessage; + private global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage oneofNestedMessage_; + public bool HasOneofNestedMessage { + get { return hasOneofNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OneofNestedMessage { + get { return oneofNestedMessage_ ?? global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance; } + } + + public const int OneofStringFieldNumber = 113; + private string oneofString_ = ""; + public string OneofString { + get { return oneofString_; } + } + + public const int OneofEnumFieldNumber = 114; + private global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum oneofEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO; + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum OneofEnum { + get { return oneofEnum_; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _testAllTypesFieldNames; + if (OptionalInt32 != 0) { + output.WriteInt32(1, field_names[13], OptionalInt32); + } + if (OptionalInt64 != 0L) { + output.WriteInt64(2, field_names[14], OptionalInt64); + } + if (OptionalUint32 != 0) { + output.WriteUInt32(3, field_names[25], OptionalUint32); + } + if (OptionalUint64 != 0UL) { + output.WriteUInt64(4, field_names[26], OptionalUint64); + } + if (OptionalSint32 != 0) { + output.WriteSInt32(5, field_names[21], OptionalSint32); + } + if (OptionalSint64 != 0L) { + output.WriteSInt64(6, field_names[22], OptionalSint64); + } + if (OptionalFixed32 != 0) { + output.WriteFixed32(7, field_names[8], OptionalFixed32); + } + if (OptionalFixed64 != 0UL) { + output.WriteFixed64(8, field_names[9], OptionalFixed64); + } + if (OptionalSfixed32 != 0) { + output.WriteSFixed32(9, field_names[19], OptionalSfixed32); + } + if (OptionalSfixed64 != 0L) { + output.WriteSFixed64(10, field_names[20], OptionalSfixed64); + } + if (OptionalFloat != 0F) { + output.WriteFloat(11, field_names[10], OptionalFloat); + } + if (OptionalDouble != 0D) { + output.WriteDouble(12, field_names[7], OptionalDouble); + } + if (OptionalBool != false) { + output.WriteBool(13, field_names[4], OptionalBool); + } + if (OptionalString != "") { + output.WriteString(14, field_names[23], OptionalString); + } + if (OptionalBytes != pb::ByteString.Empty) { + output.WriteBytes(15, field_names[5], OptionalBytes); + } + if (hasOptionalNestedMessage) { + output.WriteMessage(18, field_names[17], OptionalNestedMessage); + } + if (hasOptionalForeignMessage) { + output.WriteMessage(19, field_names[12], OptionalForeignMessage); + } + if (hasOptionalProto2Message) { + output.WriteMessage(20, field_names[18], OptionalProto2Message); + } + if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + output.WriteEnum(21, field_names[16], (int) OptionalNestedEnum, OptionalNestedEnum); + } + if (OptionalForeignEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum.FOREIGN_FOO) { + output.WriteEnum(22, field_names[11], (int) OptionalForeignEnum, OptionalForeignEnum); + } + if (OptionalStringPiece != "") { + output.WriteString(24, field_names[24], OptionalStringPiece); + } + if (OptionalCord != "") { + output.WriteString(25, field_names[6], OptionalCord); + } + if (hasOptionalLazyMessage) { + output.WriteMessage(30, field_names[15], OptionalLazyMessage); + } + if (repeatedInt32_.Count > 0) { + output.WriteInt32Array(31, field_names[36], repeatedInt32_); + } + if (repeatedInt64_.Count > 0) { + output.WriteInt64Array(32, field_names[37], repeatedInt64_); + } + if (repeatedUint32_.Count > 0) { + output.WriteUInt32Array(33, field_names[48], repeatedUint32_); + } + if (repeatedUint64_.Count > 0) { + output.WriteUInt64Array(34, field_names[49], repeatedUint64_); + } + if (repeatedSint32_.Count > 0) { + output.WriteSInt32Array(35, field_names[44], repeatedSint32_); + } + if (repeatedSint64_.Count > 0) { + output.WriteSInt64Array(36, field_names[45], repeatedSint64_); + } + if (repeatedFixed32_.Count > 0) { + output.WriteFixed32Array(37, field_names[31], repeatedFixed32_); + } + if (repeatedFixed64_.Count > 0) { + output.WriteFixed64Array(38, field_names[32], repeatedFixed64_); + } + if (repeatedSfixed32_.Count > 0) { + output.WriteSFixed32Array(39, field_names[42], repeatedSfixed32_); + } + if (repeatedSfixed64_.Count > 0) { + output.WriteSFixed64Array(40, field_names[43], repeatedSfixed64_); + } + if (repeatedFloat_.Count > 0) { + output.WriteFloatArray(41, field_names[33], repeatedFloat_); + } + if (repeatedDouble_.Count > 0) { + output.WriteDoubleArray(42, field_names[30], repeatedDouble_); + } + if (repeatedBool_.Count > 0) { + output.WriteBoolArray(43, field_names[27], repeatedBool_); + } + if (repeatedString_.Count > 0) { + output.WriteStringArray(44, field_names[46], repeatedString_); + } + if (repeatedBytes_.Count > 0) { + output.WriteBytesArray(45, field_names[28], repeatedBytes_); + } + if (repeatedNestedMessage_.Count > 0) { + output.WriteMessageArray(48, field_names[40], repeatedNestedMessage_); + } + if (repeatedForeignMessage_.Count > 0) { + output.WriteMessageArray(49, field_names[35], repeatedForeignMessage_); + } + if (repeatedProto2Message_.Count > 0) { + output.WriteMessageArray(50, field_names[41], repeatedProto2Message_); + } + if (repeatedNestedEnum_.Count > 0) { + output.WriteEnumArray(51, field_names[39], repeatedNestedEnum_); + } + if (repeatedForeignEnum_.Count > 0) { + output.WriteEnumArray(52, field_names[34], repeatedForeignEnum_); + } + if (repeatedStringPiece_.Count > 0) { + output.WriteStringArray(54, field_names[47], repeatedStringPiece_); + } + if (repeatedCord_.Count > 0) { + output.WriteStringArray(55, field_names[29], repeatedCord_); + } + if (repeatedLazyMessage_.Count > 0) { + output.WriteMessageArray(57, field_names[38], repeatedLazyMessage_); + } + if (OneofUint32 != 0) { + output.WriteUInt32(111, field_names[3], OneofUint32); + } + if (hasOneofNestedMessage) { + output.WriteMessage(112, field_names[1], OneofNestedMessage); + } + if (OneofString != "") { + output.WriteString(113, field_names[2], OneofString); + } + if (OneofEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + output.WriteEnum(114, field_names[0], (int) OneofEnum, OneofEnum); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (OptionalInt32 != 0) { + size += pb::CodedOutputStream.ComputeInt32Size(1, OptionalInt32); + } + if (OptionalInt64 != 0L) { + size += pb::CodedOutputStream.ComputeInt64Size(2, OptionalInt64); + } + if (OptionalUint32 != 0) { + size += pb::CodedOutputStream.ComputeUInt32Size(3, OptionalUint32); + } + if (OptionalUint64 != 0UL) { + size += pb::CodedOutputStream.ComputeUInt64Size(4, OptionalUint64); + } + if (OptionalSint32 != 0) { + size += pb::CodedOutputStream.ComputeSInt32Size(5, OptionalSint32); + } + if (OptionalSint64 != 0L) { + size += pb::CodedOutputStream.ComputeSInt64Size(6, OptionalSint64); + } + if (OptionalFixed32 != 0) { + size += pb::CodedOutputStream.ComputeFixed32Size(7, OptionalFixed32); + } + if (OptionalFixed64 != 0UL) { + size += pb::CodedOutputStream.ComputeFixed64Size(8, OptionalFixed64); + } + if (OptionalSfixed32 != 0) { + size += pb::CodedOutputStream.ComputeSFixed32Size(9, OptionalSfixed32); + } + if (OptionalSfixed64 != 0L) { + size += pb::CodedOutputStream.ComputeSFixed64Size(10, OptionalSfixed64); + } + if (OptionalFloat != 0F) { + size += pb::CodedOutputStream.ComputeFloatSize(11, OptionalFloat); + } + if (OptionalDouble != 0D) { + size += pb::CodedOutputStream.ComputeDoubleSize(12, OptionalDouble); + } + if (OptionalBool != false) { + size += pb::CodedOutputStream.ComputeBoolSize(13, OptionalBool); + } + if (OptionalString != "") { + size += pb::CodedOutputStream.ComputeStringSize(14, OptionalString); + } + if (OptionalBytes != pb::ByteString.Empty) { + size += pb::CodedOutputStream.ComputeBytesSize(15, OptionalBytes); + } + if (hasOptionalNestedMessage) { + size += pb::CodedOutputStream.ComputeMessageSize(18, OptionalNestedMessage); + } + if (hasOptionalForeignMessage) { + size += pb::CodedOutputStream.ComputeMessageSize(19, OptionalForeignMessage); + } + if (hasOptionalProto2Message) { + size += pb::CodedOutputStream.ComputeMessageSize(20, OptionalProto2Message); + } + if (OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + size += pb::CodedOutputStream.ComputeEnumSize(21, (int) OptionalNestedEnum); + } + if (OptionalForeignEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum.FOREIGN_FOO) { + size += pb::CodedOutputStream.ComputeEnumSize(22, (int) OptionalForeignEnum); + } + if (OptionalStringPiece != "") { + size += pb::CodedOutputStream.ComputeStringSize(24, OptionalStringPiece); + } + if (OptionalCord != "") { + size += pb::CodedOutputStream.ComputeStringSize(25, OptionalCord); + } + if (hasOptionalLazyMessage) { + size += pb::CodedOutputStream.ComputeMessageSize(30, OptionalLazyMessage); + } + { + int dataSize = 0; + foreach (int element in RepeatedInt32List) { + dataSize += pb::CodedOutputStream.ComputeInt32SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedInt32_.Count; + } + { + int dataSize = 0; + foreach (long element in RepeatedInt64List) { + dataSize += pb::CodedOutputStream.ComputeInt64SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedInt64_.Count; + } + { + int dataSize = 0; + foreach (uint element in RepeatedUint32List) { + dataSize += pb::CodedOutputStream.ComputeUInt32SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedUint32_.Count; + } + { + int dataSize = 0; + foreach (ulong element in RepeatedUint64List) { + dataSize += pb::CodedOutputStream.ComputeUInt64SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedUint64_.Count; + } + { + int dataSize = 0; + foreach (int element in RepeatedSint32List) { + dataSize += pb::CodedOutputStream.ComputeSInt32SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedSint32_.Count; + } + { + int dataSize = 0; + foreach (long element in RepeatedSint64List) { + dataSize += pb::CodedOutputStream.ComputeSInt64SizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedSint64_.Count; + } + { + int dataSize = 0; + dataSize = 4 * repeatedFixed32_.Count; + size += dataSize; + size += 2 * repeatedFixed32_.Count; + } + { + int dataSize = 0; + dataSize = 8 * repeatedFixed64_.Count; + size += dataSize; + size += 2 * repeatedFixed64_.Count; + } + { + int dataSize = 0; + dataSize = 4 * repeatedSfixed32_.Count; + size += dataSize; + size += 2 * repeatedSfixed32_.Count; + } + { + int dataSize = 0; + dataSize = 8 * repeatedSfixed64_.Count; + size += dataSize; + size += 2 * repeatedSfixed64_.Count; + } + { + int dataSize = 0; + dataSize = 4 * repeatedFloat_.Count; + size += dataSize; + size += 2 * repeatedFloat_.Count; + } + { + int dataSize = 0; + dataSize = 8 * repeatedDouble_.Count; + size += dataSize; + size += 2 * repeatedDouble_.Count; + } + { + int dataSize = 0; + dataSize = 1 * repeatedBool_.Count; + size += dataSize; + size += 2 * repeatedBool_.Count; + } + { + int dataSize = 0; + foreach (string element in RepeatedStringList) { + dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedString_.Count; + } + { + int dataSize = 0; + foreach (pb::ByteString element in RepeatedBytesList) { + dataSize += pb::CodedOutputStream.ComputeBytesSizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedBytes_.Count; + } + foreach (global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage element in RepeatedNestedMessageList) { + size += pb::CodedOutputStream.ComputeMessageSize(48, element); + } + foreach (global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage element in RepeatedForeignMessageList) { + size += pb::CodedOutputStream.ComputeMessageSize(49, element); + } + foreach (global::Google.ProtocolBuffers.TestProtos.TestAllTypes element in RepeatedProto2MessageList) { + size += pb::CodedOutputStream.ComputeMessageSize(50, element); + } + { + int dataSize = 0; + if (repeatedNestedEnum_.Count > 0) { + foreach (global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum element in repeatedNestedEnum_) { + dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); + } + size += dataSize; + size += 2 * repeatedNestedEnum_.Count; + } + } + { + int dataSize = 0; + if (repeatedForeignEnum_.Count > 0) { + foreach (global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum element in repeatedForeignEnum_) { + dataSize += pb::CodedOutputStream.ComputeEnumSizeNoTag((int) element); + } + size += dataSize; + size += 2 * repeatedForeignEnum_.Count; + } + } + { + int dataSize = 0; + foreach (string element in RepeatedStringPieceList) { + dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedStringPiece_.Count; + } + { + int dataSize = 0; + foreach (string element in RepeatedCordList) { + dataSize += pb::CodedOutputStream.ComputeStringSizeNoTag(element); + } + size += dataSize; + size += 2 * repeatedCord_.Count; + } + foreach (global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage element in RepeatedLazyMessageList) { + size += pb::CodedOutputStream.ComputeMessageSize(57, element); + } + if (OneofUint32 != 0) { + size += pb::CodedOutputStream.ComputeUInt32Size(111, OneofUint32); + } + if (hasOneofNestedMessage) { + size += pb::CodedOutputStream.ComputeMessageSize(112, OneofNestedMessage); + } + if (OneofString != "") { + size += pb::CodedOutputStream.ComputeStringSize(113, OneofString); + } + if (OneofEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + size += pb::CodedOutputStream.ComputeEnumSize(114, (int) OneofEnum); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static TestAllTypes ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestAllTypes ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestAllTypes ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static TestAllTypes ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestAllTypes ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private TestAllTypes MakeReadOnly() { + repeatedInt32_.MakeReadOnly(); + repeatedInt64_.MakeReadOnly(); + repeatedUint32_.MakeReadOnly(); + repeatedUint64_.MakeReadOnly(); + repeatedSint32_.MakeReadOnly(); + repeatedSint64_.MakeReadOnly(); + repeatedFixed32_.MakeReadOnly(); + repeatedFixed64_.MakeReadOnly(); + repeatedSfixed32_.MakeReadOnly(); + repeatedSfixed64_.MakeReadOnly(); + repeatedFloat_.MakeReadOnly(); + repeatedDouble_.MakeReadOnly(); + repeatedBool_.MakeReadOnly(); + repeatedString_.MakeReadOnly(); + repeatedBytes_.MakeReadOnly(); + repeatedNestedMessage_.MakeReadOnly(); + repeatedForeignMessage_.MakeReadOnly(); + repeatedProto2Message_.MakeReadOnly(); + repeatedNestedEnum_.MakeReadOnly(); + repeatedForeignEnum_.MakeReadOnly(); + repeatedStringPiece_.MakeReadOnly(); + repeatedCord_.MakeReadOnly(); + repeatedLazyMessage_.MakeReadOnly(); + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(TestAllTypes prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(TestAllTypes cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private TestAllTypes result; + + private TestAllTypes PrepareBuilder() { + if (resultIsReadOnly) { + TestAllTypes original = result; + result = new TestAllTypes(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override TestAllTypes MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Descriptor; } + } + + public override TestAllTypes DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.DefaultInstance; } + } + + public override TestAllTypes BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is TestAllTypes) { + return MergeFrom((TestAllTypes) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(TestAllTypes other) { + if (other == global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.DefaultInstance) return this; + PrepareBuilder(); + if (other.OptionalInt32 != 0) { + OptionalInt32 = other.OptionalInt32; + } + if (other.OptionalInt64 != 0L) { + OptionalInt64 = other.OptionalInt64; + } + if (other.OptionalUint32 != 0) { + OptionalUint32 = other.OptionalUint32; + } + if (other.OptionalUint64 != 0UL) { + OptionalUint64 = other.OptionalUint64; + } + if (other.OptionalSint32 != 0) { + OptionalSint32 = other.OptionalSint32; + } + if (other.OptionalSint64 != 0L) { + OptionalSint64 = other.OptionalSint64; + } + if (other.OptionalFixed32 != 0) { + OptionalFixed32 = other.OptionalFixed32; + } + if (other.OptionalFixed64 != 0UL) { + OptionalFixed64 = other.OptionalFixed64; + } + if (other.OptionalSfixed32 != 0) { + OptionalSfixed32 = other.OptionalSfixed32; + } + if (other.OptionalSfixed64 != 0L) { + OptionalSfixed64 = other.OptionalSfixed64; + } + if (other.OptionalFloat != 0F) { + OptionalFloat = other.OptionalFloat; + } + if (other.OptionalDouble != 0D) { + OptionalDouble = other.OptionalDouble; + } + if (other.OptionalBool != false) { + OptionalBool = other.OptionalBool; + } + if (other.OptionalString != "") { + OptionalString = other.OptionalString; + } + if (other.OptionalBytes != pb::ByteString.Empty) { + OptionalBytes = other.OptionalBytes; + } + if (other.HasOptionalNestedMessage) { + MergeOptionalNestedMessage(other.OptionalNestedMessage); + } + if (other.HasOptionalForeignMessage) { + MergeOptionalForeignMessage(other.OptionalForeignMessage); + } + if (other.HasOptionalProto2Message) { + MergeOptionalProto2Message(other.OptionalProto2Message); + } + if (other.OptionalNestedEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + OptionalNestedEnum = other.OptionalNestedEnum; + } + if (other.OptionalForeignEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum.FOREIGN_FOO) { + OptionalForeignEnum = other.OptionalForeignEnum; + } + if (other.OptionalStringPiece != "") { + OptionalStringPiece = other.OptionalStringPiece; + } + if (other.OptionalCord != "") { + OptionalCord = other.OptionalCord; + } + if (other.HasOptionalLazyMessage) { + MergeOptionalLazyMessage(other.OptionalLazyMessage); + } + if (other.repeatedInt32_.Count != 0) { + result.repeatedInt32_.Add(other.repeatedInt32_); + } + if (other.repeatedInt64_.Count != 0) { + result.repeatedInt64_.Add(other.repeatedInt64_); + } + if (other.repeatedUint32_.Count != 0) { + result.repeatedUint32_.Add(other.repeatedUint32_); + } + if (other.repeatedUint64_.Count != 0) { + result.repeatedUint64_.Add(other.repeatedUint64_); + } + if (other.repeatedSint32_.Count != 0) { + result.repeatedSint32_.Add(other.repeatedSint32_); + } + if (other.repeatedSint64_.Count != 0) { + result.repeatedSint64_.Add(other.repeatedSint64_); + } + if (other.repeatedFixed32_.Count != 0) { + result.repeatedFixed32_.Add(other.repeatedFixed32_); + } + if (other.repeatedFixed64_.Count != 0) { + result.repeatedFixed64_.Add(other.repeatedFixed64_); + } + if (other.repeatedSfixed32_.Count != 0) { + result.repeatedSfixed32_.Add(other.repeatedSfixed32_); + } + if (other.repeatedSfixed64_.Count != 0) { + result.repeatedSfixed64_.Add(other.repeatedSfixed64_); + } + if (other.repeatedFloat_.Count != 0) { + result.repeatedFloat_.Add(other.repeatedFloat_); + } + if (other.repeatedDouble_.Count != 0) { + result.repeatedDouble_.Add(other.repeatedDouble_); + } + if (other.repeatedBool_.Count != 0) { + result.repeatedBool_.Add(other.repeatedBool_); + } + if (other.repeatedString_.Count != 0) { + result.repeatedString_.Add(other.repeatedString_); + } + if (other.repeatedBytes_.Count != 0) { + result.repeatedBytes_.Add(other.repeatedBytes_); + } + if (other.repeatedNestedMessage_.Count != 0) { + result.repeatedNestedMessage_.Add(other.repeatedNestedMessage_); + } + if (other.repeatedForeignMessage_.Count != 0) { + result.repeatedForeignMessage_.Add(other.repeatedForeignMessage_); + } + if (other.repeatedProto2Message_.Count != 0) { + result.repeatedProto2Message_.Add(other.repeatedProto2Message_); + } + if (other.repeatedNestedEnum_.Count != 0) { + result.repeatedNestedEnum_.Add(other.repeatedNestedEnum_); + } + if (other.repeatedForeignEnum_.Count != 0) { + result.repeatedForeignEnum_.Add(other.repeatedForeignEnum_); + } + if (other.repeatedStringPiece_.Count != 0) { + result.repeatedStringPiece_.Add(other.repeatedStringPiece_); + } + if (other.repeatedCord_.Count != 0) { + result.repeatedCord_.Add(other.repeatedCord_); + } + if (other.repeatedLazyMessage_.Count != 0) { + result.repeatedLazyMessage_.Add(other.repeatedLazyMessage_); + } + if (other.OneofUint32 != 0) { + OneofUint32 = other.OneofUint32; + } + if (other.HasOneofNestedMessage) { + MergeOneofNestedMessage(other.OneofNestedMessage); + } + if (other.OneofString != "") { + OneofString = other.OneofString; + } + if (other.OneofEnum != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO) { + OneofEnum = other.OneofEnum; + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_testAllTypesFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _testAllTypesFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + input.ReadInt32(ref result.optionalInt32_); + break; + } + case 16: { + input.ReadInt64(ref result.optionalInt64_); + break; + } + case 24: { + input.ReadUInt32(ref result.optionalUint32_); + break; + } + case 32: { + input.ReadUInt64(ref result.optionalUint64_); + break; + } + case 40: { + input.ReadSInt32(ref result.optionalSint32_); + break; + } + case 48: { + input.ReadSInt64(ref result.optionalSint64_); + break; + } + case 61: { + input.ReadFixed32(ref result.optionalFixed32_); + break; + } + case 65: { + input.ReadFixed64(ref result.optionalFixed64_); + break; + } + case 77: { + input.ReadSFixed32(ref result.optionalSfixed32_); + break; + } + case 81: { + input.ReadSFixed64(ref result.optionalSfixed64_); + break; + } + case 93: { + input.ReadFloat(ref result.optionalFloat_); + break; + } + case 97: { + input.ReadDouble(ref result.optionalDouble_); + break; + } + case 104: { + input.ReadBool(ref result.optionalBool_); + break; + } + case 114: { + input.ReadString(ref result.optionalString_); + break; + } + case 122: { + input.ReadBytes(ref result.optionalBytes_); + break; + } + case 146: { + global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(); + if (result.hasOptionalNestedMessage) { + subBuilder.MergeFrom(OptionalNestedMessage); + } + input.ReadMessage(subBuilder, extensionRegistry); + OptionalNestedMessage = subBuilder.BuildPartial(); + break; + } + case 154: { + global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.CreateBuilder(); + if (result.hasOptionalForeignMessage) { + subBuilder.MergeFrom(OptionalForeignMessage); + } + input.ReadMessage(subBuilder, extensionRegistry); + OptionalForeignMessage = subBuilder.BuildPartial(); + break; + } + case 162: { + global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.CreateBuilder(); + if (result.hasOptionalProto2Message) { + subBuilder.MergeFrom(OptionalProto2Message); + } + input.ReadMessage(subBuilder, extensionRegistry); + OptionalProto2Message = subBuilder.BuildPartial(); + break; + } + case 168: { + object unknown; + if(input.ReadEnum(ref result.optionalNestedEnum_, out unknown)) { + } else if(unknown is int) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + unknownFields.MergeVarintField(21, (ulong)(int)unknown); + } + break; + } + case 176: { + object unknown; + if(input.ReadEnum(ref result.optionalForeignEnum_, out unknown)) { + } else if(unknown is int) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + unknownFields.MergeVarintField(22, (ulong)(int)unknown); + } + break; + } + case 194: { + input.ReadString(ref result.optionalStringPiece_); + break; + } + case 202: { + input.ReadString(ref result.optionalCord_); + break; + } + case 242: { + global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(); + if (result.hasOptionalLazyMessage) { + subBuilder.MergeFrom(OptionalLazyMessage); + } + input.ReadMessage(subBuilder, extensionRegistry); + OptionalLazyMessage = subBuilder.BuildPartial(); + break; + } + case 250: + case 248: { + input.ReadInt32Array(tag, field_name, result.repeatedInt32_); + break; + } + case 258: + case 256: { + input.ReadInt64Array(tag, field_name, result.repeatedInt64_); + break; + } + case 266: + case 264: { + input.ReadUInt32Array(tag, field_name, result.repeatedUint32_); + break; + } + case 274: + case 272: { + input.ReadUInt64Array(tag, field_name, result.repeatedUint64_); + break; + } + case 282: + case 280: { + input.ReadSInt32Array(tag, field_name, result.repeatedSint32_); + break; + } + case 290: + case 288: { + input.ReadSInt64Array(tag, field_name, result.repeatedSint64_); + break; + } + case 298: + case 301: { + input.ReadFixed32Array(tag, field_name, result.repeatedFixed32_); + break; + } + case 306: + case 305: { + input.ReadFixed64Array(tag, field_name, result.repeatedFixed64_); + break; + } + case 314: + case 317: { + input.ReadSFixed32Array(tag, field_name, result.repeatedSfixed32_); + break; + } + case 322: + case 321: { + input.ReadSFixed64Array(tag, field_name, result.repeatedSfixed64_); + break; + } + case 330: + case 333: { + input.ReadFloatArray(tag, field_name, result.repeatedFloat_); + break; + } + case 338: + case 337: { + input.ReadDoubleArray(tag, field_name, result.repeatedDouble_); + break; + } + case 346: + case 344: { + input.ReadBoolArray(tag, field_name, result.repeatedBool_); + break; + } + case 354: { + input.ReadStringArray(tag, field_name, result.repeatedString_); + break; + } + case 362: { + input.ReadBytesArray(tag, field_name, result.repeatedBytes_); + break; + } + case 386: { + input.ReadMessageArray(tag, field_name, result.repeatedNestedMessage_, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance, extensionRegistry); + break; + } + case 394: { + input.ReadMessageArray(tag, field_name, result.repeatedForeignMessage_, global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.DefaultInstance, extensionRegistry); + break; + } + case 402: { + input.ReadMessageArray(tag, field_name, result.repeatedProto2Message_, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance, extensionRegistry); + break; + } + case 410: + case 408: { + scg::ICollection unknownItems; + input.ReadEnumArray(tag, field_name, result.repeatedNestedEnum_, out unknownItems); + if (unknownItems != null) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + foreach (object rawValue in unknownItems) + if (rawValue is int) + unknownFields.MergeVarintField(51, (ulong)(int)rawValue); + } + break; + } + case 418: + case 416: { + scg::ICollection unknownItems; + input.ReadEnumArray(tag, field_name, result.repeatedForeignEnum_, out unknownItems); + if (unknownItems != null) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + foreach (object rawValue in unknownItems) + if (rawValue is int) + unknownFields.MergeVarintField(52, (ulong)(int)rawValue); + } + break; + } + case 434: { + input.ReadStringArray(tag, field_name, result.repeatedStringPiece_); + break; + } + case 442: { + input.ReadStringArray(tag, field_name, result.repeatedCord_); + break; + } + case 458: { + input.ReadMessageArray(tag, field_name, result.repeatedLazyMessage_, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance, extensionRegistry); + break; + } + case 888: { + input.ReadUInt32(ref result.oneofUint32_); + break; + } + case 898: { + global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(); + if (result.hasOneofNestedMessage) { + subBuilder.MergeFrom(OneofNestedMessage); + } + input.ReadMessage(subBuilder, extensionRegistry); + OneofNestedMessage = subBuilder.BuildPartial(); + break; + } + case 906: { + input.ReadString(ref result.oneofString_); + break; + } + case 912: { + object unknown; + if(input.ReadEnum(ref result.oneofEnum_, out unknown)) { + } else if(unknown is int) { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + unknownFields.MergeVarintField(114, (ulong)(int)unknown); + } + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public int OptionalInt32 { + get { return result.OptionalInt32; } + set { SetOptionalInt32(value); } + } + public Builder SetOptionalInt32(int value) { + PrepareBuilder(); + result.optionalInt32_ = value; + return this; + } + public Builder ClearOptionalInt32() { + PrepareBuilder(); + result.optionalInt32_ = 0; + return this; + } + + public long OptionalInt64 { + get { return result.OptionalInt64; } + set { SetOptionalInt64(value); } + } + public Builder SetOptionalInt64(long value) { + PrepareBuilder(); + result.optionalInt64_ = value; + return this; + } + public Builder ClearOptionalInt64() { + PrepareBuilder(); + result.optionalInt64_ = 0L; + return this; + } + + public uint OptionalUint32 { + get { return result.OptionalUint32; } + set { SetOptionalUint32(value); } + } + public Builder SetOptionalUint32(uint value) { + PrepareBuilder(); + result.optionalUint32_ = value; + return this; + } + public Builder ClearOptionalUint32() { + PrepareBuilder(); + result.optionalUint32_ = 0; + return this; + } + + public ulong OptionalUint64 { + get { return result.OptionalUint64; } + set { SetOptionalUint64(value); } + } + public Builder SetOptionalUint64(ulong value) { + PrepareBuilder(); + result.optionalUint64_ = value; + return this; + } + public Builder ClearOptionalUint64() { + PrepareBuilder(); + result.optionalUint64_ = 0UL; + return this; + } + + public int OptionalSint32 { + get { return result.OptionalSint32; } + set { SetOptionalSint32(value); } + } + public Builder SetOptionalSint32(int value) { + PrepareBuilder(); + result.optionalSint32_ = value; + return this; + } + public Builder ClearOptionalSint32() { + PrepareBuilder(); + result.optionalSint32_ = 0; + return this; + } + + public long OptionalSint64 { + get { return result.OptionalSint64; } + set { SetOptionalSint64(value); } + } + public Builder SetOptionalSint64(long value) { + PrepareBuilder(); + result.optionalSint64_ = value; + return this; + } + public Builder ClearOptionalSint64() { + PrepareBuilder(); + result.optionalSint64_ = 0L; + return this; + } + + public uint OptionalFixed32 { + get { return result.OptionalFixed32; } + set { SetOptionalFixed32(value); } + } + public Builder SetOptionalFixed32(uint value) { + PrepareBuilder(); + result.optionalFixed32_ = value; + return this; + } + public Builder ClearOptionalFixed32() { + PrepareBuilder(); + result.optionalFixed32_ = 0; + return this; + } + + public ulong OptionalFixed64 { + get { return result.OptionalFixed64; } + set { SetOptionalFixed64(value); } + } + public Builder SetOptionalFixed64(ulong value) { + PrepareBuilder(); + result.optionalFixed64_ = value; + return this; + } + public Builder ClearOptionalFixed64() { + PrepareBuilder(); + result.optionalFixed64_ = 0UL; + return this; + } + + public int OptionalSfixed32 { + get { return result.OptionalSfixed32; } + set { SetOptionalSfixed32(value); } + } + public Builder SetOptionalSfixed32(int value) { + PrepareBuilder(); + result.optionalSfixed32_ = value; + return this; + } + public Builder ClearOptionalSfixed32() { + PrepareBuilder(); + result.optionalSfixed32_ = 0; + return this; + } + + public long OptionalSfixed64 { + get { return result.OptionalSfixed64; } + set { SetOptionalSfixed64(value); } + } + public Builder SetOptionalSfixed64(long value) { + PrepareBuilder(); + result.optionalSfixed64_ = value; + return this; + } + public Builder ClearOptionalSfixed64() { + PrepareBuilder(); + result.optionalSfixed64_ = 0L; + return this; + } + + public float OptionalFloat { + get { return result.OptionalFloat; } + set { SetOptionalFloat(value); } + } + public Builder SetOptionalFloat(float value) { + PrepareBuilder(); + result.optionalFloat_ = value; + return this; + } + public Builder ClearOptionalFloat() { + PrepareBuilder(); + result.optionalFloat_ = 0F; + return this; + } + + public double OptionalDouble { + get { return result.OptionalDouble; } + set { SetOptionalDouble(value); } + } + public Builder SetOptionalDouble(double value) { + PrepareBuilder(); + result.optionalDouble_ = value; + return this; + } + public Builder ClearOptionalDouble() { + PrepareBuilder(); + result.optionalDouble_ = 0D; + return this; + } + + public bool OptionalBool { + get { return result.OptionalBool; } + set { SetOptionalBool(value); } + } + public Builder SetOptionalBool(bool value) { + PrepareBuilder(); + result.optionalBool_ = value; + return this; + } + public Builder ClearOptionalBool() { + PrepareBuilder(); + result.optionalBool_ = false; + return this; + } + + public string OptionalString { + get { return result.OptionalString; } + set { SetOptionalString(value); } + } + public Builder SetOptionalString(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalString_ = value; + return this; + } + public Builder ClearOptionalString() { + PrepareBuilder(); + result.optionalString_ = ""; + return this; + } + + public pb::ByteString OptionalBytes { + get { return result.OptionalBytes; } + set { SetOptionalBytes(value); } + } + public Builder SetOptionalBytes(pb::ByteString value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalBytes_ = value; + return this; + } + public Builder ClearOptionalBytes() { + PrepareBuilder(); + result.optionalBytes_ = pb::ByteString.Empty; + return this; + } + + public bool HasOptionalNestedMessage { + get { return result.hasOptionalNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OptionalNestedMessage { + get { return result.OptionalNestedMessage; } + set { SetOptionalNestedMessage(value); } + } + public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOptionalNestedMessage = true; + result.optionalNestedMessage_ = value; + return this; + } + public Builder SetOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOptionalNestedMessage = true; + result.optionalNestedMessage_ = builderForValue.Build(); + return this; + } + public Builder MergeOptionalNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOptionalNestedMessage && + result.optionalNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance) { + result.optionalNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalNestedMessage_).MergeFrom(value).BuildPartial(); + } else { + result.optionalNestedMessage_ = value; + } + result.hasOptionalNestedMessage = true; + return this; + } + public Builder ClearOptionalNestedMessage() { + PrepareBuilder(); + result.hasOptionalNestedMessage = false; + result.optionalNestedMessage_ = null; + return this; + } + + public bool HasOptionalForeignMessage { + get { return result.hasOptionalForeignMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage OptionalForeignMessage { + get { return result.OptionalForeignMessage; } + set { SetOptionalForeignMessage(value); } + } + public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOptionalForeignMessage = true; + result.optionalForeignMessage_ = value; + return this; + } + public Builder SetOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOptionalForeignMessage = true; + result.optionalForeignMessage_ = builderForValue.Build(); + return this; + } + public Builder MergeOptionalForeignMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOptionalForeignMessage && + result.optionalForeignMessage_ != global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.DefaultInstance) { + result.optionalForeignMessage_ = global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.CreateBuilder(result.optionalForeignMessage_).MergeFrom(value).BuildPartial(); + } else { + result.optionalForeignMessage_ = value; + } + result.hasOptionalForeignMessage = true; + return this; + } + public Builder ClearOptionalForeignMessage() { + PrepareBuilder(); + result.hasOptionalForeignMessage = false; + result.optionalForeignMessage_ = null; + return this; + } + + public bool HasOptionalProto2Message { + get { return result.hasOptionalProto2Message; } + } + public global::Google.ProtocolBuffers.TestProtos.TestAllTypes OptionalProto2Message { + get { return result.OptionalProto2Message; } + set { SetOptionalProto2Message(value); } + } + public Builder SetOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOptionalProto2Message = true; + result.optionalProto2Message_ = value; + return this; + } + public Builder SetOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOptionalProto2Message = true; + result.optionalProto2Message_ = builderForValue.Build(); + return this; + } + public Builder MergeOptionalProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOptionalProto2Message && + result.optionalProto2Message_ != global::Google.ProtocolBuffers.TestProtos.TestAllTypes.DefaultInstance) { + result.optionalProto2Message_ = global::Google.ProtocolBuffers.TestProtos.TestAllTypes.CreateBuilder(result.optionalProto2Message_).MergeFrom(value).BuildPartial(); + } else { + result.optionalProto2Message_ = value; + } + result.hasOptionalProto2Message = true; + return this; + } + public Builder ClearOptionalProto2Message() { + PrepareBuilder(); + result.hasOptionalProto2Message = false; + result.optionalProto2Message_ = null; + return this; + } + + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum OptionalNestedEnum { + get { return result.OptionalNestedEnum; } + set { SetOptionalNestedEnum(value); } + } + public Builder SetOptionalNestedEnum(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum value) { + PrepareBuilder(); + result.optionalNestedEnum_ = value; + return this; + } + public Builder ClearOptionalNestedEnum() { + PrepareBuilder(); + result.optionalNestedEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO; + return this; + } + + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum OptionalForeignEnum { + get { return result.OptionalForeignEnum; } + set { SetOptionalForeignEnum(value); } + } + public Builder SetOptionalForeignEnum(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum value) { + PrepareBuilder(); + result.optionalForeignEnum_ = value; + return this; + } + public Builder ClearOptionalForeignEnum() { + PrepareBuilder(); + result.optionalForeignEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum.FOREIGN_FOO; + return this; + } + + public string OptionalStringPiece { + get { return result.OptionalStringPiece; } + set { SetOptionalStringPiece(value); } + } + public Builder SetOptionalStringPiece(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalStringPiece_ = value; + return this; + } + public Builder ClearOptionalStringPiece() { + PrepareBuilder(); + result.optionalStringPiece_ = ""; + return this; + } + + public string OptionalCord { + get { return result.OptionalCord; } + set { SetOptionalCord(value); } + } + public Builder SetOptionalCord(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.optionalCord_ = value; + return this; + } + public Builder ClearOptionalCord() { + PrepareBuilder(); + result.optionalCord_ = ""; + return this; + } + + public bool HasOptionalLazyMessage { + get { return result.hasOptionalLazyMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OptionalLazyMessage { + get { return result.OptionalLazyMessage; } + set { SetOptionalLazyMessage(value); } + } + public Builder SetOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOptionalLazyMessage = true; + result.optionalLazyMessage_ = value; + return this; + } + public Builder SetOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOptionalLazyMessage = true; + result.optionalLazyMessage_ = builderForValue.Build(); + return this; + } + public Builder MergeOptionalLazyMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOptionalLazyMessage && + result.optionalLazyMessage_ != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance) { + result.optionalLazyMessage_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(result.optionalLazyMessage_).MergeFrom(value).BuildPartial(); + } else { + result.optionalLazyMessage_ = value; + } + result.hasOptionalLazyMessage = true; + return this; + } + public Builder ClearOptionalLazyMessage() { + PrepareBuilder(); + result.hasOptionalLazyMessage = false; + result.optionalLazyMessage_ = null; + return this; + } + + public pbc::IPopsicleList RepeatedInt32List { + get { return PrepareBuilder().repeatedInt32_; } + } + public int RepeatedInt32Count { + get { return result.RepeatedInt32Count; } + } + public int GetRepeatedInt32(int index) { + return result.GetRepeatedInt32(index); + } + public Builder SetRepeatedInt32(int index, int value) { + PrepareBuilder(); + result.repeatedInt32_[index] = value; + return this; + } + public Builder AddRepeatedInt32(int value) { + PrepareBuilder(); + result.repeatedInt32_.Add(value); + return this; + } + public Builder AddRangeRepeatedInt32(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedInt32_.Add(values); + return this; + } + public Builder ClearRepeatedInt32() { + PrepareBuilder(); + result.repeatedInt32_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedInt64List { + get { return PrepareBuilder().repeatedInt64_; } + } + public int RepeatedInt64Count { + get { return result.RepeatedInt64Count; } + } + public long GetRepeatedInt64(int index) { + return result.GetRepeatedInt64(index); + } + public Builder SetRepeatedInt64(int index, long value) { + PrepareBuilder(); + result.repeatedInt64_[index] = value; + return this; + } + public Builder AddRepeatedInt64(long value) { + PrepareBuilder(); + result.repeatedInt64_.Add(value); + return this; + } + public Builder AddRangeRepeatedInt64(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedInt64_.Add(values); + return this; + } + public Builder ClearRepeatedInt64() { + PrepareBuilder(); + result.repeatedInt64_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedUint32List { + get { return PrepareBuilder().repeatedUint32_; } + } + public int RepeatedUint32Count { + get { return result.RepeatedUint32Count; } + } + public uint GetRepeatedUint32(int index) { + return result.GetRepeatedUint32(index); + } + public Builder SetRepeatedUint32(int index, uint value) { + PrepareBuilder(); + result.repeatedUint32_[index] = value; + return this; + } + public Builder AddRepeatedUint32(uint value) { + PrepareBuilder(); + result.repeatedUint32_.Add(value); + return this; + } + public Builder AddRangeRepeatedUint32(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedUint32_.Add(values); + return this; + } + public Builder ClearRepeatedUint32() { + PrepareBuilder(); + result.repeatedUint32_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedUint64List { + get { return PrepareBuilder().repeatedUint64_; } + } + public int RepeatedUint64Count { + get { return result.RepeatedUint64Count; } + } + public ulong GetRepeatedUint64(int index) { + return result.GetRepeatedUint64(index); + } + public Builder SetRepeatedUint64(int index, ulong value) { + PrepareBuilder(); + result.repeatedUint64_[index] = value; + return this; + } + public Builder AddRepeatedUint64(ulong value) { + PrepareBuilder(); + result.repeatedUint64_.Add(value); + return this; + } + public Builder AddRangeRepeatedUint64(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedUint64_.Add(values); + return this; + } + public Builder ClearRepeatedUint64() { + PrepareBuilder(); + result.repeatedUint64_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedSint32List { + get { return PrepareBuilder().repeatedSint32_; } + } + public int RepeatedSint32Count { + get { return result.RepeatedSint32Count; } + } + public int GetRepeatedSint32(int index) { + return result.GetRepeatedSint32(index); + } + public Builder SetRepeatedSint32(int index, int value) { + PrepareBuilder(); + result.repeatedSint32_[index] = value; + return this; + } + public Builder AddRepeatedSint32(int value) { + PrepareBuilder(); + result.repeatedSint32_.Add(value); + return this; + } + public Builder AddRangeRepeatedSint32(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedSint32_.Add(values); + return this; + } + public Builder ClearRepeatedSint32() { + PrepareBuilder(); + result.repeatedSint32_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedSint64List { + get { return PrepareBuilder().repeatedSint64_; } + } + public int RepeatedSint64Count { + get { return result.RepeatedSint64Count; } + } + public long GetRepeatedSint64(int index) { + return result.GetRepeatedSint64(index); + } + public Builder SetRepeatedSint64(int index, long value) { + PrepareBuilder(); + result.repeatedSint64_[index] = value; + return this; + } + public Builder AddRepeatedSint64(long value) { + PrepareBuilder(); + result.repeatedSint64_.Add(value); + return this; + } + public Builder AddRangeRepeatedSint64(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedSint64_.Add(values); + return this; + } + public Builder ClearRepeatedSint64() { + PrepareBuilder(); + result.repeatedSint64_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedFixed32List { + get { return PrepareBuilder().repeatedFixed32_; } + } + public int RepeatedFixed32Count { + get { return result.RepeatedFixed32Count; } + } + public uint GetRepeatedFixed32(int index) { + return result.GetRepeatedFixed32(index); + } + public Builder SetRepeatedFixed32(int index, uint value) { + PrepareBuilder(); + result.repeatedFixed32_[index] = value; + return this; + } + public Builder AddRepeatedFixed32(uint value) { + PrepareBuilder(); + result.repeatedFixed32_.Add(value); + return this; + } + public Builder AddRangeRepeatedFixed32(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedFixed32_.Add(values); + return this; + } + public Builder ClearRepeatedFixed32() { + PrepareBuilder(); + result.repeatedFixed32_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedFixed64List { + get { return PrepareBuilder().repeatedFixed64_; } + } + public int RepeatedFixed64Count { + get { return result.RepeatedFixed64Count; } + } + public ulong GetRepeatedFixed64(int index) { + return result.GetRepeatedFixed64(index); + } + public Builder SetRepeatedFixed64(int index, ulong value) { + PrepareBuilder(); + result.repeatedFixed64_[index] = value; + return this; + } + public Builder AddRepeatedFixed64(ulong value) { + PrepareBuilder(); + result.repeatedFixed64_.Add(value); + return this; + } + public Builder AddRangeRepeatedFixed64(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedFixed64_.Add(values); + return this; + } + public Builder ClearRepeatedFixed64() { + PrepareBuilder(); + result.repeatedFixed64_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedSfixed32List { + get { return PrepareBuilder().repeatedSfixed32_; } + } + public int RepeatedSfixed32Count { + get { return result.RepeatedSfixed32Count; } + } + public int GetRepeatedSfixed32(int index) { + return result.GetRepeatedSfixed32(index); + } + public Builder SetRepeatedSfixed32(int index, int value) { + PrepareBuilder(); + result.repeatedSfixed32_[index] = value; + return this; + } + public Builder AddRepeatedSfixed32(int value) { + PrepareBuilder(); + result.repeatedSfixed32_.Add(value); + return this; + } + public Builder AddRangeRepeatedSfixed32(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedSfixed32_.Add(values); + return this; + } + public Builder ClearRepeatedSfixed32() { + PrepareBuilder(); + result.repeatedSfixed32_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedSfixed64List { + get { return PrepareBuilder().repeatedSfixed64_; } + } + public int RepeatedSfixed64Count { + get { return result.RepeatedSfixed64Count; } + } + public long GetRepeatedSfixed64(int index) { + return result.GetRepeatedSfixed64(index); + } + public Builder SetRepeatedSfixed64(int index, long value) { + PrepareBuilder(); + result.repeatedSfixed64_[index] = value; + return this; + } + public Builder AddRepeatedSfixed64(long value) { + PrepareBuilder(); + result.repeatedSfixed64_.Add(value); + return this; + } + public Builder AddRangeRepeatedSfixed64(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedSfixed64_.Add(values); + return this; + } + public Builder ClearRepeatedSfixed64() { + PrepareBuilder(); + result.repeatedSfixed64_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedFloatList { + get { return PrepareBuilder().repeatedFloat_; } + } + public int RepeatedFloatCount { + get { return result.RepeatedFloatCount; } + } + public float GetRepeatedFloat(int index) { + return result.GetRepeatedFloat(index); + } + public Builder SetRepeatedFloat(int index, float value) { + PrepareBuilder(); + result.repeatedFloat_[index] = value; + return this; + } + public Builder AddRepeatedFloat(float value) { + PrepareBuilder(); + result.repeatedFloat_.Add(value); + return this; + } + public Builder AddRangeRepeatedFloat(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedFloat_.Add(values); + return this; + } + public Builder ClearRepeatedFloat() { + PrepareBuilder(); + result.repeatedFloat_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedDoubleList { + get { return PrepareBuilder().repeatedDouble_; } + } + public int RepeatedDoubleCount { + get { return result.RepeatedDoubleCount; } + } + public double GetRepeatedDouble(int index) { + return result.GetRepeatedDouble(index); + } + public Builder SetRepeatedDouble(int index, double value) { + PrepareBuilder(); + result.repeatedDouble_[index] = value; + return this; + } + public Builder AddRepeatedDouble(double value) { + PrepareBuilder(); + result.repeatedDouble_.Add(value); + return this; + } + public Builder AddRangeRepeatedDouble(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedDouble_.Add(values); + return this; + } + public Builder ClearRepeatedDouble() { + PrepareBuilder(); + result.repeatedDouble_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedBoolList { + get { return PrepareBuilder().repeatedBool_; } + } + public int RepeatedBoolCount { + get { return result.RepeatedBoolCount; } + } + public bool GetRepeatedBool(int index) { + return result.GetRepeatedBool(index); + } + public Builder SetRepeatedBool(int index, bool value) { + PrepareBuilder(); + result.repeatedBool_[index] = value; + return this; + } + public Builder AddRepeatedBool(bool value) { + PrepareBuilder(); + result.repeatedBool_.Add(value); + return this; + } + public Builder AddRangeRepeatedBool(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedBool_.Add(values); + return this; + } + public Builder ClearRepeatedBool() { + PrepareBuilder(); + result.repeatedBool_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedStringList { + get { return PrepareBuilder().repeatedString_; } + } + public int RepeatedStringCount { + get { return result.RepeatedStringCount; } + } + public string GetRepeatedString(int index) { + return result.GetRepeatedString(index); + } + public Builder SetRepeatedString(int index, string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedString_[index] = value; + return this; + } + public Builder AddRepeatedString(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedString_.Add(value); + return this; + } + public Builder AddRangeRepeatedString(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedString_.Add(values); + return this; + } + public Builder ClearRepeatedString() { + PrepareBuilder(); + result.repeatedString_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedBytesList { + get { return PrepareBuilder().repeatedBytes_; } + } + public int RepeatedBytesCount { + get { return result.RepeatedBytesCount; } + } + public pb::ByteString GetRepeatedBytes(int index) { + return result.GetRepeatedBytes(index); + } + public Builder SetRepeatedBytes(int index, pb::ByteString value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedBytes_[index] = value; + return this; + } + public Builder AddRepeatedBytes(pb::ByteString value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedBytes_.Add(value); + return this; + } + public Builder AddRangeRepeatedBytes(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedBytes_.Add(values); + return this; + } + public Builder ClearRepeatedBytes() { + PrepareBuilder(); + result.repeatedBytes_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedNestedMessageList { + get { return PrepareBuilder().repeatedNestedMessage_; } + } + public int RepeatedNestedMessageCount { + get { return result.RepeatedNestedMessageCount; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage GetRepeatedNestedMessage(int index) { + return result.GetRepeatedNestedMessage(index); + } + public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedNestedMessage_[index] = value; + return this; + } + public Builder SetRepeatedNestedMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedNestedMessage_[index] = builderForValue.Build(); + return this; + } + public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedNestedMessage_.Add(value); + return this; + } + public Builder AddRepeatedNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedNestedMessage_.Add(builderForValue.Build()); + return this; + } + public Builder AddRangeRepeatedNestedMessage(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedNestedMessage_.Add(values); + return this; + } + public Builder ClearRepeatedNestedMessage() { + PrepareBuilder(); + result.repeatedNestedMessage_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedForeignMessageList { + get { return PrepareBuilder().repeatedForeignMessage_; } + } + public int RepeatedForeignMessageCount { + get { return result.RepeatedForeignMessageCount; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage GetRepeatedForeignMessage(int index) { + return result.GetRepeatedForeignMessage(index); + } + public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedForeignMessage_[index] = value; + return this; + } + public Builder SetRepeatedForeignMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedForeignMessage_[index] = builderForValue.Build(); + return this; + } + public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedForeignMessage_.Add(value); + return this; + } + public Builder AddRepeatedForeignMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedForeignMessage_.Add(builderForValue.Build()); + return this; + } + public Builder AddRangeRepeatedForeignMessage(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedForeignMessage_.Add(values); + return this; + } + public Builder ClearRepeatedForeignMessage() { + PrepareBuilder(); + result.repeatedForeignMessage_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedProto2MessageList { + get { return PrepareBuilder().repeatedProto2Message_; } + } + public int RepeatedProto2MessageCount { + get { return result.RepeatedProto2MessageCount; } + } + public global::Google.ProtocolBuffers.TestProtos.TestAllTypes GetRepeatedProto2Message(int index) { + return result.GetRepeatedProto2Message(index); + } + public Builder SetRepeatedProto2Message(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedProto2Message_[index] = value; + return this; + } + public Builder SetRepeatedProto2Message(int index, global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedProto2Message_[index] = builderForValue.Build(); + return this; + } + public Builder AddRepeatedProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedProto2Message_.Add(value); + return this; + } + public Builder AddRepeatedProto2Message(global::Google.ProtocolBuffers.TestProtos.TestAllTypes.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedProto2Message_.Add(builderForValue.Build()); + return this; + } + public Builder AddRangeRepeatedProto2Message(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedProto2Message_.Add(values); + return this; + } + public Builder ClearRepeatedProto2Message() { + PrepareBuilder(); + result.repeatedProto2Message_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedNestedEnumList { + get { return PrepareBuilder().repeatedNestedEnum_; } + } + public int RepeatedNestedEnumCount { + get { return result.RepeatedNestedEnumCount; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum GetRepeatedNestedEnum(int index) { + return result.GetRepeatedNestedEnum(index); + } + public Builder SetRepeatedNestedEnum(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum value) { + PrepareBuilder(); + result.repeatedNestedEnum_[index] = value; + return this; + } + public Builder AddRepeatedNestedEnum(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum value) { + PrepareBuilder(); + result.repeatedNestedEnum_.Add(value); + return this; + } + public Builder AddRangeRepeatedNestedEnum(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedNestedEnum_.Add(values); + return this; + } + public Builder ClearRepeatedNestedEnum() { + PrepareBuilder(); + result.repeatedNestedEnum_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedForeignEnumList { + get { return PrepareBuilder().repeatedForeignEnum_; } + } + public int RepeatedForeignEnumCount { + get { return result.RepeatedForeignEnumCount; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum GetRepeatedForeignEnum(int index) { + return result.GetRepeatedForeignEnum(index); + } + public Builder SetRepeatedForeignEnum(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum value) { + PrepareBuilder(); + result.repeatedForeignEnum_[index] = value; + return this; + } + public Builder AddRepeatedForeignEnum(global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignEnum value) { + PrepareBuilder(); + result.repeatedForeignEnum_.Add(value); + return this; + } + public Builder AddRangeRepeatedForeignEnum(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedForeignEnum_.Add(values); + return this; + } + public Builder ClearRepeatedForeignEnum() { + PrepareBuilder(); + result.repeatedForeignEnum_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedStringPieceList { + get { return PrepareBuilder().repeatedStringPiece_; } + } + public int RepeatedStringPieceCount { + get { return result.RepeatedStringPieceCount; } + } + public string GetRepeatedStringPiece(int index) { + return result.GetRepeatedStringPiece(index); + } + public Builder SetRepeatedStringPiece(int index, string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedStringPiece_[index] = value; + return this; + } + public Builder AddRepeatedStringPiece(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedStringPiece_.Add(value); + return this; + } + public Builder AddRangeRepeatedStringPiece(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedStringPiece_.Add(values); + return this; + } + public Builder ClearRepeatedStringPiece() { + PrepareBuilder(); + result.repeatedStringPiece_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedCordList { + get { return PrepareBuilder().repeatedCord_; } + } + public int RepeatedCordCount { + get { return result.RepeatedCordCount; } + } + public string GetRepeatedCord(int index) { + return result.GetRepeatedCord(index); + } + public Builder SetRepeatedCord(int index, string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedCord_[index] = value; + return this; + } + public Builder AddRepeatedCord(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedCord_.Add(value); + return this; + } + public Builder AddRangeRepeatedCord(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedCord_.Add(values); + return this; + } + public Builder ClearRepeatedCord() { + PrepareBuilder(); + result.repeatedCord_.Clear(); + return this; + } + + public pbc::IPopsicleList RepeatedLazyMessageList { + get { return PrepareBuilder().repeatedLazyMessage_; } + } + public int RepeatedLazyMessageCount { + get { return result.RepeatedLazyMessageCount; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage GetRepeatedLazyMessage(int index) { + return result.GetRepeatedLazyMessage(index); + } + public Builder SetRepeatedLazyMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedLazyMessage_[index] = value; + return this; + } + public Builder SetRepeatedLazyMessage(int index, global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedLazyMessage_[index] = builderForValue.Build(); + return this; + } + public Builder AddRepeatedLazyMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.repeatedLazyMessage_.Add(value); + return this; + } + public Builder AddRepeatedLazyMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.repeatedLazyMessage_.Add(builderForValue.Build()); + return this; + } + public Builder AddRangeRepeatedLazyMessage(scg::IEnumerable values) { + PrepareBuilder(); + result.repeatedLazyMessage_.Add(values); + return this; + } + public Builder ClearRepeatedLazyMessage() { + PrepareBuilder(); + result.repeatedLazyMessage_.Clear(); + return this; + } + + public uint OneofUint32 { + get { return result.OneofUint32; } + set { SetOneofUint32(value); } + } + public Builder SetOneofUint32(uint value) { + PrepareBuilder(); + result.oneofUint32_ = value; + return this; + } + public Builder ClearOneofUint32() { + PrepareBuilder(); + result.oneofUint32_ = 0; + return this; + } + + public bool HasOneofNestedMessage { + get { return result.hasOneofNestedMessage; } + } + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage OneofNestedMessage { + get { return result.OneofNestedMessage; } + set { SetOneofNestedMessage(value); } + } + public Builder SetOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasOneofNestedMessage = true; + result.oneofNestedMessage_ = value; + return this; + } + public Builder SetOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasOneofNestedMessage = true; + result.oneofNestedMessage_ = builderForValue.Build(); + return this; + } + public Builder MergeOneofNestedMessage(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasOneofNestedMessage && + result.oneofNestedMessage_ != global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.DefaultInstance) { + result.oneofNestedMessage_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedMessage.CreateBuilder(result.oneofNestedMessage_).MergeFrom(value).BuildPartial(); + } else { + result.oneofNestedMessage_ = value; + } + result.hasOneofNestedMessage = true; + return this; + } + public Builder ClearOneofNestedMessage() { + PrepareBuilder(); + result.hasOneofNestedMessage = false; + result.oneofNestedMessage_ = null; + return this; + } + + public string OneofString { + get { return result.OneofString; } + set { SetOneofString(value); } + } + public Builder SetOneofString(string value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.oneofString_ = value; + return this; + } + public Builder ClearOneofString() { + PrepareBuilder(); + result.oneofString_ = ""; + return this; + } + + public global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum OneofEnum { + get { return result.OneofEnum; } + set { SetOneofEnum(value); } + } + public Builder SetOneofEnum(global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum value) { + PrepareBuilder(); + result.oneofEnum_ = value; + return this; + } + public Builder ClearOneofEnum() { + PrepareBuilder(); + result.oneofEnum_ = global::Google.ProtocolBuffers.TestProtos.Proto3.TestAllTypes.Types.NestedEnum.FOO; + return this; + } + } + static TestAllTypes() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.Descriptor, null); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class TestProto2Required : pb::GeneratedMessage { + private TestProto2Required() { } + private static readonly TestProto2Required defaultInstance = new TestProto2Required().MakeReadOnly(); + private static readonly string[] _testProto2RequiredFieldNames = new string[] { "proto2" }; + private static readonly uint[] _testProto2RequiredFieldTags = new uint[] { 10 }; + public static TestProto2Required DefaultInstance { + get { return defaultInstance; } + } + + public override TestProto2Required DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override TestProto2Required ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestProto2Required__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_TestProto2Required__FieldAccessorTable; } + } + + public const int Proto2FieldNumber = 1; + private bool hasProto2; + private global::Google.ProtocolBuffers.TestProtos.TestRequired proto2_; + public bool HasProto2 { + get { return hasProto2; } + } + public global::Google.ProtocolBuffers.TestProtos.TestRequired Proto2 { + get { return proto2_ ?? global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _testProto2RequiredFieldNames; + if (hasProto2) { + output.WriteMessage(1, field_names[0], Proto2); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (hasProto2) { + size += pb::CodedOutputStream.ComputeMessageSize(1, Proto2); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static TestProto2Required ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestProto2Required ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestProto2Required ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static TestProto2Required ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static TestProto2Required ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestProto2Required ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static TestProto2Required ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static TestProto2Required ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static TestProto2Required ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static TestProto2Required ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private TestProto2Required MakeReadOnly() { + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(TestProto2Required prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(TestProto2Required cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private TestProto2Required result; + + private TestProto2Required PrepareBuilder() { + if (resultIsReadOnly) { + TestProto2Required original = result; + result = new TestProto2Required(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override TestProto2Required MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestProto2Required.Descriptor; } + } + + public override TestProto2Required DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.TestProto2Required.DefaultInstance; } + } + + public override TestProto2Required BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is TestProto2Required) { + return MergeFrom((TestProto2Required) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(TestProto2Required other) { + if (other == global::Google.ProtocolBuffers.TestProtos.Proto3.TestProto2Required.DefaultInstance) return this; + PrepareBuilder(); + if (other.HasProto2) { + MergeProto2(other.Proto2); + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_testProto2RequiredFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _testProto2RequiredFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 10: { + global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder subBuilder = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder(); + if (result.hasProto2) { + subBuilder.MergeFrom(Proto2); + } + input.ReadMessage(subBuilder, extensionRegistry); + Proto2 = subBuilder.BuildPartial(); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public bool HasProto2 { + get { return result.hasProto2; } + } + public global::Google.ProtocolBuffers.TestProtos.TestRequired Proto2 { + get { return result.Proto2; } + set { SetProto2(value); } + } + public Builder SetProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + result.hasProto2 = true; + result.proto2_ = value; + return this; + } + public Builder SetProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired.Builder builderForValue) { + pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue"); + PrepareBuilder(); + result.hasProto2 = true; + result.proto2_ = builderForValue.Build(); + return this; + } + public Builder MergeProto2(global::Google.ProtocolBuffers.TestProtos.TestRequired value) { + pb::ThrowHelper.ThrowIfNull(value, "value"); + PrepareBuilder(); + if (result.hasProto2 && + result.proto2_ != global::Google.ProtocolBuffers.TestProtos.TestRequired.DefaultInstance) { + result.proto2_ = global::Google.ProtocolBuffers.TestProtos.TestRequired.CreateBuilder(result.proto2_).MergeFrom(value).BuildPartial(); + } else { + result.proto2_ = value; + } + result.hasProto2 = true; + return this; + } + public Builder ClearProto2() { + PrepareBuilder(); + result.hasProto2 = false; + result.proto2_ = null; + return this; + } + } + static TestProto2Required() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.Descriptor, null); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class ForeignMessage : pb::GeneratedMessage { + private ForeignMessage() { } + private static readonly ForeignMessage defaultInstance = new ForeignMessage().MakeReadOnly(); + private static readonly string[] _foreignMessageFieldNames = new string[] { "c" }; + private static readonly uint[] _foreignMessageFieldTags = new uint[] { 8 }; + public static ForeignMessage DefaultInstance { + get { return defaultInstance; } + } + + public override ForeignMessage DefaultInstanceForType { + get { return DefaultInstance; } + } + + protected override ForeignMessage ThisMessage { + get { return this; } + } + + public static pbd::MessageDescriptor Descriptor { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_ForeignMessage__Descriptor; } + } + + protected override pb::FieldAccess.FieldAccessorTable InternalFieldAccessors { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.internal__static_proto2_nofieldpresence_unittest_ForeignMessage__FieldAccessorTable; } + } + + public const int CFieldNumber = 1; + private int c_; + public int C { + get { return c_; } + } + + public override void WriteTo(pb::ICodedOutputStream output) { + CalcSerializedSize(); + string[] field_names = _foreignMessageFieldNames; + if (C != 0) { + output.WriteInt32(1, field_names[0], C); + } + UnknownFields.WriteTo(output); + } + + private int memoizedSerializedSize = -1; + public override int SerializedSize { + get { + int size = memoizedSerializedSize; + if (size != -1) return size; + return CalcSerializedSize(); + } + } + + private int CalcSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (C != 0) { + size += pb::CodedOutputStream.ComputeInt32Size(1, C); + } + size += UnknownFields.SerializedSize; + memoizedSerializedSize = size; + return size; + } + public static ForeignMessage ParseFrom(pb::ByteString data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static ForeignMessage ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static ForeignMessage ParseFrom(byte[] data) { + return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed(); + } + public static ForeignMessage ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed(); + } + public static ForeignMessage ParseFrom(global::System.IO.Stream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static ForeignMessage ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + public static ForeignMessage ParseDelimitedFrom(global::System.IO.Stream input) { + return CreateBuilder().MergeDelimitedFrom(input).BuildParsed(); + } + public static ForeignMessage ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) { + return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed(); + } + public static ForeignMessage ParseFrom(pb::ICodedInputStream input) { + return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed(); + } + public static ForeignMessage ParseFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed(); + } + private ForeignMessage MakeReadOnly() { + return this; + } + + public static Builder CreateBuilder() { return new Builder(); } + public override Builder ToBuilder() { return CreateBuilder(this); } + public override Builder CreateBuilderForType() { return new Builder(); } + public static Builder CreateBuilder(ForeignMessage prototype) { + return new Builder(prototype); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + public sealed partial class Builder : pb::GeneratedBuilder { + protected override Builder ThisBuilder { + get { return this; } + } + public Builder() { + result = DefaultInstance; + resultIsReadOnly = true; + } + internal Builder(ForeignMessage cloneFrom) { + result = cloneFrom; + resultIsReadOnly = true; + } + + private bool resultIsReadOnly; + private ForeignMessage result; + + private ForeignMessage PrepareBuilder() { + if (resultIsReadOnly) { + ForeignMessage original = result; + result = new ForeignMessage(); + resultIsReadOnly = false; + MergeFrom(original); + } + return result; + } + + public override bool IsInitialized { + get { return result.IsInitialized; } + } + + protected override ForeignMessage MessageBeingBuilt { + get { return PrepareBuilder(); } + } + + public override Builder Clear() { + result = DefaultInstance; + resultIsReadOnly = true; + return this; + } + + public override Builder Clone() { + if (resultIsReadOnly) { + return new Builder(result); + } else { + return new Builder().MergeFrom(result); + } + } + + public override pbd::MessageDescriptor DescriptorForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.Descriptor; } + } + + public override ForeignMessage DefaultInstanceForType { + get { return global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.DefaultInstance; } + } + + public override ForeignMessage BuildPartial() { + if (resultIsReadOnly) { + return result; + } + resultIsReadOnly = true; + return result.MakeReadOnly(); + } + + public override Builder MergeFrom(pb::IMessage other) { + if (other is ForeignMessage) { + return MergeFrom((ForeignMessage) other); + } else { + base.MergeFrom(other); + return this; + } + } + + public override Builder MergeFrom(ForeignMessage other) { + if (other == global::Google.ProtocolBuffers.TestProtos.Proto3.ForeignMessage.DefaultInstance) return this; + PrepareBuilder(); + if (other.C != 0) { + C = other.C; + } + this.MergeUnknownFields(other.UnknownFields); + return this; + } + + public override Builder MergeFrom(pb::ICodedInputStream input) { + return MergeFrom(input, pb::ExtensionRegistry.Empty); + } + + public override Builder MergeFrom(pb::ICodedInputStream input, pb::ExtensionRegistry extensionRegistry) { + PrepareBuilder(); + pb::UnknownFieldSet.Builder unknownFields = null; + uint tag; + string field_name; + while (input.ReadTag(out tag, out field_name)) { + if(tag == 0 && field_name != null) { + int field_ordinal = global::System.Array.BinarySearch(_foreignMessageFieldNames, field_name, global::System.StringComparer.Ordinal); + if(field_ordinal >= 0) + tag = _foreignMessageFieldTags[field_ordinal]; + else { + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + continue; + } + } + switch (tag) { + case 0: { + throw pb::InvalidProtocolBufferException.InvalidTag(); + } + default: { + if (pb::WireFormat.IsEndGroupTag(tag)) { + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + if (unknownFields == null) { + unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields); + } + ParseUnknownField(input, unknownFields, extensionRegistry, tag, field_name); + break; + } + case 8: { + input.ReadInt32(ref result.c_); + break; + } + } + } + + if (unknownFields != null) { + this.UnknownFields = unknownFields.Build(); + } + return this; + } + + + public int C { + get { return result.C; } + set { SetC(value); } + } + public Builder SetC(int value) { + PrepareBuilder(); + result.c_ = value; + return this; + } + public Builder ClearC() { + PrepareBuilder(); + result.c_ = 0; + return this; + } + } + static ForeignMessage() { + object.ReferenceEquals(global::Google.ProtocolBuffers.TestProtos.Proto3.UnittestNoFieldPresence.Descriptor, null); + } + } + + #endregion + +} + +#endregion Designer generated code diff --git a/src/google/protobuf/unittest_no_field_presence.proto b/src/google/protobuf/unittest_no_field_presence.proto index 6e71517c..f261b58e 100644 --- a/src/google/protobuf/unittest_no_field_presence.proto +++ b/src/google/protobuf/unittest_no_field_presence.proto @@ -37,7 +37,7 @@ import "google/protobuf/unittest.proto"; package proto2_nofieldpresence_unittest; -option csharp_namespace = "Google.ProtocolBuffers.TestProtos"; +option csharp_namespace = "Google.ProtocolBuffers.TestProtos.Proto3"; // This proto includes every type of field in both singular and repeated // forms. -- cgit v1.2.3 From 38da6583b1416a7c1594bffec3cdbb8856a72353 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 13 May 2015 13:38:54 -0700 Subject: Regenerate UnittestDropUnknownFields.cs --- .../src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'csharp/src/ProtocolBuffers.Test') diff --git a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs index 3939c9a4..02af2f50 100644 --- a/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs +++ b/csharp/src/ProtocolBuffers.Test/TestProtos/UnittestDropUnknownFields.cs @@ -40,8 +40,8 @@ namespace Google.ProtocolBuffers.TestProtos { "X3ZhbHVlGAIgASgOMjsudW5pdHRlc3RfZHJvcF91bmtub3duX2ZpZWxkcy5G", "b29XaXRoRXh0cmFGaWVsZHMuTmVzdGVkRW51bRIZChFleHRyYV9pbnQzMl92", "YWx1ZRgDIAEoBSIwCgpOZXN0ZWRFbnVtEgcKA0ZPTxAAEgcKA0JBUhABEgcK", - "A0JBWhACEgcKA1FVWBADQiSqAiFHb29nbGUuUHJvdG9jb2xCdWZmZXJzLlRl", - "c3RQcm90b3NiBnByb3RvMw==")); + "A0JBWhACEgcKA1FVWBADQjOiAgxEcm9wVW5rbm93bnOqAiFHb29nbGUuUHJv", + "dG9jb2xCdWZmZXJzLlRlc3RQcm90b3NiBnByb3RvMw==")); pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) { descriptor = root; internal__static_unittest_drop_unknown_fields_Foo__Descriptor = Descriptor.MessageTypes[0]; -- cgit v1.2.3