Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(170)

Unified Diff: third_party/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto

Issue 1842653006: Update //third_party/protobuf to version 3. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto b/third_party/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
similarity index 65%
copy from third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto
copy to third_party/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
index cffb4122c5c4f9d2e63a09d70c3784614617d88d..5bc9fa084d1d1f6ff694edf60d6ed0682f085ee8 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_no_generic_services.proto
+++ b/third_party/protobuf/src/google/protobuf/util/internal/testdata/oneofs.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
@@ -28,25 +28,41 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-// Author: kenton@google.com (Kenton Varda)
+// Proto to test oneofs.
+syntax = "proto3";
-package google.protobuf.no_generic_services_test;
+import "google/protobuf/any.proto";
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
-// *_generic_services are false by default.
+package google.protobuf.testing.oneofs;
+option java_package = "com.google.protobuf.testing.oneofs";
-message TestMessage {
- optional int32 a = 1;
- extensions 1000 to max;
+message OneOfsRequest {
+ string value = 1;
+ oneof data {
+ string str_data = 2;
+ int32 int_data = 3;
+ // Simple message
+ Data message_data = 4;
+ // Well known types
+ google.protobuf.Struct struct_data = 5;
+ google.protobuf.Value value_data = 6;
+ google.protobuf.ListValue list_value_data = 7;
+ google.protobuf.Timestamp ts_data = 8;
+ }
+ google.protobuf.Any any_data = 19;
}
-enum TestEnum {
- FOO = 1;
+message Data {
+ int32 data_value = 1;
}
-extend TestMessage {
- optional int32 test_extension = 1000;
+message Response {
+ string value = 1;
}
service TestService {
- rpc Foo(TestMessage) returns(TestMessage);
+ // Test call.
+ rpc Call(OneOfsRequest) returns (Response);
}

Powered by Google App Engine
This is Rietveld 408576698