diff options
| author | Jon Skeet <jonskeet@google.com> | 2018-09-18 07:33:39 +0100 |
|---|---|---|
| committer | Jon Skeet <skeet@pobox.com> | 2018-09-22 09:09:15 +0100 |
| commit | 1376ee4e6ab5b4c2c7007b0dfc88bcda029188c8 (patch) | |
| tree | 875273e9241067a8d569a1118b3a9b44f8c6bc46 | |
| parent | 988b381c839e60958be7a4111860b07d64c0b53b (diff) | |
| download | protobuf-1376ee4e6ab5b4c2c7007b0dfc88bcda029188c8.tar.gz protobuf-1376ee4e6ab5b4c2c7007b0dfc88bcda029188c8.tar.bz2 protobuf-1376ee4e6ab5b4c2c7007b0dfc88bcda029188c8.zip | |
Simplify descriptor tests
Rather than converting the proto to a ByteString again, use the
existing SerializedData property.
| -rw-r--r-- | csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs index 586ab47a..8e1097aa 100644 --- a/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs +++ b/csharp/src/Google.Protobuf.Test/Reflection/DescriptorsTest.cs @@ -60,9 +60,9 @@ namespace Google.Protobuf.Reflection // dependencies come before the descriptors depending on them. var descriptorData = new List<ByteString> { - UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestProto3Reflection.Descriptor.Proto.ToByteString() + UnittestImportPublicProto3Reflection.Descriptor.SerializedData, + UnittestImportProto3Reflection.Descriptor.SerializedData, + UnittestProto3Reflection.Descriptor.SerializedData }; var converted = FileDescriptor.BuildFromByteStrings(descriptorData); Assert.AreEqual(3, converted.Count); @@ -120,8 +120,8 @@ namespace Google.Protobuf.Reflection { var descriptorData = new List<ByteString> { - UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestProto3Reflection.Descriptor.Proto.ToByteString(), + UnittestImportProto3Reflection.Descriptor.SerializedData, + UnittestProto3Reflection.Descriptor.SerializedData, }; // This will fail, because we're missing UnittestImportPublicProto3Reflection Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData)); @@ -132,8 +132,8 @@ namespace Google.Protobuf.Reflection { var descriptorData = new List<ByteString> { - UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(), + UnittestImportPublicProto3Reflection.Descriptor.SerializedData, + UnittestImportPublicProto3Reflection.Descriptor.SerializedData, }; // This will fail due to the same name being used twice Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData)); @@ -144,9 +144,9 @@ namespace Google.Protobuf.Reflection { var descriptorData = new List<ByteString> { - UnittestProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestImportProto3Reflection.Descriptor.Proto.ToByteString() + UnittestProto3Reflection.Descriptor.SerializedData, + UnittestImportPublicProto3Reflection.Descriptor.SerializedData, + UnittestImportProto3Reflection.Descriptor.SerializedData }; // This will fail, because the dependencies should come first Assert.Throws<ArgumentException>(() => FileDescriptor.BuildFromByteStrings(descriptorData)); @@ -225,9 +225,9 @@ namespace Google.Protobuf.Reflection // dependencies come before the descriptors depending on them. var descriptorData = new List<ByteString> { - UnittestImportPublicProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestImportProto3Reflection.Descriptor.Proto.ToByteString(), - UnittestProto3Reflection.Descriptor.Proto.ToByteString() + UnittestImportPublicProto3Reflection.Descriptor.SerializedData, + UnittestImportProto3Reflection.Descriptor.SerializedData, + UnittestProto3Reflection.Descriptor.SerializedData }; var converted = FileDescriptor.BuildFromByteStrings(descriptorData); TestFieldDescriptor( |