diff options
| author |  Jon Skeet <jonskeet@google.com> | 2015-06-26 10:32:23 +0100 |
|---|---|---|
| committer | Jon Skeet <jonskeet@google.com> | 2015-06-26 10:32:23 +0100 |
| commit | c12833104f43118d62f73ae9a82cfc7ba50a04b4 (patch) | |
| tree | 1bd9c87f4295c7df827e57eefa7f2cc118055f3d /csharp/generate_protos.sh | |
| parent | c06226354d89e53c96f69401539ef3208ba4ab44 (diff) | |
Tweaks and more tests for maps
- Change the default message hash code to 1 to be consistent with other code
- Change the empty list/map hash code to 0 as "empty map" is equivalent to "no map"
- Removed map fields from unittest_proto3.proto
- Created map_unittest_proto3.proto which is like map_unittest.proto but proto3-only
- Fixed factory methods in FieldCodec highlighted by using all field types :)
- Added tests for map serialization:
- Extra fields within entries
- Entries with value then key
- Non-contiguous entries for the same map
- Multiple entries for the same key
Changes to generated code coming in next commit
Diffstat (limited to 'csharp/generate_protos.sh')
| -rwxr-xr-x | csharp/generate_protos.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/csharp/generate_protos.sh b/csharp/generate_protos.sh index 60bc2813..e861f16f 100755 --- a/csharp/generate_protos.sh +++ b/csharp/generate_protos.sh @@ -43,10 +43,12 @@ $PROTOC -Isrc --csharp_out=csharp/src/ProtocolBuffers/DescriptorProtos \ rm src/google/protobuf/descriptor_proto_file.proto $PROTOC -Isrc --csharp_out=csharp/src/ProtocolBuffers.Test/TestProtos \ + src/google/protobuf/map_unittest_proto3.proto \ src/google/protobuf/unittest_proto3.proto \ src/google/protobuf/unittest_import_proto3.proto \ src/google/protobuf/unittest_import_public_proto3.proto + $PROTOC -Icsharp/protos/extest --csharp_out=csharp/src/ProtocolBuffers.Test/TestProtos \ csharp/protos/extest/unittest_issues.proto |