aboutsummaryrefslogtreecommitdiff
path: root/javanano
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-02-17 18:03:59 -0800
committerJisi Liu <jisi.liu@gmail.com>2015-02-19 16:43:07 -0800
commit33222b5a024821df499eaf9060206ea70ebe4574 (patch)
tree9306e0661a19b8a8e270cebaa01f7cb1d4509daf /javanano
parentf0e08fd4e4c33c87bbfb309b5baa4d6e976ddcc7 (diff)
downloadprotobuf-33222b5a024821df499eaf9060206ea70ebe4574.tar.gz
protobuf-33222b5a024821df499eaf9060206ea70ebe4574.tar.bz2
protobuf-33222b5a024821df499eaf9060206ea70ebe4574.zip
Initial check in for primitive oneof fields.
Diffstat (limited to 'javanano')
-rw-r--r--javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto8
1 files changed, 8 insertions, 0 deletions
diff --git a/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto b/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
index 4519533c..cc3717d3 100644
--- a/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
+++ b/javanano/src/test/java/com/google/protobuf/nano/unittest_nano.proto
@@ -167,6 +167,14 @@ message TestAllTypesNano {
// Try to fail with java reserved keywords
optional int32 synchronized = 96;
+
+ oneof oneof_field {
+ uint32 oneof_uint32 = 111;
+ // NestedMessage oneof_nested_message = 112;
+ // string oneof_string = 123;
+ // bytes oneof_bytes = 124;
+ fixed64 oneof_fixed64 = 115;
+ }
}
message ForeignMessageNano {