aboutsummaryrefslogtreecommitdiff
path: root/ruby/tests/basic.rb
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2016-04-15 12:57:39 -0700
committerJoshua Haberman <jhaberman@gmail.com>2016-04-15 12:57:39 -0700
commitca9bbd71d547a05604e8c2bddda66cdba5abe0c4 (patch)
tree4c61ab7d12d62aae7f690deefda827abeb7cb6e8 /ruby/tests/basic.rb
parent814685ca2cd9280ca401e1842fd6311440921a0a (diff)
parente67ef3d449011c7923cf4c1e4b205ebd0d6f2167 (diff)
downloadprotobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.tar.gz
protobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.tar.bz2
protobuf-ca9bbd71d547a05604e8c2bddda66cdba5abe0c4.zip
Merge pull request #1413 from haberman/updateupb
Updated upb: JSON parser now accepts both camelCase and original case, and flag to choose on output.
Diffstat (limited to 'ruby/tests/basic.rb')
-rw-r--r--ruby/tests/basic.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index 86c74c2a..77c186ef 100644
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -1161,7 +1161,12 @@ module BasicTest
return if RUBY_PLATFORM == "java"
m = MapMessage.new(:map_string_int32 => {"a" => 1})
expected = '{"mapStringInt32":{"a":1},"mapStringMsg":{}}'
+ expected_preserve = '{"map_string_int32":{"a":1},"map_string_msg":{}}'
assert MapMessage.encode_json(m) == expected
+
+ json = MapMessage.encode_json(m, :preserve_proto_fieldnames => true)
+ assert json == expected_preserve
+
m2 = MapMessage.decode_json(MapMessage.encode_json(m))
assert m == m2
end