From 8729cf46284633bb7c9e7dfff57fea74510b8121 Mon Sep 17 00:00:00 2001 From: Jon Skeet Date: Fri, 5 Jun 2009 22:49:05 +0100 Subject: Added the ability to use an IEnumerable when adding to a list, so you can do: new Foo.Builder { RepeatedValue = { x.Select(y) } }; ... a bit like LINQ to XML. --- .../Collections/PopsicleListTest.cs | 1 + src/ProtocolBuffers.Test/GeneratedMessageTest.cs | 17 ++++ .../UnitTestEmbedOptimizeForProtoFile.cs | 2 +- .../TestProtos/UnitTestMessageSetProtoFile.cs | 2 +- .../TestProtos/UnitTestProtoFile.cs | 94 +++++++++++----------- 5 files changed, 67 insertions(+), 49 deletions(-) (limited to 'src/ProtocolBuffers.Test') diff --git a/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs b/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs index 2cb25093..94d7fd2f 100644 --- a/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs +++ b/src/ProtocolBuffers.Test/Collections/PopsicleListTest.cs @@ -16,6 +16,7 @@ namespace Google.ProtocolBuffers.Collections { AssertNotSupported(() => list.Insert(0, "")); AssertNotSupported(() => list.Remove("")); AssertNotSupported(() => list.RemoveAt(0)); + AssertNotSupported(() => list.Add(new[] {"", ""})); } [Test] diff --git a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs index 69c5ac37..3e4324ff 100644 --- a/src/ProtocolBuffers.Test/GeneratedMessageTest.cs +++ b/src/ProtocolBuffers.Test/GeneratedMessageTest.cs @@ -34,6 +34,7 @@ using System.Collections.Generic; using Google.ProtocolBuffers.Descriptors; using Google.ProtocolBuffers.TestProtos; using NUnit.Framework; +using Google.ProtocolBuffers.Collections; namespace Google.ProtocolBuffers { [TestFixture] @@ -193,6 +194,22 @@ namespace Google.ProtocolBuffers { Assert.AreEqual(expectedMessage, message); } + [Test] + public void SettingRepeatedValuesUsingRangeInCollectionInitializer() { + int[] values = { 1, 2, 3 }; + TestAllTypes message = new TestAllTypes.Builder { + RepeatedSint32List = { values } + }.Build(); + Assert.IsTrue(Lists.Equals(values, message.RepeatedSint32List)); + } + + [Test] + public void SettingRepeatedValuesUsingIndividualValuesInCollectionInitializer() { + TestAllTypes message = new TestAllTypes.Builder { + RepeatedSint32List = { 6, 7 } + }.Build(); + Assert.IsTrue(Lists.Equals(new int[] { 6, 7 }, message.RepeatedSint32List)); + } [Test] public void Defaults() { diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs index fdd4acac..5ee90650 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestEmbedOptimizeForProtoFile.cs @@ -321,7 +321,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedMessageList { + public pbc::IPopsicleList RepeatedMessageList { get { return result.repeatedMessage_; } } public int RepeatedMessageCount { diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs index d526bdf0..cd1ca898 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestMessageSetProtoFile.cs @@ -1401,7 +1401,7 @@ namespace Google.ProtocolBuffers.TestProtos { } - public scg::IList ItemList { + public pbc::IPopsicleList ItemList { get { return result.item_; } } public int ItemCount { diff --git a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs index 8d9b4c49..ff0874b9 100644 --- a/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs +++ b/src/ProtocolBuffers.Test/TestProtos/UnitTestProtoFile.cs @@ -4141,7 +4141,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedInt32List { + public pbc::IPopsicleList RepeatedInt32List { get { return result.repeatedInt32_; } } public int RepeatedInt32Count { @@ -4167,7 +4167,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedInt64List { + public pbc::IPopsicleList RepeatedInt64List { get { return result.repeatedInt64_; } } public int RepeatedInt64Count { @@ -4194,7 +4194,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList RepeatedUint32List { + public pbc::IPopsicleList RepeatedUint32List { get { return result.repeatedUint32_; } } public int RepeatedUint32Count { @@ -4225,7 +4225,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList RepeatedUint64List { + public pbc::IPopsicleList RepeatedUint64List { get { return result.repeatedUint64_; } } public int RepeatedUint64Count { @@ -4255,7 +4255,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedSint32List { + public pbc::IPopsicleList RepeatedSint32List { get { return result.repeatedSint32_; } } public int RepeatedSint32Count { @@ -4281,7 +4281,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedSint64List { + public pbc::IPopsicleList RepeatedSint64List { get { return result.repeatedSint64_; } } public int RepeatedSint64Count { @@ -4308,7 +4308,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList RepeatedFixed32List { + public pbc::IPopsicleList RepeatedFixed32List { get { return result.repeatedFixed32_; } } public int RepeatedFixed32Count { @@ -4339,7 +4339,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList RepeatedFixed64List { + public pbc::IPopsicleList RepeatedFixed64List { get { return result.repeatedFixed64_; } } public int RepeatedFixed64Count { @@ -4369,7 +4369,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedSfixed32List { + public pbc::IPopsicleList RepeatedSfixed32List { get { return result.repeatedSfixed32_; } } public int RepeatedSfixed32Count { @@ -4395,7 +4395,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedSfixed64List { + public pbc::IPopsicleList RepeatedSfixed64List { get { return result.repeatedSfixed64_; } } public int RepeatedSfixed64Count { @@ -4421,7 +4421,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedFloatList { + public pbc::IPopsicleList RepeatedFloatList { get { return result.repeatedFloat_; } } public int RepeatedFloatCount { @@ -4447,7 +4447,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedDoubleList { + public pbc::IPopsicleList RepeatedDoubleList { get { return result.repeatedDouble_; } } public int RepeatedDoubleCount { @@ -4473,7 +4473,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedBoolList { + public pbc::IPopsicleList RepeatedBoolList { get { return result.repeatedBool_; } } public int RepeatedBoolCount { @@ -4499,7 +4499,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedStringList { + public pbc::IPopsicleList RepeatedStringList { get { return result.repeatedString_; } } public int RepeatedStringCount { @@ -4527,7 +4527,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedBytesList { + public pbc::IPopsicleList RepeatedBytesList { get { return result.repeatedBytes_; } } public int RepeatedBytesCount { @@ -4555,7 +4555,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedGroupList { + public pbc::IPopsicleList RepeatedGroupList { get { return result.repeatedGroup_; } } public int RepeatedGroupCount { @@ -4593,7 +4593,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedNestedMessageList { + public pbc::IPopsicleList RepeatedNestedMessageList { get { return result.repeatedNestedMessage_; } } public int RepeatedNestedMessageCount { @@ -4631,7 +4631,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedForeignMessageList { + public pbc::IPopsicleList RepeatedForeignMessageList { get { return result.repeatedForeignMessage_; } } public int RepeatedForeignMessageCount { @@ -4669,7 +4669,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedImportMessageList { + public pbc::IPopsicleList RepeatedImportMessageList { get { return result.repeatedImportMessage_; } } public int RepeatedImportMessageCount { @@ -4707,7 +4707,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedNestedEnumList { + public pbc::IPopsicleList RepeatedNestedEnumList { get { return result.repeatedNestedEnum_; } } public int RepeatedNestedEnumCount { @@ -4733,7 +4733,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedForeignEnumList { + public pbc::IPopsicleList RepeatedForeignEnumList { get { return result.repeatedForeignEnum_; } } public int RepeatedForeignEnumCount { @@ -4759,7 +4759,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedImportEnumList { + public pbc::IPopsicleList RepeatedImportEnumList { get { return result.repeatedImportEnum_; } } public int RepeatedImportEnumCount { @@ -4785,7 +4785,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedStringPieceList { + public pbc::IPopsicleList RepeatedStringPieceList { get { return result.repeatedStringPiece_; } } public int RepeatedStringPieceCount { @@ -4813,7 +4813,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedCordList { + public pbc::IPopsicleList RepeatedCordList { get { return result.repeatedCord_; } } public int RepeatedCordCount { @@ -7860,7 +7860,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedMessageList { + public pbc::IPopsicleList RepeatedMessageList { get { return result.repeatedMessage_; } } public int RepeatedMessageCount { @@ -10585,7 +10585,7 @@ namespace Google.ProtocolBuffers.TestProtos { } - public scg::IList NestedmessageRepeatedInt32List { + public pbc::IPopsicleList NestedmessageRepeatedInt32List { get { return result.nestedmessageRepeatedInt32_; } } public int NestedmessageRepeatedInt32Count { @@ -10611,7 +10611,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList NestedmessageRepeatedForeignmessageList { + public pbc::IPopsicleList NestedmessageRepeatedForeignmessageList { get { return result.nestedmessageRepeatedForeignmessage_; } } public int NestedmessageRepeatedForeignmessageCount { @@ -11523,7 +11523,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedPrimitiveFieldList { + public pbc::IPopsicleList RepeatedPrimitiveFieldList { get { return result.repeatedPrimitiveField_; } } public int RepeatedPrimitiveFieldCount { @@ -11549,7 +11549,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedStringFieldList { + public pbc::IPopsicleList RepeatedStringFieldList { get { return result.repeatedStringField_; } } public int RepeatedStringFieldCount { @@ -11577,7 +11577,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedEnumFieldList { + public pbc::IPopsicleList RepeatedEnumFieldList { get { return result.repeatedEnumField_; } } public int RepeatedEnumFieldCount { @@ -11603,7 +11603,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedMessageFieldList { + public pbc::IPopsicleList RepeatedMessageFieldList { get { return result.repeatedMessageField_; } } public int RepeatedMessageFieldCount { @@ -11641,7 +11641,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedStringPieceFieldList { + public pbc::IPopsicleList RepeatedStringPieceFieldList { get { return result.repeatedStringPieceField_; } } public int RepeatedStringPieceFieldCount { @@ -11669,7 +11669,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList RepeatedCordFieldList { + public pbc::IPopsicleList RepeatedCordFieldList { get { return result.repeatedCordField_; } } public int RepeatedCordFieldCount { @@ -13206,7 +13206,7 @@ namespace Google.ProtocolBuffers.TestProtos { } - public scg::IList PackedInt32List { + public pbc::IPopsicleList PackedInt32List { get { return result.packedInt32_; } } public int PackedInt32Count { @@ -13232,7 +13232,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedInt64List { + public pbc::IPopsicleList PackedInt64List { get { return result.packedInt64_; } } public int PackedInt64Count { @@ -13259,7 +13259,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList PackedUint32List { + public pbc::IPopsicleList PackedUint32List { get { return result.packedUint32_; } } public int PackedUint32Count { @@ -13290,7 +13290,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList PackedUint64List { + public pbc::IPopsicleList PackedUint64List { get { return result.packedUint64_; } } public int PackedUint64Count { @@ -13320,7 +13320,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedSint32List { + public pbc::IPopsicleList PackedSint32List { get { return result.packedSint32_; } } public int PackedSint32Count { @@ -13346,7 +13346,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedSint64List { + public pbc::IPopsicleList PackedSint64List { get { return result.packedSint64_; } } public int PackedSint64Count { @@ -13373,7 +13373,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList PackedFixed32List { + public pbc::IPopsicleList PackedFixed32List { get { return result.packedFixed32_; } } public int PackedFixed32Count { @@ -13404,7 +13404,7 @@ namespace Google.ProtocolBuffers.TestProtos { } [global::System.CLSCompliant(false)] - public scg::IList PackedFixed64List { + public pbc::IPopsicleList PackedFixed64List { get { return result.packedFixed64_; } } public int PackedFixed64Count { @@ -13434,7 +13434,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedSfixed32List { + public pbc::IPopsicleList PackedSfixed32List { get { return result.packedSfixed32_; } } public int PackedSfixed32Count { @@ -13460,7 +13460,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedSfixed64List { + public pbc::IPopsicleList PackedSfixed64List { get { return result.packedSfixed64_; } } public int PackedSfixed64Count { @@ -13486,7 +13486,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedFloatList { + public pbc::IPopsicleList PackedFloatList { get { return result.packedFloat_; } } public int PackedFloatCount { @@ -13512,7 +13512,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedDoubleList { + public pbc::IPopsicleList PackedDoubleList { get { return result.packedDouble_; } } public int PackedDoubleCount { @@ -13538,7 +13538,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedBoolList { + public pbc::IPopsicleList PackedBoolList { get { return result.packedBool_; } } public int PackedBoolCount { @@ -13564,7 +13564,7 @@ namespace Google.ProtocolBuffers.TestProtos { return this; } - public scg::IList PackedEnumList { + public pbc::IPopsicleList PackedEnumList { get { return result.packedEnum_; } } public int PackedEnumCount { -- cgit v1.2.3