commit af62fde5e88a2cc348dfacefd1db321e5481d22c
author Joshua Haberman <jhaberman@gmail.com> Tue Sep 20 13:56:18 2016 -0700
committer Bo Yang <teboring@google.com> Mon Oct 10 11:23:36 2016 -0700
tree 5ab579b79dc0371167c4410ec683f4d126da22f3
parent e3f0689d05ca05273f57a314e03e60a35b687883

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.

js/test.proto

diff --git a/js/test.proto b/js/test.proto
index 937ffb8..48cb37e 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -234,3 +234,29 @@
   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;
+}