Skip to content

P
protobuf
Commit 84ea2c7a authored by Jon Skeet's avatar Jon Skeet
Browse files
Options

Regenerate all C# code and make it compile 

JSON tests fail, as we're not using OriginalNameAttribute yet.
parent 75626ed7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 138 deletions
csharp/src/AddressBook/AddPerson.cs
View file @ 84ea2c7a
...@@ -73,13 +73,13 @@ namespace Google.Protobuf.Examples.AddressBook ...@@ -73,13 +73,13 @@ namespace Google.Protobuf.Examples.AddressBook
switch (type) switch (type)
{ {
case "mobile": case "mobile":
phoneNumber.Type = Person.Types.PhoneType.MOBILE; phoneNumber.Type = Person.Types.PhoneType.Mobile;
break; break;
case "home": case "home":
phoneNumber.Type = Person.Types.PhoneType.HOME; phoneNumber.Type = Person.Types.PhoneType.Home;
break; break;
case "work": case "work":
phoneNumber.Type = Person.Types.PhoneType.WORK; phoneNumber.Type = Person.Types.PhoneType.Work;
break; break;
default: default:
output.Write("Unknown phone type. Using default."); output.Write("Unknown phone type. Using default.");
......
csharp/src/AddressBook/Addressbook.cs
View file @ 84ea2c7a
...@@ -228,9 +228,9 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -228,9 +228,9 @@ namespace Google.Protobuf.Examples.AddressBook {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public static partial class Types { public static partial class Types {
public enum PhoneType { public enum PhoneType {
MOBILE = 0, [pbr::OriginalName("MOBILE")] Mobile = 0,
HOME = 1, [pbr::OriginalName("HOME")] Home = 1,
WORK = 2, [pbr::OriginalName("WORK")] Work = 2,
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
...@@ -273,7 +273,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -273,7 +273,7 @@ namespace Google.Protobuf.Examples.AddressBook {
/// <summary>Field number for the "type" field.</summary> /// <summary>Field number for the "type" field.</summary>
public const int TypeFieldNumber = 2; public const int TypeFieldNumber = 2;
private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE; private global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType type_ = 0;
public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type { public global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType Type {
get { return type_; } get { return type_; }
set { set {
...@@ -300,7 +300,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -300,7 +300,7 @@ namespace Google.Protobuf.Examples.AddressBook {
public override int GetHashCode() { public override int GetHashCode() {
int hash = 1; int hash = 1;
if (Number.Length != 0) hash ^= Number.GetHashCode(); if (Number.Length != 0) hash ^= Number.GetHashCode();
if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) hash ^= Type.GetHashCode(); if (Type != 0) hash ^= Type.GetHashCode();
return hash; return hash;
} }
...@@ -313,7 +313,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -313,7 +313,7 @@ namespace Google.Protobuf.Examples.AddressBook {
output.WriteRawTag(10); output.WriteRawTag(10);
output.WriteString(Number); output.WriteString(Number);
} }
if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) { if (Type != 0) {
output.WriteRawTag(16); output.WriteRawTag(16);
output.WriteEnum((int) Type); output.WriteEnum((int) Type);
} }
...@@ -324,7 +324,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -324,7 +324,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (Number.Length != 0) { if (Number.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Number); size += 1 + pb::CodedOutputStream.ComputeStringSize(Number);
} }
if (Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) { if (Type != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Type);
} }
return size; return size;
...@@ -337,7 +337,7 @@ namespace Google.Protobuf.Examples.AddressBook { ...@@ -337,7 +337,7 @@ namespace Google.Protobuf.Examples.AddressBook {
if (other.Number.Length != 0) { if (other.Number.Length != 0) {
Number = other.Number; Number = other.Number;
} }
if (other.Type != global::Google.Protobuf.Examples.AddressBook.Person.Types.PhoneType.MOBILE) { if (other.Type != 0) {
Type = other.Type; Type = other.Type;
} }
} }
......
csharp/src/AddressBook/ListPeople.cs
View file @ 84ea2c7a
...@@ -55,13 +55,13 @@ namespace Google.Protobuf.Examples.AddressBook ...@@ -55,13 +55,13 @@ namespace Google.Protobuf.Examples.AddressBook
{ {
switch (phoneNumber.Type) switch (phoneNumber.Type)
{ {
case Person.Types.PhoneType.MOBILE: case Person.Types.PhoneType.Mobile:
Console.Write(" Mobile phone #: "); Console.Write(" Mobile phone #: ");
break; break;
case Person.Types.PhoneType.HOME: case Person.Types.PhoneType.Home:
Console.Write(" Home phone #: "); Console.Write(" Home phone #: ");
break; break;
case Person.Types.PhoneType.WORK: case Person.Types.PhoneType.Work:
Console.Write(" Work phone #: "); Console.Write(" Work phone #: ");
break; break;
} }
......
csharp/src/Google.Protobuf.Conformance/Conformance.cs
View file @ 84ea2c7a
...@@ -199,15 +199,15 @@ namespace Conformance { ...@@ -199,15 +199,15 @@ namespace Conformance {
} }
#region Enums #region Enums
public enum WireFormat { public enum WireFormat {
UNSPECIFIED = 0, [pbr::OriginalName("UNSPECIFIED")] Unspecified = 0,
PROTOBUF = 1, [pbr::OriginalName("PROTOBUF")] Protobuf = 1,
JSON = 2, [pbr::OriginalName("JSON")] Json = 2,
} }
public enum ForeignEnum { public enum ForeignEnum {
FOREIGN_FOO = 0, [pbr::OriginalName("FOREIGN_FOO")] ForeignFoo = 0,
FOREIGN_BAR = 1, [pbr::OriginalName("FOREIGN_BAR")] ForeignBar = 1,
FOREIGN_BAZ = 2, [pbr::OriginalName("FOREIGN_BAZ")] ForeignBaz = 2,
} }
#endregion #endregion
...@@ -278,7 +278,7 @@ namespace Conformance { ...@@ -278,7 +278,7 @@ namespace Conformance {
/// <summary>Field number for the "requested_output_format" field.</summary> /// <summary>Field number for the "requested_output_format" field.</summary>
public const int RequestedOutputFormatFieldNumber = 3; public const int RequestedOutputFormatFieldNumber = 3;
private global::Conformance.WireFormat requestedOutputFormat_ = global::Conformance.WireFormat.UNSPECIFIED; private global::Conformance.WireFormat requestedOutputFormat_ = 0;
/// <summary> /// <summary>
/// Which format should the testee serialize its message to? /// Which format should the testee serialize its message to?
/// </summary> /// </summary>
...@@ -328,7 +328,7 @@ namespace Conformance { ...@@ -328,7 +328,7 @@ namespace Conformance {
int hash = 1; int hash = 1;
if (payloadCase_ == PayloadOneofCase.ProtobufPayload) hash ^= ProtobufPayload.GetHashCode(); if (payloadCase_ == PayloadOneofCase.ProtobufPayload) hash ^= ProtobufPayload.GetHashCode();
if (payloadCase_ == PayloadOneofCase.JsonPayload) hash ^= JsonPayload.GetHashCode(); if (payloadCase_ == PayloadOneofCase.JsonPayload) hash ^= JsonPayload.GetHashCode();
if (RequestedOutputFormat != global::Conformance.WireFormat.UNSPECIFIED) hash ^= RequestedOutputFormat.GetHashCode(); if (RequestedOutputFormat != 0) hash ^= RequestedOutputFormat.GetHashCode();
hash ^= (int) payloadCase_; hash ^= (int) payloadCase_;
return hash; return hash;
} }
...@@ -346,7 +346,7 @@ namespace Conformance { ...@@ -346,7 +346,7 @@ namespace Conformance {
output.WriteRawTag(18); output.WriteRawTag(18);
output.WriteString(JsonPayload); output.WriteString(JsonPayload);
} }
if (RequestedOutputFormat != global::Conformance.WireFormat.UNSPECIFIED) { if (RequestedOutputFormat != 0) {
output.WriteRawTag(24); output.WriteRawTag(24);
output.WriteEnum((int) RequestedOutputFormat); output.WriteEnum((int) RequestedOutputFormat);
} }
...@@ -360,7 +360,7 @@ namespace Conformance { ...@@ -360,7 +360,7 @@ namespace Conformance {
if (payloadCase_ == PayloadOneofCase.JsonPayload) { if (payloadCase_ == PayloadOneofCase.JsonPayload) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonPayload); size += 1 + pb::CodedOutputStream.ComputeStringSize(JsonPayload);
} }
if (RequestedOutputFormat != global::Conformance.WireFormat.UNSPECIFIED) { if (RequestedOutputFormat != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) RequestedOutputFormat); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) RequestedOutputFormat);
} }
return size; return size;
...@@ -370,7 +370,7 @@ namespace Conformance { ...@@ -370,7 +370,7 @@ namespace Conformance {
if (other == null) { if (other == null) {
return; return;
} }
if (other.RequestedOutputFormat != global::Conformance.WireFormat.UNSPECIFIED) { if (other.RequestedOutputFormat != 0) {
RequestedOutputFormat = other.RequestedOutputFormat; RequestedOutputFormat = other.RequestedOutputFormat;
} }
switch (other.PayloadCase) { switch (other.PayloadCase) {
...@@ -1044,7 +1044,7 @@ namespace Conformance { ...@@ -1044,7 +1044,7 @@ namespace Conformance {
/// <summary>Field number for the "optional_nested_enum" field.</summary> /// <summary>Field number for the "optional_nested_enum" field.</summary>
public const int OptionalNestedEnumFieldNumber = 21; public const int OptionalNestedEnumFieldNumber = 21;
private global::Conformance.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = global::Conformance.TestAllTypes.Types.NestedEnum.FOO; private global::Conformance.TestAllTypes.Types.NestedEnum optionalNestedEnum_ = 0;
public global::Conformance.TestAllTypes.Types.NestedEnum OptionalNestedEnum { public global::Conformance.TestAllTypes.Types.NestedEnum OptionalNestedEnum {
get { return optionalNestedEnum_; } get { return optionalNestedEnum_; }
set { set {
...@@ -1054,7 +1054,7 @@ namespace Conformance { ...@@ -1054,7 +1054,7 @@ namespace Conformance {
/// <summary>Field number for the "optional_foreign_enum" field.</summary> /// <summary>Field number for the "optional_foreign_enum" field.</summary>
public const int OptionalForeignEnumFieldNumber = 22; public const int OptionalForeignEnumFieldNumber = 22;
private global::Conformance.ForeignEnum optionalForeignEnum_ = global::Conformance.ForeignEnum.FOREIGN_FOO; private global::Conformance.ForeignEnum optionalForeignEnum_ = 0;
public global::Conformance.ForeignEnum OptionalForeignEnum { public global::Conformance.ForeignEnum OptionalForeignEnum {
get { return optionalForeignEnum_; } get { return optionalForeignEnum_; }
set { set {
...@@ -2079,8 +2079,8 @@ namespace Conformance { ...@@ -2079,8 +2079,8 @@ namespace Conformance {
if (OptionalBytes.Length != 0) hash ^= OptionalBytes.GetHashCode(); if (OptionalBytes.Length != 0) hash ^= OptionalBytes.GetHashCode();
if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode(); if (optionalNestedMessage_ != null) hash ^= OptionalNestedMessage.GetHashCode();
if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode(); if (optionalForeignMessage_ != null) hash ^= OptionalForeignMessage.GetHashCode();
if (OptionalNestedEnum != global::Conformance.TestAllTypes.Types.NestedEnum.FOO) hash ^= OptionalNestedEnum.GetHashCode(); if (OptionalNestedEnum != 0) hash ^= OptionalNestedEnum.GetHashCode();
if (OptionalForeignEnum != global::Conformance.ForeignEnum.FOREIGN_FOO) hash ^= OptionalForeignEnum.GetHashCode(); if (OptionalForeignEnum != 0) hash ^= OptionalForeignEnum.GetHashCode();
if (OptionalStringPiece.Length != 0) hash ^= OptionalStringPiece.GetHashCode(); if (OptionalStringPiece.Length != 0) hash ^= OptionalStringPiece.GetHashCode();
if (OptionalCord.Length != 0) hash ^= OptionalCord.GetHashCode(); if (OptionalCord.Length != 0) hash ^= OptionalCord.GetHashCode();
if (recursiveMessage_ != null) hash ^= RecursiveMessage.GetHashCode(); if (recursiveMessage_ != null) hash ^= RecursiveMessage.GetHashCode();
...@@ -2247,11 +2247,11 @@ namespace Conformance { ...@@ -2247,11 +2247,11 @@ namespace Conformance {
output.WriteRawTag(154, 1); output.WriteRawTag(154, 1);
output.WriteMessage(OptionalForeignMessage); output.WriteMessage(OptionalForeignMessage);
} }
if (OptionalNestedEnum != global::Conformance.TestAllTypes.Types.NestedEnum.FOO) { if (OptionalNestedEnum != 0) {
output.WriteRawTag(168, 1); output.WriteRawTag(168, 1);
output.WriteEnum((int) OptionalNestedEnum); output.WriteEnum((int) OptionalNestedEnum);
} }
if (OptionalForeignEnum != global::Conformance.ForeignEnum.FOREIGN_FOO) { if (OptionalForeignEnum != 0) {
output.WriteRawTag(176, 1); output.WriteRawTag(176, 1);
output.WriteEnum((int) OptionalForeignEnum); output.WriteEnum((int) OptionalForeignEnum);
} }
...@@ -2492,10 +2492,10 @@ namespace Conformance { ...@@ -2492,10 +2492,10 @@ namespace Conformance {
if (optionalForeignMessage_ != null) { if (optionalForeignMessage_ != null) {
size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage); size += 2 + pb::CodedOutputStream.ComputeMessageSize(OptionalForeignMessage);
} }
if (OptionalNestedEnum != global::Conformance.TestAllTypes.Types.NestedEnum.FOO) { if (OptionalNestedEnum != 0) {
size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum); size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalNestedEnum);
} }
if (OptionalForeignEnum != global::Conformance.ForeignEnum.FOREIGN_FOO) { if (OptionalForeignEnum != 0) {
size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum); size += 2 + pb::CodedOutputStream.ComputeEnumSize((int) OptionalForeignEnum);
} }
if (OptionalStringPiece.Length != 0) { if (OptionalStringPiece.Length != 0) {
...@@ -2719,10 +2719,10 @@ namespace Conformance { ...@@ -2719,10 +2719,10 @@ namespace Conformance {
} }
OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage); OptionalForeignMessage.MergeFrom(other.OptionalForeignMessage);
} }
if (other.OptionalNestedEnum != global::Conformance.TestAllTypes.Types.NestedEnum.FOO) { if (other.OptionalNestedEnum != 0) {
OptionalNestedEnum = other.OptionalNestedEnum; OptionalNestedEnum = other.OptionalNestedEnum;
} }
if (other.OptionalForeignEnum != global::Conformance.ForeignEnum.FOREIGN_FOO) { if (other.OptionalForeignEnum != 0) {
OptionalForeignEnum = other.OptionalForeignEnum; OptionalForeignEnum = other.OptionalForeignEnum;
} }
if (other.OptionalStringPiece.Length != 0) { if (other.OptionalStringPiece.Length != 0) {
...@@ -3448,13 +3448,13 @@ namespace Conformance { ...@@ -3448,13 +3448,13 @@ namespace Conformance {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public static partial class Types { public static partial class Types {
public enum NestedEnum { public enum NestedEnum {
FOO = 0, [pbr::OriginalName("FOO")] Foo = 0,
BAR = 1, [pbr::OriginalName("BAR")] Bar = 1,
BAZ = 2, [pbr::OriginalName("BAZ")] Baz = 2,
/// <summary> /// <summary>
/// Intentionally negative. /// Intentionally negative.
/// </summary> /// </summary>
NEG = -1, [pbr::OriginalName("NEG")] Neg = -1,
} }
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
......
csharp/src/Google.Protobuf.Conformance/Program.cs
View file @ 84ea2c7a
...@@ -109,10 +109,10 @@ namespace Google.Protobuf.Conformance ...@@ -109,10 +109,10 @@ namespace Google.Protobuf.Conformance
{ {
switch (request.RequestedOutputFormat) switch (request.RequestedOutputFormat)
{ {
case global::Conformance.WireFormat.JSON: case global::Conformance.WireFormat.Json:
var formatter = new JsonFormatter(new JsonFormatter.Settings(false, typeRegistry)); var formatter = new JsonFormatter(new JsonFormatter.Settings(false, typeRegistry));
return new ConformanceResponse { JsonPayload = formatter.Format(message) }; return new ConformanceResponse { JsonPayload = formatter.Format(message) };
case global::Conformance.WireFormat.PROTOBUF: case global::Conformance.WireFormat.Protobuf:
return new ConformanceResponse { ProtobufPayload = message.ToByteString() }; return new ConformanceResponse { ProtobufPayload = message.ToByteString() };
default: default:
throw new Exception("Unsupported request output format: " + request.PayloadCase); throw new Exception("Unsupported request output format: " + request.PayloadCase);
......
csharp/src/Google.Protobuf.Test/FieldCodecTest.cs
View file @ 84ea2c7a
...@@ -58,7 +58,7 @@ namespace Google.Protobuf ...@@ -58,7 +58,7 @@ namespace Google.Protobuf
new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "Float"), new FieldCodecTestData<float>(FieldCodec.ForFloat(100), 1234.5f, "Float"),
new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "Double"), new FieldCodecTestData<double>(FieldCodec.ForDouble(100), 1234567890.5d, "Double"),
new FieldCodecTestData<ForeignEnum>( new FieldCodecTestData<ForeignEnum>(
FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.FOREIGN_BAZ, "Enum"), FieldCodec.ForEnum(100, t => (int) t, t => (ForeignEnum) t), ForeignEnum.ForeignBaz, "Enum"),
new FieldCodecTestData<ForeignMessage>( new FieldCodecTestData<ForeignMessage>(
FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"), FieldCodec.ForMessage(100, ForeignMessage.Parser), new ForeignMessage { C = 10 }, "Message"),
}; };
......
csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
View file @ 84ea2c7a
...@@ -66,13 +66,13 @@ namespace Google.Protobuf ...@@ -66,13 +66,13 @@ namespace Google.Protobuf
Assert.AreEqual(0, message.SingleFixed32); Assert.AreEqual(0, message.SingleFixed32);
Assert.AreEqual(0L, message.SingleFixed64); Assert.AreEqual(0L, message.SingleFixed64);
Assert.AreEqual(0.0f, message.SingleFloat); Assert.AreEqual(0.0f, message.SingleFloat);
Assert.AreEqual(ForeignEnum.FOREIGN_UNSPECIFIED, message.SingleForeignEnum); Assert.AreEqual(ForeignEnum.ForeignUnspecified, message.SingleForeignEnum);
Assert.IsNull(message.SingleForeignMessage); Assert.IsNull(message.SingleForeignMessage);
Assert.AreEqual(ImportEnum.IMPORT_ENUM_UNSPECIFIED, message.SingleImportEnum); Assert.AreEqual(ImportEnum.Unspecified, message.SingleImportEnum);
Assert.IsNull(message.SingleImportMessage); Assert.IsNull(message.SingleImportMessage);
Assert.AreEqual(0, message.SingleInt32); Assert.AreEqual(0, message.SingleInt32);
Assert.AreEqual(0L, message.SingleInt64); Assert.AreEqual(0L, message.SingleInt64);
Assert.AreEqual(TestAllTypes.Types.NestedEnum.NESTED_ENUM_UNSPECIFIED, message.SingleNestedEnum); Assert.AreEqual(TestAllTypes.Types.NestedEnum.Unspecified, message.SingleNestedEnum);
Assert.IsNull(message.SingleNestedMessage); Assert.IsNull(message.SingleNestedMessage);
Assert.IsNull(message.SinglePublicImportMessage); Assert.IsNull(message.SinglePublicImportMessage);
Assert.AreEqual(0, message.SingleSfixed32); Assert.AreEqual(0, message.SingleSfixed32);
...@@ -145,13 +145,13 @@ namespace Google.Protobuf ...@@ -145,13 +145,13 @@ namespace Google.Protobuf
SingleFixed32 = 23, SingleFixed32 = 23,
SingleFixed64 = 1234567890123, SingleFixed64 = 1234567890123,
SingleFloat = 12.25f, SingleFloat = 12.25f,
SingleForeignEnum = ForeignEnum.FOREIGN_BAR, SingleForeignEnum = ForeignEnum.ForeignBar,
SingleForeignMessage = new ForeignMessage { C = 10 }, SingleForeignMessage = new ForeignMessage { C = 10 },
SingleImportEnum = ImportEnum.IMPORT_BAZ, SingleImportEnum = ImportEnum.ImportBaz,
SingleImportMessage = new ImportMessage { D = 20 }, SingleImportMessage = new ImportMessage { D = 20 },
SingleInt32 = 100, SingleInt32 = 100,
SingleInt64 = 3210987654321, SingleInt64 = 3210987654321,
SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO, SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 }, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
SinglePublicImportMessage = new PublicImportMessage { E = 54 }, SinglePublicImportMessage = new PublicImportMessage { E = 54 },
SingleSfixed32 = -123, SingleSfixed32 = -123,
...@@ -179,13 +179,13 @@ namespace Google.Protobuf ...@@ -179,13 +179,13 @@ namespace Google.Protobuf
RepeatedFixed32 = { uint.MaxValue, 23 }, RepeatedFixed32 = { uint.MaxValue, 23 },
RepeatedFixed64 = { ulong.MaxValue, 1234567890123 }, RepeatedFixed64 = { ulong.MaxValue, 1234567890123 },
RepeatedFloat = { 100f, 12.25f }, RepeatedFloat = { 100f, 12.25f },
RepeatedForeignEnum = { ForeignEnum.FOREIGN_FOO, ForeignEnum.FOREIGN_BAR }, RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } }, RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
RepeatedImportEnum = { ImportEnum.IMPORT_BAZ, ImportEnum.IMPORT_ENUM_UNSPECIFIED }, RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } }, RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
RepeatedInt32 = { 100, 200 }, RepeatedInt32 = { 100, 200 },
RepeatedInt64 = { 3210987654321, long.MaxValue }, RepeatedInt64 = { 3210987654321, long.MaxValue },
RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG }, RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } }, RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } }, RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
RepeatedSfixed32 = { -123, 123 }, RepeatedSfixed32 = { -123, 123 },
...@@ -224,8 +224,8 @@ namespace Google.Protobuf ...@@ -224,8 +224,8 @@ namespace Google.Protobuf
{ 5, new ForeignMessage() }, { 5, new ForeignMessage() },
}, },
MapInt32Enum = { MapInt32Enum = {
{ 1, MapEnum.MAP_ENUM_BAR }, { 1, MapEnum.Bar },
{ 2000, MapEnum.MAP_ENUM_FOO } { 2000, MapEnum.Foo }
} }
}; };
...@@ -249,7 +249,7 @@ namespace Google.Protobuf ...@@ -249,7 +249,7 @@ namespace Google.Protobuf
Assert.AreEqual(1, parsed.MapInt32Bytes.Count); Assert.AreEqual(1, parsed.MapInt32Bytes.Count);
Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]); Assert.AreEqual(ByteString.Empty, parsed.MapInt32Bytes[0]);
} }
[Test] [Test]
public void MapWithOnlyValue() public void MapWithOnlyValue()
{ {
...@@ -449,7 +449,7 @@ namespace Google.Protobuf ...@@ -449,7 +449,7 @@ namespace Google.Protobuf
SingleFloat = 12.25f, SingleFloat = 12.25f,
SingleInt32 = 100, SingleInt32 = 100,
SingleInt64 = 3210987654321, SingleInt64 = 3210987654321,
SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO, SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
SingleSfixed32 = -123, SingleSfixed32 = -123,
SingleSfixed64 = -12345678901234, SingleSfixed64 = -12345678901234,
SingleSint32 = -456, SingleSint32 = -456,
...@@ -479,7 +479,7 @@ namespace Google.Protobuf ...@@ -479,7 +479,7 @@ namespace Google.Protobuf
RepeatedFloat = { 100f, 12.25f }, RepeatedFloat = { 100f, 12.25f },
RepeatedInt32 = { 100, 200 }, RepeatedInt32 = { 100, 200 },
RepeatedInt64 = { 3210987654321, long.MaxValue }, RepeatedInt64 = { 3210987654321, long.MaxValue },
RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG }, RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
RepeatedSfixed32 = { -123, 123 }, RepeatedSfixed32 = { -123, 123 },
RepeatedSfixed64 = { -12345678901234, 12345678901234 }, RepeatedSfixed64 = { -12345678901234, 12345678901234 },
RepeatedSint32 = { -456, 100 }, RepeatedSint32 = { -456, 100 },
...@@ -670,7 +670,7 @@ namespace Google.Protobuf ...@@ -670,7 +670,7 @@ namespace Google.Protobuf
{ {
// 130, 3 is the message tag // 130, 3 is the message tag
// 1 is the data length - but there's no data. // 1 is the data length - but there's no data.
var data = new byte[] { 130, 3, 1 }; var data = new byte[] { 130, 3, 1 };
Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(data)); Assert.Throws<InvalidProtocolBufferException>(() => TestAllTypes.Parser.ParseFrom(data));
} }
...@@ -720,4 +720,4 @@ namespace Google.Protobuf ...@@ -720,4 +720,4 @@ namespace Google.Protobuf
Assert.AreEqual("{ \"c\": 31 }", writer.ToString()); Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
} }
} }
} }
\ No newline at end of file
csharp/src/Google.Protobuf.Test/JsonFormatterTest.cs
View file @ 84ea2c7a
...@@ -75,13 +75,13 @@ namespace Google.Protobuf ...@@ -75,13 +75,13 @@ namespace Google.Protobuf
SingleFixed32 = 23, SingleFixed32 = 23,
SingleFixed64 = 1234567890123, SingleFixed64 = 1234567890123,
SingleFloat = 12.25f, SingleFloat = 12.25f,
SingleForeignEnum = ForeignEnum.FOREIGN_BAR, SingleForeignEnum = ForeignEnum.ForeignBar,
SingleForeignMessage = new ForeignMessage { C = 10 }, SingleForeignMessage = new ForeignMessage { C = 10 },
SingleImportEnum = ImportEnum.IMPORT_BAZ, SingleImportEnum = ImportEnum.ImportBaz,
SingleImportMessage = new ImportMessage { D = 20 }, SingleImportMessage = new ImportMessage { D = 20 },
SingleInt32 = 100, SingleInt32 = 100,
SingleInt64 = 3210987654321, SingleInt64 = 3210987654321,
SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO, SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 }, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
SinglePublicImportMessage = new PublicImportMessage { E = 54 }, SinglePublicImportMessage = new PublicImportMessage { E = 54 },
SingleSfixed32 = -123, SingleSfixed32 = -123,
...@@ -174,14 +174,14 @@ namespace Google.Protobuf ...@@ -174,14 +174,14 @@ namespace Google.Protobuf
[Test] [Test]
public void UnknownEnumValueNumeric_RepeatedField() public void UnknownEnumValueNumeric_RepeatedField()
{ {
var message = new TestAllTypes { RepeatedForeignEnum = { ForeignEnum.FOREIGN_BAZ, (ForeignEnum) 100, ForeignEnum.FOREIGN_FOO } }; var message = new TestAllTypes { RepeatedForeignEnum = { ForeignEnum.ForeignBaz, (ForeignEnum) 100, ForeignEnum.ForeignFoo } };
AssertJson("{ 'repeatedForeignEnum': [ 'FOREIGN_BAZ', 100, 'FOREIGN_FOO' ] }", JsonFormatter.Default.Format(message)); AssertJson("{ 'repeatedForeignEnum': [ 'FOREIGN_BAZ', 100, 'FOREIGN_FOO' ] }", JsonFormatter.Default.Format(message));
} }
[Test] [Test]
public void UnknownEnumValueNumeric_MapField() public void UnknownEnumValueNumeric_MapField()
{ {
var message = new TestMap { MapInt32Enum = { { 1, MapEnum.MAP_ENUM_FOO }, { 2, (MapEnum) 100 }, { 3, MapEnum.MAP_ENUM_BAR } } }; var message = new TestMap { MapInt32Enum = { { 1, MapEnum.Foo }, { 2, (MapEnum) 100 }, { 3, MapEnum.Bar } } };
AssertJson("{ 'mapInt32Enum': { '1': 'MAP_ENUM_FOO', '2': 100, '3': 'MAP_ENUM_BAR' } }", JsonFormatter.Default.Format(message)); AssertJson("{ 'mapInt32Enum': { '1': 'MAP_ENUM_FOO', '2': 100, '3': 'MAP_ENUM_BAR' } }", JsonFormatter.Default.Format(message));
} }
......
csharp/src/Google.Protobuf.Test/JsonParserTest.cs
View file @ 84ea2c7a
...@@ -142,8 +142,8 @@ namespace Google.Protobuf ...@@ -142,8 +142,8 @@ namespace Google.Protobuf
[TestCase(typeof(DoubleValue), "1.5", 1.5d)] [TestCase(typeof(DoubleValue), "1.5", 1.5d)]
public void Wrappers_Standalone(System.Type wrapperType, string json, object expectedValue) public void Wrappers_Standalone(System.Type wrapperType, string json, object expectedValue)
{ {
IMessage parsed = (IMessage) Activator.CreateInstance(wrapperType); IMessage parsed = (IMessage)Activator.CreateInstance(wrapperType);
IMessage expected = (IMessage) Activator.CreateInstance(wrapperType); IMessage expected = (IMessage)Activator.CreateInstance(wrapperType);
JsonParser.Default.Merge(parsed, "null"); JsonParser.Default.Merge(parsed, "null");
Assert.AreEqual(expected, parsed); Assert.AreEqual(expected, parsed);
...@@ -640,7 +640,7 @@ namespace Google.Protobuf ...@@ -640,7 +640,7 @@ namespace Google.Protobuf
var parsed = Timestamp.Parser.ParseJson(json); var parsed = Timestamp.Parser.ParseJson(json);
Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString()); Assert.AreEqual(WrapInQuotes(expectedFormatted), parsed.ToString());
} }
[Test] [Test]
[TestCase("2015-10-09 14:46:23.123456789Z", Description = "No T between date and time")] [TestCase("2015-10-09 14:46:23.123456789Z", Description = "No T between date and time")]
[TestCase("2015/10/09T14:46:23.123456789Z", Description = "Wrong date separators")] [TestCase("2015/10/09T14:46:23.123456789Z", Description = "Wrong date separators")]
...@@ -886,9 +886,9 @@ namespace Google.Protobuf ...@@ -886,9 +886,9 @@ namespace Google.Protobuf
} }
[Test] [Test]
[TestCase("\"FOREIGN_BAR\"", ForeignEnum.FOREIGN_BAR)] [TestCase("\"FOREIGN_BAR\"", ForeignEnum.ForeignBar)]
[TestCase("5", ForeignEnum.FOREIGN_BAR)] [TestCase("5", ForeignEnum.ForeignBar)]
[TestCase("100", (ForeignEnum) 100)] [TestCase("100", (ForeignEnum)100)]
public void EnumValid(string value, ForeignEnum expectedValue) public void EnumValid(string value, ForeignEnum expectedValue)
{ {
string json = "{ \"singleForeignEnum\": " + value + " }"; string json = "{ \"singleForeignEnum\": " + value + " }";
...@@ -922,4 +922,4 @@ namespace Google.Protobuf ...@@ -922,4 +922,4 @@ namespace Google.Protobuf
return '"' + text + '"'; return '"' + text + '"';
} }
} }
} }
\ No newline at end of file
csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs
View file @ 84ea2c7a
...@@ -195,7 +195,7 @@ namespace Google.Protobuf.Reflection ...@@ -195,7 +195,7 @@ namespace Google.Protobuf.Reflection
Assert.AreEqual(value, enumType.Values[1]); Assert.AreEqual(value, enumType.Values[1]);
Assert.AreEqual("FOREIGN_FOO", value.Name); Assert.AreEqual("FOREIGN_FOO", value.Name);
Assert.AreEqual(4, value.Number); Assert.AreEqual(4, value.Number);
Assert.AreEqual((int) ForeignEnum.FOREIGN_FOO, value.Number); Assert.AreEqual((int) ForeignEnum.ForeignFoo, value.Number);
Assert.AreEqual(value, enumType.FindValueByNumber(4)); Assert.AreEqual(value, enumType.FindValueByNumber(4));
Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE")); Assert.Null(enumType.FindValueByName("NO_SUCH_VALUE"));
for (int i = 0; i < enumType.Values.Count; i++) for (int i = 0; i < enumType.Values.Count; i++)
......
csharp/src/Google.Protobuf.Test/Reflection/FieldAccessTest.cs
View file @ 84ea2c7a
...@@ -128,7 +128,7 @@ namespace Google.Protobuf.Reflection ...@@ -128,7 +128,7 @@ namespace Google.Protobuf.Reflection
fields[TestAllTypes.SingleInt32FieldNumber].Accessor.SetValue(message, 500); fields[TestAllTypes.SingleInt32FieldNumber].Accessor.SetValue(message, 500);
fields[TestAllTypes.SingleStringFieldNumber].Accessor.SetValue(message, "It's a string"); fields[TestAllTypes.SingleStringFieldNumber].Accessor.SetValue(message, "It's a string");
fields[TestAllTypes.SingleBytesFieldNumber].Accessor.SetValue(message, ByteString.CopyFrom(99, 98, 97)); fields[TestAllTypes.SingleBytesFieldNumber].Accessor.SetValue(message, ByteString.CopyFrom(99, 98, 97));
fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.SetValue(message, ForeignEnum.FOREIGN_FOO); fields[TestAllTypes.SingleForeignEnumFieldNumber].Accessor.SetValue(message, ForeignEnum.ForeignFoo);
fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.SetValue(message, new ForeignMessage { C = 12345 }); fields[TestAllTypes.SingleForeignMessageFieldNumber].Accessor.SetValue(message, new ForeignMessage { C = 12345 });
fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.SetValue(message, 20150701.5); fields[TestAllTypes.SingleDoubleFieldNumber].Accessor.SetValue(message, 20150701.5);
...@@ -138,7 +138,7 @@ namespace Google.Protobuf.Reflection ...@@ -138,7 +138,7 @@ namespace Google.Protobuf.Reflection
SingleInt32 = 500, SingleInt32 = 500,
SingleString = "It's a string", SingleString = "It's a string",
SingleBytes = ByteString.CopyFrom(99, 98, 97), SingleBytes = ByteString.CopyFrom(99, 98, 97),
SingleForeignEnum = ForeignEnum.FOREIGN_FOO, SingleForeignEnum = ForeignEnum.ForeignFoo,
SingleForeignMessage = new ForeignMessage { C = 12345 }, SingleForeignMessage = new ForeignMessage { C = 12345 },
SingleDouble = 20150701.5 SingleDouble = 20150701.5
}; };
......
csharp/src/Google.Protobuf.Test/SampleMessages.cs
View file @ 84ea2c7a
...@@ -54,13 +54,13 @@ namespace Google.Protobuf ...@@ -54,13 +54,13 @@ namespace Google.Protobuf
SingleFixed32 = 23, SingleFixed32 = 23,
SingleFixed64 = 1234567890123, SingleFixed64 = 1234567890123,
SingleFloat = 12.25f, SingleFloat = 12.25f,
SingleForeignEnum = ForeignEnum.FOREIGN_BAR, SingleForeignEnum = ForeignEnum.ForeignBar,
SingleForeignMessage = new ForeignMessage { C = 10 }, SingleForeignMessage = new ForeignMessage { C = 10 },
SingleImportEnum = ImportEnum.IMPORT_BAZ, SingleImportEnum = ImportEnum.ImportBaz,
SingleImportMessage = new ImportMessage { D = 20 }, SingleImportMessage = new ImportMessage { D = 20 },
SingleInt32 = 100, SingleInt32 = 100,
SingleInt64 = 3210987654321, SingleInt64 = 3210987654321,
SingleNestedEnum = TestAllTypes.Types.NestedEnum.FOO, SingleNestedEnum = TestAllTypes.Types.NestedEnum.Foo,
SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 }, SingleNestedMessage = new TestAllTypes.Types.NestedMessage { Bb = 35 },
SinglePublicImportMessage = new PublicImportMessage { E = 54 }, SinglePublicImportMessage = new PublicImportMessage { E = 54 },
SingleSfixed32 = -123, SingleSfixed32 = -123,
...@@ -76,13 +76,13 @@ namespace Google.Protobuf ...@@ -76,13 +76,13 @@ namespace Google.Protobuf
RepeatedFixed32 = { UInt32.MaxValue, 23 }, RepeatedFixed32 = { UInt32.MaxValue, 23 },
RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 }, RepeatedFixed64 = { UInt64.MaxValue, 1234567890123 },
RepeatedFloat = { 100f, 12.25f }, RepeatedFloat = { 100f, 12.25f },
RepeatedForeignEnum = { ForeignEnum.FOREIGN_FOO, ForeignEnum.FOREIGN_BAR }, RepeatedForeignEnum = { ForeignEnum.ForeignFoo, ForeignEnum.ForeignBar },
RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } }, RepeatedForeignMessage = { new ForeignMessage(), new ForeignMessage { C = 10 } },
RepeatedImportEnum = { ImportEnum.IMPORT_BAZ, ImportEnum.IMPORT_ENUM_UNSPECIFIED }, RepeatedImportEnum = { ImportEnum.ImportBaz, ImportEnum.Unspecified },
RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } }, RepeatedImportMessage = { new ImportMessage { D = 20 }, new ImportMessage { D = 25 } },
RepeatedInt32 = { 100, 200 }, RepeatedInt32 = { 100, 200 },
RepeatedInt64 = { 3210987654321, Int64.MaxValue }, RepeatedInt64 = { 3210987654321, Int64.MaxValue },
RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.FOO, TestAllTypes.Types.NestedEnum.NEG }, RepeatedNestedEnum = { TestAllTypes.Types.NestedEnum.Foo, TestAllTypes.Types.NestedEnum.Neg },
RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } }, RepeatedNestedMessage = { new TestAllTypes.Types.NestedMessage { Bb = 35 }, new TestAllTypes.Types.NestedMessage { Bb = 10 } },
RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } }, RepeatedPublicImportMessage = { new PublicImportMessage { E = 54 }, new PublicImportMessage { E = -1 } },
RepeatedSfixed32 = { -123, 123 }, RepeatedSfixed32 = { -123, 123 },
...@@ -92,8 +92,8 @@ namespace Google.Protobuf ...@@ -92,8 +92,8 @@ namespace Google.Protobuf
RepeatedString = { "foo", "bar" }, RepeatedString = { "foo", "bar" },
RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue }, RepeatedUint32 = { UInt32.MaxValue, UInt32.MinValue },
RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue }, RepeatedUint64 = { UInt64.MaxValue, UInt32.MinValue },
OneofString = "Oneof string" OneofString = "Oneof string"
}; };
} }
} }
} }
\ No newline at end of file
csharp/src/Google.Protobuf.Test/TestCornerCases.cs
View file @ 84ea2c7a
...@@ -43,8 +43,8 @@ namespace Google.Protobuf ...@@ -43,8 +43,8 @@ namespace Google.Protobuf
NegativeEnumMessage msg = new NegativeEnumMessage NegativeEnumMessage msg = new NegativeEnumMessage
{ {
Value = NegativeEnum.MinusOne, Value = NegativeEnum.MinusOne,
Values = { NegativeEnum.NEGATIVE_ENUM_ZERO, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }, Values = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow },
PackedValues = { NegativeEnum.NEGATIVE_ENUM_ZERO, NegativeEnum.MinusOne, NegativeEnum.FiveBelow } PackedValues = { NegativeEnum.Zero, NegativeEnum.MinusOne, NegativeEnum.FiveBelow }
}; };
Assert.AreEqual(58, msg.CalculateSize()); Assert.AreEqual(58, msg.CalculateSize());
......
csharp/src/Google.Protobuf.Test/TestProtos/MapUnittestProto3.cs
View file @ 84ea2c7a
...@@ -164,9 +164,9 @@ namespace Google.Protobuf.TestProtos { ...@@ -164,9 +164,9 @@ namespace Google.Protobuf.TestProtos {
} }
#region Enums #region Enums
public enum MapEnum { public enum MapEnum {
MAP_ENUM_FOO = 0, [pbr::OriginalName("MAP_ENUM_FOO")] Foo = 0,
MAP_ENUM_BAR = 1, [pbr::OriginalName("MAP_ENUM_BAR")] Bar = 1,
MAP_ENUM_BAZ = 2, [pbr::OriginalName("MAP_ENUM_BAZ")] Baz = 2,
} }
#endregion #endregion
...@@ -1358,7 +1358,7 @@ namespace Google.Protobuf.TestProtos { ...@@ -1358,7 +1358,7 @@ namespace Google.Protobuf.TestProtos {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public static partial class Types { public static partial class Types {
public enum Type { public enum Type {
TYPE_FOO = 0, [pbr::OriginalName("TYPE_FOO")] Foo = 0,
} }
} }
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestImportProto3.cs
View file @ 84ea2c7a
...@@ -42,10 +42,10 @@ namespace Google.Protobuf.TestProtos { ...@@ -42,10 +42,10 @@ namespace Google.Protobuf.TestProtos {
} }
#region Enums #region Enums
public enum ImportEnum { public enum ImportEnum {
IMPORT_ENUM_UNSPECIFIED = 0, [pbr::OriginalName("IMPORT_ENUM_UNSPECIFIED")] Unspecified = 0,
IMPORT_FOO = 7, [pbr::OriginalName("IMPORT_FOO")] ImportFoo = 7,
IMPORT_BAR = 8, [pbr::OriginalName("IMPORT_BAR")] ImportBar = 8,
IMPORT_BAZ = 9, [pbr::OriginalName("IMPORT_BAZ")] ImportBaz = 9,
} }
#endregion #endregion
......
csharp/src/Google.Protobuf.Test/TestProtos/UnittestIssues.cs
View file @ 84ea2c7a
...@@ -66,14 +66,14 @@ namespace UnitTest.Issues.TestProtos { ...@@ -66,14 +66,14 @@ namespace UnitTest.Issues.TestProtos {
} }
#region Enums #region Enums
public enum NegativeEnum { public enum NegativeEnum {
NEGATIVE_ENUM_ZERO = 0, [pbr::OriginalName("NEGATIVE_ENUM_ZERO")] Zero = 0,
FiveBelow = -5, [pbr::OriginalName("FiveBelow")] FiveBelow = -5,
MinusOne = -1, [pbr::OriginalName("MinusOne")] MinusOne = -1,
} }
public enum DeprecatedEnum { public enum DeprecatedEnum {
DEPRECATED_ZERO = 0, [pbr::OriginalName("DEPRECATED_ZERO")] DeprecatedZero = 0,
one = 1, [pbr::OriginalName("one")] One = 1,
} }
#endregion #endregion
...@@ -356,7 +356,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -356,7 +356,7 @@ namespace UnitTest.Issues.TestProtos {
/// <summary>Field number for the "value" field.</summary> /// <summary>Field number for the "value" field.</summary>
public const int ValueFieldNumber = 1; public const int ValueFieldNumber = 1;
private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO; private global::UnitTest.Issues.TestProtos.NegativeEnum value_ = 0;
public global::UnitTest.Issues.TestProtos.NegativeEnum Value { public global::UnitTest.Issues.TestProtos.NegativeEnum Value {
get { return value_; } get { return value_; }
set { set {
...@@ -401,7 +401,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -401,7 +401,7 @@ namespace UnitTest.Issues.TestProtos {
public override int GetHashCode() { public override int GetHashCode() {
int hash = 1; int hash = 1;
if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) hash ^= Value.GetHashCode(); if (Value != 0) hash ^= Value.GetHashCode();
hash ^= values_.GetHashCode(); hash ^= values_.GetHashCode();
hash ^= packedValues_.GetHashCode(); hash ^= packedValues_.GetHashCode();
return hash; return hash;
...@@ -412,7 +412,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -412,7 +412,7 @@ namespace UnitTest.Issues.TestProtos {
} }
public void WriteTo(pb::CodedOutputStream output) { public void WriteTo(pb::CodedOutputStream output) {
if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) { if (Value != 0) {
output.WriteRawTag(8); output.WriteRawTag(8);
output.WriteEnum((int) Value); output.WriteEnum((int) Value);
} }
...@@ -422,7 +422,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -422,7 +422,7 @@ namespace UnitTest.Issues.TestProtos {
public int CalculateSize() { public int CalculateSize() {
int size = 0; int size = 0;
if (Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) { if (Value != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Value);
} }
size += values_.CalculateSize(_repeated_values_codec); size += values_.CalculateSize(_repeated_values_codec);
...@@ -434,7 +434,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -434,7 +434,7 @@ namespace UnitTest.Issues.TestProtos {
if (other == null) { if (other == null) {
return; return;
} }
if (other.Value != global::UnitTest.Issues.TestProtos.NegativeEnum.NEGATIVE_ENUM_ZERO) { if (other.Value != 0) {
Value = other.Value; Value = other.Value;
} }
values_.Add(other.values_); values_.Add(other.values_);
...@@ -620,7 +620,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -620,7 +620,7 @@ namespace UnitTest.Issues.TestProtos {
/// <summary>Field number for the "EnumValue" field.</summary> /// <summary>Field number for the "EnumValue" field.</summary>
public const int EnumValueFieldNumber = 5; public const int EnumValueFieldNumber = 5;
private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO; private global::UnitTest.Issues.TestProtos.DeprecatedEnum enumValue_ = 0;
[global::System.ObsoleteAttribute()] [global::System.ObsoleteAttribute()]
public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue { public global::UnitTest.Issues.TestProtos.DeprecatedEnum EnumValue {
get { return enumValue_; } get { return enumValue_; }
...@@ -665,7 +665,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -665,7 +665,7 @@ namespace UnitTest.Issues.TestProtos {
hash ^= primitiveArray_.GetHashCode(); hash ^= primitiveArray_.GetHashCode();
if (messageValue_ != null) hash ^= MessageValue.GetHashCode(); if (messageValue_ != null) hash ^= MessageValue.GetHashCode();
hash ^= messageArray_.GetHashCode(); hash ^= messageArray_.GetHashCode();
if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) hash ^= EnumValue.GetHashCode(); if (EnumValue != 0) hash ^= EnumValue.GetHashCode();
hash ^= enumArray_.GetHashCode(); hash ^= enumArray_.GetHashCode();
return hash; return hash;
} }
...@@ -685,7 +685,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -685,7 +685,7 @@ namespace UnitTest.Issues.TestProtos {
output.WriteMessage(MessageValue); output.WriteMessage(MessageValue);
} }
messageArray_.WriteTo(output, _repeated_messageArray_codec); messageArray_.WriteTo(output, _repeated_messageArray_codec);
if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) { if (EnumValue != 0) {
output.WriteRawTag(40); output.WriteRawTag(40);
output.WriteEnum((int) EnumValue); output.WriteEnum((int) EnumValue);
} }
...@@ -702,7 +702,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -702,7 +702,7 @@ namespace UnitTest.Issues.TestProtos {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageValue); size += 1 + pb::CodedOutputStream.ComputeMessageSize(MessageValue);
} }
size += messageArray_.CalculateSize(_repeated_messageArray_codec); size += messageArray_.CalculateSize(_repeated_messageArray_codec);
if (EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) { if (EnumValue != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumValue); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) EnumValue);
} }
size += enumArray_.CalculateSize(_repeated_enumArray_codec); size += enumArray_.CalculateSize(_repeated_enumArray_codec);
...@@ -724,7 +724,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -724,7 +724,7 @@ namespace UnitTest.Issues.TestProtos {
MessageValue.MergeFrom(other.MessageValue); MessageValue.MergeFrom(other.MessageValue);
} }
messageArray_.Add(other.messageArray_); messageArray_.Add(other.messageArray_);
if (other.EnumValue != global::UnitTest.Issues.TestProtos.DeprecatedEnum.DEPRECATED_ZERO) { if (other.EnumValue != 0) {
EnumValue = other.EnumValue; EnumValue = other.EnumValue;
} }
enumArray_.Add(other.enumArray_); enumArray_.Add(other.enumArray_);
...@@ -1435,7 +1435,7 @@ namespace UnitTest.Issues.TestProtos { ...@@ -1435,7 +1435,7 @@ namespace UnitTest.Issues.TestProtos {
public const int NameFieldNumber = 1; public const int NameFieldNumber = 1;
private string name_ = ""; private string name_ = "";
/// <summary> /// <summary>
/// json_name field options are not properly handled during deserialization /// Message for testing the effects for of the json_name option
/// </summary> /// </summary>
public string Name { public string Name {
get { return name_; } get { return name_; }
......
csharp/src/Google.Protobuf/Reflection/FieldDescriptor.cs
View file @ 84ea2c7a
...@@ -133,41 +133,41 @@ namespace Google.Protobuf.Reflection ...@@ -133,41 +133,41 @@ namespace Google.Protobuf.Reflection
{ {
switch (type) switch (type)
{ {
case FieldDescriptorProto.Types.Type.TYPE_DOUBLE: case FieldDescriptorProto.Types.Type.Double:
return FieldType.Double; return FieldType.Double;
case FieldDescriptorProto.Types.Type.TYPE_FLOAT: case FieldDescriptorProto.Types.Type.Float:
return FieldType.Float; return FieldType.Float;
case FieldDescriptorProto.Types.Type.TYPE_INT64: case FieldDescriptorProto.Types.Type.Int64:
return FieldType.Int64; return FieldType.Int64;
case FieldDescriptorProto.Types.Type.TYPE_UINT64: case FieldDescriptorProto.Types.Type.Uint64:
return FieldType.UInt64; return FieldType.UInt64;
case FieldDescriptorProto.Types.Type.TYPE_INT32: case FieldDescriptorProto.Types.Type.Int32:
return FieldType.Int32; return FieldType.Int32;
case FieldDescriptorProto.Types.Type.TYPE_FIXED64: case FieldDescriptorProto.Types.Type.Fixed64:
return FieldType.Fixed64; return FieldType.Fixed64;
case FieldDescriptorProto.Types.Type.TYPE_FIXED32: case FieldDescriptorProto.Types.Type.Fixed32:
return FieldType.Fixed32; return FieldType.Fixed32;
case FieldDescriptorProto.Types.Type.TYPE_BOOL: case FieldDescriptorProto.Types.Type.Bool:
return FieldType.Bool; return FieldType.Bool;
case FieldDescriptorProto.Types.Type.TYPE_STRING: case FieldDescriptorProto.Types.Type.String:
return FieldType.String; return FieldType.String;
case FieldDescriptorProto.Types.Type.TYPE_GROUP: case FieldDescriptorProto.Types.Type.Group:
return FieldType.Group; return FieldType.Group;
case FieldDescriptorProto.Types.Type.TYPE_MESSAGE: case FieldDescriptorProto.Types.Type.Message:
return FieldType.Message; return FieldType.Message;
case FieldDescriptorProto.Types.Type.TYPE_BYTES: case FieldDescriptorProto.Types.Type.Bytes:
return FieldType.Bytes; return FieldType.Bytes;
case FieldDescriptorProto.Types.Type.TYPE_UINT32: case FieldDescriptorProto.Types.Type.Uint32:
return FieldType.UInt32; return FieldType.UInt32;
case FieldDescriptorProto.Types.Type.TYPE_ENUM: case FieldDescriptorProto.Types.Type.Enum:
return FieldType.Enum; return FieldType.Enum;
case FieldDescriptorProto.Types.Type.TYPE_SFIXED32: case FieldDescriptorProto.Types.Type.Sfixed32:
return FieldType.SFixed32; return FieldType.SFixed32;
case FieldDescriptorProto.Types.Type.TYPE_SFIXED64: case FieldDescriptorProto.Types.Type.Sfixed64:
return FieldType.SFixed64; return FieldType.SFixed64;
case FieldDescriptorProto.Types.Type.TYPE_SINT32: case FieldDescriptorProto.Types.Type.Sint32:
return FieldType.SInt32; return FieldType.SInt32;
case FieldDescriptorProto.Types.Type.TYPE_SINT64: case FieldDescriptorProto.Types.Type.Sint64:
return FieldType.SInt64; return FieldType.SInt64;
default: default:
throw new ArgumentException("Invalid type specified"); throw new ArgumentException("Invalid type specified");
...@@ -177,7 +177,7 @@ namespace Google.Protobuf.Reflection ...@@ -177,7 +177,7 @@ namespace Google.Protobuf.Reflection
/// <summary> /// <summary>
/// Returns <c>true</c> if this field is a repeated field; <c>false</c> otherwise. /// Returns <c>true</c> if this field is a repeated field; <c>false</c> otherwise.
/// </summary> /// </summary>
public bool IsRepeated => Proto.Label == FieldDescriptorProto.Types.Label.LABEL_REPEATED; public bool IsRepeated => Proto.Label == FieldDescriptorProto.Types.Label.Repeated;
/// <summary> /// <summary>
/// Returns <c>true</c> if this field is a map field; <c>false</c> otherwise. /// Returns <c>true</c> if this field is a map field; <c>false</c> otherwise.
......
csharp/src/Google.Protobuf/WellKnownTypes/Api.cs
View file @ 84ea2c7a
...@@ -185,7 +185,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -185,7 +185,7 @@ namespace Google.Protobuf.WellKnownTypes {
/// <summary>Field number for the "syntax" field.</summary> /// <summary>Field number for the "syntax" field.</summary>
public const int SyntaxFieldNumber = 7; public const int SyntaxFieldNumber = 7;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2; private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = 0;
/// <summary> /// <summary>
/// The source syntax of the service. /// The source syntax of the service.
/// </summary> /// </summary>
...@@ -225,7 +225,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -225,7 +225,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (Version.Length != 0) hash ^= Version.GetHashCode(); if (Version.Length != 0) hash ^= Version.GetHashCode();
if (sourceContext_ != null) hash ^= SourceContext.GetHashCode(); if (sourceContext_ != null) hash ^= SourceContext.GetHashCode();
hash ^= mixins_.GetHashCode(); hash ^= mixins_.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode(); if (Syntax != 0) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -249,7 +249,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -249,7 +249,7 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteMessage(SourceContext); output.WriteMessage(SourceContext);
} }
mixins_.WriteTo(output, _repeated_mixins_codec); mixins_.WriteTo(output, _repeated_mixins_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (Syntax != 0) {
output.WriteRawTag(56); output.WriteRawTag(56);
output.WriteEnum((int) Syntax); output.WriteEnum((int) Syntax);
} }
...@@ -269,7 +269,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -269,7 +269,7 @@ namespace Google.Protobuf.WellKnownTypes {
size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext); size += 1 + pb::CodedOutputStream.ComputeMessageSize(SourceContext);
} }
size += mixins_.CalculateSize(_repeated_mixins_codec); size += mixins_.CalculateSize(_repeated_mixins_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (Syntax != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
} }
return size; return size;
...@@ -294,7 +294,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -294,7 +294,7 @@ namespace Google.Protobuf.WellKnownTypes {
SourceContext.MergeFrom(other.SourceContext); SourceContext.MergeFrom(other.SourceContext);
} }
mixins_.Add(other.mixins_); mixins_.Add(other.mixins_);
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (other.Syntax != 0) {
Syntax = other.Syntax; Syntax = other.Syntax;
} }
} }
...@@ -458,7 +458,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -458,7 +458,7 @@ namespace Google.Protobuf.WellKnownTypes {
/// <summary>Field number for the "syntax" field.</summary> /// <summary>Field number for the "syntax" field.</summary>
public const int SyntaxFieldNumber = 7; public const int SyntaxFieldNumber = 7;
private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2; private global::Google.Protobuf.WellKnownTypes.Syntax syntax_ = 0;
/// <summary> /// <summary>
/// The source syntax of this method. /// The source syntax of this method.
/// </summary> /// </summary>
...@@ -498,7 +498,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -498,7 +498,7 @@ namespace Google.Protobuf.WellKnownTypes {
if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode(); if (ResponseTypeUrl.Length != 0) hash ^= ResponseTypeUrl.GetHashCode();
if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode(); if (ResponseStreaming != false) hash ^= ResponseStreaming.GetHashCode();
hash ^= options_.GetHashCode(); hash ^= options_.GetHashCode();
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) hash ^= Syntax.GetHashCode(); if (Syntax != 0) hash ^= Syntax.GetHashCode();
return hash; return hash;
} }
...@@ -528,7 +528,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -528,7 +528,7 @@ namespace Google.Protobuf.WellKnownTypes {
output.WriteBool(ResponseStreaming); output.WriteBool(ResponseStreaming);
} }
options_.WriteTo(output, _repeated_options_codec); options_.WriteTo(output, _repeated_options_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (Syntax != 0) {
output.WriteRawTag(56); output.WriteRawTag(56);
output.WriteEnum((int) Syntax); output.WriteEnum((int) Syntax);
} }
...@@ -552,7 +552,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -552,7 +552,7 @@ namespace Google.Protobuf.WellKnownTypes {
size += 1 + 1; size += 1 + 1;
} }
size += options_.CalculateSize(_repeated_options_codec); size += options_.CalculateSize(_repeated_options_codec);
if (Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (Syntax != 0) {
size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax); size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Syntax);
} }
return size; return size;
...@@ -578,7 +578,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -578,7 +578,7 @@ namespace Google.Protobuf.WellKnownTypes {
ResponseStreaming = other.ResponseStreaming; ResponseStreaming = other.ResponseStreaming;
} }
options_.Add(other.options_); options_.Add(other.options_);
if (other.Syntax != global::Google.Protobuf.WellKnownTypes.Syntax.SYNTAX_PROTO2) { if (other.Syntax != 0) {
Syntax = other.Syntax; Syntax = other.Syntax;
} }
} }
......
csharp/src/Google.Protobuf/WellKnownTypes/Struct.cs
View file @ 84ea2c7a
...@@ -59,7 +59,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -59,7 +59,7 @@ namespace Google.Protobuf.WellKnownTypes {
/// <summary> /// <summary>
/// Null value. /// Null value.
/// </summary> /// </summary>
NULL_VALUE = 0, [pbr::OriginalName("NULL_VALUE")] NullValue = 0,
} }
#endregion #endregion
...@@ -234,7 +234,7 @@ namespace Google.Protobuf.WellKnownTypes { ...@@ -234,7 +234,7 @@ namespace Google.Protobuf.WellKnownTypes {
/// Represents a null value. /// Represents a null value.
/// </summary> /// </summary>
public global::Google.Protobuf.WellKnownTypes.NullValue NullValue { public global::Google.Protobuf.WellKnownTypes.NullValue NullValue {
get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : global::Google.Protobuf.WellKnownTypes.NullValue.NULL_VALUE; } get { return kindCase_ == KindOneofCase.NullValue ? (global::Google.Protobuf.WellKnownTypes.NullValue) kind_ : 0; }
set { set {
kind_ = value; kind_ = value;
kindCase_ = KindOneofCase.NullValue; kindCase_ = KindOneofCase.NullValue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment