diff options
| author | Jon Skeet <skeet@pobox.com> | 2009-01-27 14:43:10 +0000 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2009-01-27 14:43:10 +0000 |
| commit | 49fcd4f794bb96c3dcf729f81c0ffcb19fdadc14 (patch) | |
| tree | 8ec88242bda7104a649c2273770605f89a4aba37 /src/ProtocolBuffers.Test | |
| parent | 642a8140c88dfb61f5f4812fc179e4f42beb4978 (diff) | |
| download | protobuf-49fcd4f794bb96c3dcf729f81c0ffcb19fdadc14.tar.gz protobuf-49fcd4f794bb96c3dcf729f81c0ffcb19fdadc14.tar.bz2 protobuf-49fcd4f794bb96c3dcf729f81c0ffcb19fdadc14.zip | |
Merge extensions correctly
Diffstat (limited to 'src/ProtocolBuffers.Test')
3 files changed, 5 insertions, 3 deletions
diff --git a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs index 5d0a9291..80923ca0 100644 --- a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs +++ b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs @@ -313,7 +313,6 @@ namespace Google.ProtocolBuffers { .GetExtensionCount(UnitTestProtoFile.RepeatedInt32Extension)); } - /* Reinstate this test in the commit where it's fixed... [Test] public void ExtensionMergeFrom() { TestAllExtensions original = TestAllExtensions.CreateBuilder() @@ -322,8 +321,7 @@ namespace Google.ProtocolBuffers { TestAllExtensions.CreateBuilder().MergeFrom(original).Build(); Assert.IsTrue((merged.HasExtension(UnitTestProtoFile.OptionalInt32Extension))); Assert.AreEqual(1, (int)merged.GetExtension(UnitTestProtoFile.OptionalInt32Extension)); - } - */ + } /* Removed multiple files option for the moment [Test] diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index 796d74a8..88e10f6c 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -194,6 +194,7 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(TestMessageSet other) { if (other == TestMessageSet.DefaultInstance) return this; + this.MergeExtensionFields(other); this.MergeUnknownFields(other.UnknownFields); return this; } diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs index 17501997..3d3e699c 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs @@ -4884,6 +4884,7 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(TestAllExtensions other) { if (other == TestAllExtensions.DefaultInstance) return this; + this.MergeExtensionFields(other); this.MergeUnknownFields(other.UnknownFields); return this; } @@ -7597,6 +7598,7 @@ namespace Google.ProtocolBuffers.TestProtos { public override Builder MergeFrom(TestEmptyMessageWithExtensions other) { if (other == TestEmptyMessageWithExtensions.DefaultInstance) return this; + this.MergeExtensionFields(other); this.MergeUnknownFields(other.UnknownFields); return this; } @@ -10714,6 +10716,7 @@ namespace Google.ProtocolBuffers.TestProtos { if (other.HasMyFloat) { MyFloat = other.MyFloat; } + this.MergeExtensionFields(other); this.MergeUnknownFields(other.UnknownFields); return this; } |