aboutsummaryrefslogtreecommitdiffhomepage
path: root/conformance/conformance.proto
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2016-08-16 09:02:27 -0400
committerGravatar GitHub <noreply@github.com>2016-08-16 09:02:27 -0400
commite3891655868a465ad0d17ddc2b1ea95dd0a39adf (patch)
tree97558337dfe98edc20311842db2d6f080eaae576 /conformance/conformance.proto
parent4763e64eb1e72e628ab75a9872f4146fdd2cf765 (diff)
Add more JSON tests around underscores (#1963)
Add more JSON tests around underscores
Diffstat (limited to 'conformance/conformance.proto')
-rw-r--r--conformance/conformance.proto7
1 files changed, 7 insertions, 0 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto
index e1b797ca..95a8fd13 100644
--- a/conformance/conformance.proto
+++ b/conformance/conformance.proto
@@ -253,6 +253,7 @@ message TestAllTypes {
repeated google.protobuf.Value repeated_value = 316;
// Test field-name-to-JSON-name convention.
+ // (protobuf says names can be any valid C/C++ identifier.)
int32 fieldname1 = 401;
int32 field_name2 = 402;
int32 _field_name3 = 403;
@@ -265,6 +266,12 @@ message TestAllTypes {
int32 Field_Name10 = 410;
int32 FIELD_NAME11 = 411;
int32 FIELD_name12 = 412;
+ int32 __field_name13 = 413;
+ int32 __Field_name14 = 414;
+ int32 field__name15 = 415;
+ int32 field__Name16 = 416;
+ int32 field_name17__ = 417;
+ int32 Field_name18__ = 418;
}
message ForeignMessage {