| Index: third_party/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
|
| diff --git a/third_party/protobuf/python/google/protobuf/internal/more_messages.proto b/third_party/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
|
| similarity index 68%
|
| copy from third_party/protobuf/python/google/protobuf/internal/more_messages.proto
|
| copy to third_party/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
|
| index c701b4460b761a7f9db44e1159a1aadf7206a64a..23af28870ab4bc62fa76a582ac75172a5b4206a7 100644
|
| --- a/third_party/protobuf/python/google/protobuf/internal/more_messages.proto
|
| +++ b/third_party/protobuf/csharp/src/Google.Protobuf.Test/CodedInputStreamExtensions.cs
|
| @@ -1,6 +1,7 @@
|
| +#region Copyright notice and license
|
| // Protocol Buffers - Google's data interchange format
|
| -// Copyright 2008 Google Inc. All rights reserved.
|
| -// http://code.google.com/p/protobuf/
|
| +// Copyright 2015 Google Inc. All rights reserved.
|
| +// https://developers.google.com/protocol-buffers/
|
| //
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| @@ -27,25 +28,26 @@
|
| // 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
|
|
|
| -// Author: robinson@google.com (Will Robinson)
|
| +using NUnit.Framework;
|
|
|
| +namespace Google.Protobuf
|
| +{
|
| + internal static class CodedInputStreamExtensions
|
| + {
|
| + public static void AssertNextTag(this CodedInputStream input, uint expectedTag)
|
| + {
|
| + uint tag = input.ReadTag();
|
| + Assert.AreEqual(expectedTag, tag);
|
| + }
|
|
|
| -package google.protobuf.internal;
|
| -
|
| -// A message where tag numbers are listed out of order, to allow us to test our
|
| -// canonicalization of serialized output, which should always be in tag order.
|
| -// We also mix in some extensions for extra fun.
|
| -message OutOfOrderFields {
|
| - optional sint32 optional_sint32 = 5;
|
| - extensions 4 to 4;
|
| - optional uint32 optional_uint32 = 3;
|
| - extensions 2 to 2;
|
| - optional int32 optional_int32 = 1;
|
| -};
|
| -
|
| -
|
| -extend OutOfOrderFields {
|
| - optional uint64 optional_uint64 = 4;
|
| - optional int64 optional_int64 = 2;
|
| + public static T ReadMessage<T>(this CodedInputStream stream, MessageParser<T> parser)
|
| + where T : IMessage<T>
|
| + {
|
| + var message = parser.CreateTemplate();
|
| + stream.ReadMessage(message);
|
| + return message;
|
| + }
|
| + }
|
| }
|
|
|