From af62fde5e88a2cc348dfacefd1db321e5481d22c Mon Sep 17 00:00:00 2001
From: Joshua Haberman <jhaberman@gmail.com>
Date: Tue, 20 Sep 2016 13:56:18 -0700
Subject: 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 | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'js/test.proto')

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;
+}
-- 
cgit v1.2.3