aboutsummaryrefslogtreecommitdiffhomepage
path: root/js/test.proto
diff options
context:
space:
mode:
authorGravatar Joshua Haberman <jhaberman@gmail.com>2016-09-20 13:56:18 -0700
committerGravatar Bo Yang <teboring@google.com>2016-10-10 11:23:36 -0700
commitaf62fde5e88a2cc348dfacefd1db321e5481d22c (patch)
tree5ab579b79dc0371167c4410ec683f4d126da22f3 /js/test.proto
parente3f0689d05ca05273f57a314e03e60a35b687883 (diff)
Fix for maps_test.js in JavaScript. (#2145)
Had to strip out some JSPB-format test code, but also added some .proto test messages that had been improperly stripped out.
Diffstat (limited to 'js/test.proto')
-rw-r--r--js/test.proto26
1 files changed, 26 insertions, 0 deletions
diff --git a/js/test.proto b/js/test.proto
index 937ffb89..48cb37e1 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -234,3 +234,29 @@ message TestEndsWithBytes {
optional bytes data = 2;
}
+message TestMapFieldsNoBinary {
+ map<string, string> map_string_string = 1;
+ map<string, int32> map_string_int32 = 2;
+ map<string, int64> map_string_int64 = 3;
+ map<string, bool> map_string_bool = 4;
+ map<string, double> map_string_double = 5;
+ map<string, MapValueEnumNoBinary> map_string_enum = 6;
+ map<string, MapValueMessageNoBinary> map_string_msg = 7;
+
+ map<int32, string> map_int32_string = 8;
+ map<int64, string> map_int64_string = 9;
+ map<bool, string> map_bool_string = 10;
+
+ optional TestMapFieldsNoBinary test_map_fields = 11;
+ map<string, TestMapFieldsNoBinary> map_string_testmapfields = 12;
+}
+
+enum MapValueEnumNoBinary {
+ MAP_VALUE_FOO_NOBINARY = 0;
+ MAP_VALUE_BAR_NOBINARY = 1;
+ MAP_VALUE_BAZ_NOBINARY = 2;
+}
+
+message MapValueMessageNoBinary {
+ optional int32 foo = 1;
+}