diff options
author | Jon Skeet <jonskeet@google.com> | 2015-04-28 15:06:59 +0100 |
---|---|---|
committer | Jon Skeet <jonskeet@google.com> | 2015-04-28 15:06:59 +0100 |
commit | ce66c5f1b99fe36b5b91e8b59cc75ce8a4e9cba5 (patch) | |
tree | 84adc050b8ee575f94a5efc13322dd7d344fcff7 /csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs | |
parent | f3504cf3b1d456a843e8242fdee9ba0bf2991dc1 (diff) | |
download | protobuf-ce66c5f1b99fe36b5b91e8b59cc75ce8a4e9cba5.tar.gz protobuf-ce66c5f1b99fe36b5b91e8b59cc75ce8a4e9cba5.tar.bz2 protobuf-ce66c5f1b99fe36b5b91e8b59cc75ce8a4e9cba5.zip |
Updated set of unit tests and unit test protos.
This commit includes changes to the C#-specific protos, and rebuilt versions of the "stock" protos.
The stock protos have been locally updated to have a specific C# namespace, but this is expected to change soon, so hasn't been committed.
Four areas are currently not tested:
1) Serialization - we may restore this at some point, possibly optionally.
2) Services - currently nothing is generated for this; will need to see how it interacts with GRPC
3) Fields beginning with _{digit} - see https://github.com/google/protobuf/issues/308
4) Fields with names which conflict with the declaring type in nasty ways - see https://github.com/google/protobuf/issues/309
Diffstat (limited to 'csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs')
-rw-r--r-- | csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs index 02793aeb..54f400c3 100644 --- a/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs +++ b/csharp/src/ProtocolBuffers.Test/AbstractMessageTest.cs @@ -132,8 +132,8 @@ namespace Google.ProtocolBuffers {
byte[] bytes = TestUtil.GetPackedSet().ToByteArray();
ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnitTestProtoFile.RegisterAllExtensions(registry);
- UnitTestExtrasProtoFile.RegisterAllExtensions(registry);
+ Unittest.RegisterAllExtensions(registry);
+ UnittestImport.RegisterAllExtensions(registry);
TestUnpackedExtensions message = TestUnpackedExtensions.ParseFrom(bytes, registry);
TestUtil.AssertUnpackedExtensionsSet(message);
}
@@ -143,7 +143,7 @@ namespace Google.ProtocolBuffers {
byte[] bytes = TestUnpackedTypes.ParseFrom(TestUtil.GetPackedSet().ToByteArray()).ToByteArray();
ExtensionRegistry registry = ExtensionRegistry.CreateInstance();
- UnitTestProtoFile.RegisterAllExtensions(registry);
+ Unittest.RegisterAllExtensions(registry);
TestPackedExtensions message = TestPackedExtensions.ParseFrom(bytes, registry);
TestUtil.AssertPackedExtensionsSet(message);
}
@@ -250,7 +250,7 @@ namespace Google.ProtocolBuffers TestAllTypes d = TestAllTypes.CreateBuilder(c).AddRepeatedString("y").Build();
TestAllExtensions e = TestUtil.GetAllExtensionsSet();
TestAllExtensions f = TestAllExtensions.CreateBuilder(e)
- .AddExtension(UnitTestProtoFile.RepeatedInt32Extension, 999).Build();
+ .AddExtension(Unittest.RepeatedInt32Extension, 999).Build();
CheckEqualsIsConsistent(a);
CheckEqualsIsConsistent(b);
|