diff options
author | Jon Skeet <skeet@pobox.com> | 2015-06-11 21:15:36 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-06-11 21:15:36 +0100 |
commit | 39aaf21d5194fdc07c296847def8e7795279e041 (patch) | |
tree | 174c362717574e13047c4d590b5f9609405aed84 /csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs | |
parent | ce0e348ded9cb7e180588476ebb5a8f3e0460f4e (diff) | |
download | protobuf-39aaf21d5194fdc07c296847def8e7795279e041.tar.gz protobuf-39aaf21d5194fdc07c296847def8e7795279e041.tar.bz2 protobuf-39aaf21d5194fdc07c296847def8e7795279e041.zip |
Reimplement enums as int values, and get rid of EnumHelper.
This makes repeated fields really awkward at the moment - but when we reimplement RepeatedField<T> to be backed by an array, we can cast the array directly...
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs b/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs index df80b3af..fcbb7f8d 100644 --- a/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs +++ b/csharp/src/ProtocolBuffers.Test/CodedOutputStreamTest.cs @@ -296,27 +296,27 @@ namespace Google.Protobuf public void TestNegativeEnumNoTag()
{
Assert.AreEqual(10, CodedOutputStream.ComputeInt32SizeNoTag(-2));
- Assert.AreEqual(10, CodedOutputStream.ComputeEnumSizeNoTag(TestNegEnum.Value));
+ Assert.AreEqual(10, CodedOutputStream.ComputeEnumSizeNoTag((int) TestNegEnum.Value));
byte[] bytes = new byte[10];
CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);
- output.WriteEnumNoTag(TestNegEnum.Value);
+ output.WriteEnumNoTag((int) TestNegEnum.Value);
Assert.AreEqual(0, output.SpaceLeft);
Assert.AreEqual("FE-FF-FF-FF-FF-FF-FF-FF-FF-01", BitConverter.ToString(bytes));
}
- enum TestNegEnum : long { None = 0, Value = -2 }
+ enum TestNegEnum { None = 0, Value = -2 }
[Test]
public void TestNegativeEnumWithTag()
{
Assert.AreEqual(11, CodedOutputStream.ComputeInt32Size(8, -2));
- Assert.AreEqual(11, CodedOutputStream.ComputeEnumSize(8, TestNegEnum.Value));
+ Assert.AreEqual(11, CodedOutputStream.ComputeEnumSize(8, (int) TestNegEnum.Value));
byte[] bytes = new byte[11];
CodedOutputStream output = CodedOutputStream.CreateInstance(bytes);
- output.WriteEnum(8, "", TestNegEnum.Value);
+ output.WriteEnum(8, "", (int) TestNegEnum.Value);
Assert.AreEqual(0, output.SpaceLeft);
//fyi, 0x40 == 0x08 << 3 + 0, field num + wire format shift
|