diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2016-01-29 13:51:05 -0800 |
commit | 5221dcbe479ed765d8103ed7601c69b6d8d6ca4f (patch) | |
tree | d48fed101cf2fc21e07d3034cc4e01c81f00bac2 /src/google/protobuf/util/internal | |
parent | cb3f428810456dbb31211ed421401b90fb3b6586 (diff) |
Integrate from google internal.
Java files are moved to un-do the hack in the prevous commit, which
moved the java files to the original position for integration.
Diffstat (limited to 'src/google/protobuf/util/internal')
-rw-r--r-- | src/google/protobuf/util/internal/testdata/maps.proto | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/google/protobuf/util/internal/testdata/maps.proto b/src/google/protobuf/util/internal/testdata/maps.proto index 7fb42a26..6475ecdd 100644 --- a/src/google/protobuf/util/internal/testdata/maps.proto +++ b/src/google/protobuf/util/internal/testdata/maps.proto @@ -44,6 +44,35 @@ message MapOut { map<string, MapM> map1 = 1; map<string, MapOut> map2 = 2; map<int32, string> map3 = 3; + map<bool, string> map4 = 5; + string bar = 4; +} + +// A message with exactly the same wire representation as MapOut, but using +// repeated message fields instead of map fields. We use this message to test +// the wire-format compatibility of the JSON transcoder (e.g., whether it +// handles missing keys correctly). +message MapOutWireFormat { + message Map1Entry { + string key = 1; + MapM value = 2; + } + repeated Map1Entry map1 = 1; + message Map2Entry { + string key = 1; + MapOut value = 2; + } + repeated Map2Entry map2 = 2; + message Map3Entry { + int32 key = 1; + string value = 2; + } + repeated Map3Entry map3 = 3; + message Map4Entry { + bool key = 1; + string value = 2; + } + repeated Map4Entry map4 = 5; string bar = 4; } |