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

Unified Diff: third_party/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto

Issue 1983203003: Update third_party/protobuf to protobuf-v3.0.0-beta-3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: owners Created 4 years, 7 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/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
diff --git a/third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
similarity index 92%
rename from third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
rename to third_party/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
index 86837250580af4232889dafbd4870936098d4556..6eef42c578c96f209b1b002ce023c0ac11857c78 100644
--- a/third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
+++ b/third_party/protobuf/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
@@ -34,11 +34,15 @@ syntax = "proto2";
package protobuf_unittest.lite_equals_and_hash;
-// This proto definition is used to test that java_generate_equals_and_hash
-// works correctly with the LITE_RUNTIME.
-option java_generate_equals_and_hash = true;
option optimize_for = LITE_RUNTIME;
+message TestOneofEquals {
+ oneof oneof_field {
+ string name = 1;
+ int32 value = 2;
+ }
+}
+
message Foo {
optional int32 value = 1;
repeated Bar bar = 2;
@@ -70,3 +74,8 @@ extend Foo {
}
}
+message TestRecursiveOneof {
+ oneof Foo {
+ TestRecursiveOneof r = 1;
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698