Index: third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto |
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_lite.proto b/third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto |
similarity index 68% |
copy from third_party/protobuf/src/google/protobuf/unittest_import_lite.proto |
copy to third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto |
index 81b117fe8489ecc4cba5410dbf876b4ca473657b..86837250580af4232889dafbd4870936098d4556 100644 |
--- a/third_party/protobuf/src/google/protobuf/unittest_import_lite.proto |
+++ b/third_party/protobuf/java/src/test/java/com/google/protobuf/lite_equals_and_hash.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,24 +28,45 @@ |
// (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) |
-// |
-// This is like unittest_import.proto but with optimize_for = LITE_RUNTIME. |
+// Author: pbogle@google.com (Phil Bogle) |
+ |
+syntax = "proto2"; |
-package protobuf_unittest_import; |
+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; |
-option java_package = "com.google.protobuf"; |
+message Foo { |
+ optional int32 value = 1; |
+ repeated Bar bar = 2; |
-import public "google/protobuf/unittest_import_public_lite.proto"; |
+ extensions 100 to max; |
+} |
-message ImportMessageLite { |
- optional int32 d = 1; |
+message Bar { |
+ extend Foo { |
+ optional Bar foo_ext = 100; |
+ } |
+ |
+ optional string name = 1; |
} |
-enum ImportEnumLite { |
- IMPORT_LITE_FOO = 7; |
- IMPORT_LITE_BAR = 8; |
- IMPORT_LITE_BAZ = 9; |
+message BarPrime { |
+ optional string name = 1; |
} |
+ |
+message Empty { |
+} |
+ |
+extend Foo { |
+ optional int32 varint = 101; |
+ optional fixed32 fixed32 = 102; |
+ optional fixed64 fixed64 = 103; |
+ optional group MyGroup = 104 { |
+ optional string group_value = 1; |
+ } |
+} |
+ |