From 93c703e816ccb9f926f9d1d94216d8172554cfb4 Mon Sep 17 00:00:00 2001
From: Lukas Fittl <lukas@fittl.com>
Date: Sat, 3 Apr 2021 18:42:54 -0700
Subject: [PATCH] Add test for json_name functionality

---
 ruby/tests/encode_decode_test.rb | 6 ++++++
 ruby/tests/generated_code.proto  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/ruby/tests/encode_decode_test.rb b/ruby/tests/encode_decode_test.rb
index cce364d0d816..429ac4332216 100755
--- a/ruby/tests/encode_decode_test.rb
+++ b/ruby/tests/encode_decode_test.rb
@@ -95,4 +95,10 @@ def test_encode_wrong_msg
     end
   end
 
+  def test_json_name
+    msg = A::B::C::TestJsonName.new(:value => 42)
+    json = msg.to_json
+    assert_match json, "{\"CustomJsonName\":42}"
+  end
+
 end
diff --git a/ruby/tests/generated_code.proto b/ruby/tests/generated_code.proto
index e8116697d7a3..bfdfa5aa7809 100644
--- a/ruby/tests/generated_code.proto
+++ b/ruby/tests/generated_code.proto
@@ -83,3 +83,7 @@ message TestUnknown {
   map<string, TestUnknown> map_unknown = 67;
   int32 unknown_field = 89;
 }
+
+message TestJsonName {
+  int32 value = 1 [json_name = "CustomJsonName"];
+}