summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/json/test.proto5
-rw-r--r--tests/json/test.proto.pbbin1883 -> 1958 bytes
-rw-r--r--tests/json/test_json.cc1
3 files changed, 6 insertions, 0 deletions
diff --git a/tests/json/test.proto b/tests/json/test.proto
index e659001..2db0388 100644
--- a/tests/json/test.proto
+++ b/tests/json/test.proto
@@ -29,6 +29,11 @@ message TestMessage {
map<string, int32> map_string_int32 = 23;
map<string, bool> map_string_bool = 24;
map<string, SubMessage> map_string_msg = 25;
+
+ oneof o {
+ int32 oneof_int32 = 26;
+ int64 oneof_int64 = 27;
+ }
}
message SubMessage {
diff --git a/tests/json/test.proto.pb b/tests/json/test.proto.pb
index 5da355d..94b8b92 100644
--- a/tests/json/test.proto.pb
+++ b/tests/json/test.proto.pb
Binary files differ
diff --git a/tests/json/test_json.cc b/tests/json/test_json.cc
index 3fddfb6..6650817 100644
--- a/tests/json/test_json.cc
+++ b/tests/json/test_json.cc
@@ -4,6 +4,7 @@
*/
#include "tests/json/test.upbdefs.h"
+#include "tests/json/test.upb.h" // Test that it compiles for C++.
#include "tests/test_util.h"
#include "tests/upb_test.h"
#include "upb/handlers.h"
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback