Index: third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_lite.proto |
diff --git a/third_party/protobuf/src/google/protobuf/unittest_lite.proto b/third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_lite.proto |
similarity index 92% |
copy from third_party/protobuf/src/google/protobuf/unittest_lite.proto |
copy to third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_lite.proto |
index 878ec7c1d208189e7ff66f64d840c58bcf01f6e0..a1764aac8dbdaca6982e8eac11794440aac3a63a 100644 |
--- a/third_party/protobuf/src/google/protobuf/unittest_lite.proto |
+++ b/third_party/protobuf/java/compatibility_tests/v2.5.0/more_protos/src/proto/google/protobuf/unittest_lite.proto |
@@ -1,6 +1,6 @@ |
// Protocol Buffers - Google's data interchange format |
// Copyright 2008 Google Inc. All rights reserved. |
-// https://developers.google.com/protocol-buffers/ |
+// http://code.google.com/p/protobuf/ |
// |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
@@ -32,7 +32,6 @@ |
// |
// This is like unittest.proto but with optimize_for = LITE_RUNTIME. |
-syntax = "proto2"; |
package protobuf_unittest; |
import "google/protobuf/unittest_import_lite.proto"; |
@@ -43,10 +42,8 @@ option java_package = "com.google.protobuf"; |
// Same as TestAllTypes but with the lite runtime. |
message TestAllTypesLite { |
- |
message NestedMessage { |
optional int32 bb = 1; |
- optional int64 cc = 2; |
} |
enum NestedEnum { |
@@ -154,15 +151,6 @@ message TestAllTypesLite { |
optional string default_string_piece = 84 [ctype=STRING_PIECE,default="abc"]; |
optional string default_cord = 85 [ctype=CORD,default="123"]; |
- |
- // For oneof test |
- oneof oneof_field { |
- uint32 oneof_uint32 = 111; |
- NestedMessage oneof_nested_message = 112; |
- string oneof_string = 113; |
- bytes oneof_bytes = 114; |
- NestedMessage oneof_lazy_nested_message = 115 [lazy = true]; |
- } |
} |
message ForeignMessageLite { |
@@ -305,12 +293,6 @@ extend TestAllExtensionsLite { |
optional string default_string_piece_extension_lite = 84 [ctype=STRING_PIECE, |
default="abc"]; |
optional string default_cord_extension_lite = 85 [ctype=CORD, default="123"]; |
- |
- // For oneof test |
- optional uint32 oneof_uint32_extension_lite = 111; |
- optional TestAllTypesLite.NestedMessage oneof_nested_message_extension_lite = 112; |
- optional string oneof_string_extension_lite = 113; |
- optional bytes oneof_bytes_extension_lite = 114; |
} |
message TestPackedExtensionsLite { |
@@ -376,32 +358,3 @@ message TestParsingMergeLite { |
repeated TestAllTypesLite repeated_ext = 1001; |
} |
} |
- |
-// TestEmptyMessageLite is used to test unknown fields support in lite mode. |
-message TestEmptyMessageLite{ |
-} |
- |
-// Like above, but declare all field numbers as potential extensions. No |
-// actual extensions should ever be defined for this type. |
-message TestEmptyMessageWithExtensionsLite { |
- extensions 1 to max; |
-} |
- |
-enum V1EnumLite { |
- V1_FIRST = 1; |
-} |
- |
-enum V2EnumLite { |
- V2_FIRST = 1; |
- V2_SECOND = 2; |
-} |
- |
-message V1MessageLite { |
- required int32 int_field = 1; |
- optional V1EnumLite enum_field = 2 [ default = V1_FIRST ]; |
-} |
- |
-message V2MessageLite { |
- required int32 int_field = 1; |
- optional V2EnumLite enum_field = 2 [ default = V2_FIRST ]; |
-} |