aboutsummaryrefslogtreecommitdiff
path: root/ruby/tests/generated_code.proto
diff options
context:
space:
mode:
authorJisi Liu <liujisi@google.com>2018-01-04 14:26:24 -0800
committerGitHub <noreply@github.com>2018-01-04 14:26:24 -0800
commita3868af12be724f808faa21a29e7b4931e30bed1 (patch)
tree3df23c4174287023b569108eb133db0f9c310646 /ruby/tests/generated_code.proto
parenteca1d2a7113b3d57f900f69661342c0078c956c4 (diff)
parentec826c5a592126ddb6b12b47e6e1fb6232ce340d (diff)
downloadprotobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.gz
protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.tar.bz2
protobuf-a3868af12be724f808faa21a29e7b4931e30bed1.zip
Merge pull request #4131 from pherl/merge
Merge 3.5.x branch into master
Diffstat (limited to 'ruby/tests/generated_code.proto')
-rw-r--r--ruby/tests/generated_code.proto13
1 files changed, 13 insertions, 0 deletions
diff --git a/ruby/tests/generated_code.proto b/ruby/tests/generated_code.proto
index 62fd83ed..3b934bd6 100644
--- a/ruby/tests/generated_code.proto
+++ b/ruby/tests/generated_code.proto
@@ -57,6 +57,9 @@ message TestMessage {
}
NestedMessage nested_message = 80;
+
+ // Reserved for non-existing field test.
+ // int32 non_exist = 89;
}
enum TestEnum {
@@ -65,3 +68,13 @@ enum TestEnum {
B = 2;
C = 3;
}
+
+message TestUnknown {
+ TestUnknown optional_unknown = 11;
+ repeated TestUnknown repeated_unknown = 31;
+ oneof my_oneof {
+ TestUnknown oneof_unknown = 51;
+ }
+ map<string, TestUnknown> map_unknown = 67;
+ int32 unknown_field = 89;
+}