Merge tag 'refs/tags/sync-piper' into sync-stage

bithium · Jan 22, 2021 · 3cf9859 · 3cf9859
2 parents 1965489 + f169ab8
commit 3cf9859
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/google/protobuf/util/internal/testdata/anys.proto b/google/protobuf/util/internal/testdata/anys.proto
@@ -34,6 +34,7 @@ package proto_util_converter.testing;
 
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/struct.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";
@@ -59,6 +60,8 @@ message AnyTestCases {
   AnyWrapper recursive_any_with_type_field_at_end = 15;
   AnyWrapper repeated_any = 16;
   AnyWrapper empty_any_with_null_type_url = 17;
+  AnyWrapper any_with_empty = 18;
+  AnyWrapper any_with_default_timestamp = 19;
 
   google.protobuf.Any top_level_any = 50;
   google.protobuf.Any top_level_any_with_type_field_at_end = 51;
@@ -79,6 +82,7 @@ message Imports {
   google.protobuf.Timestamp timestamp = 3;
   google.protobuf.Duration duration = 4;
   google.protobuf.Int32Value i32 = 5;
+  google.protobuf.Empty empty = 6;
   Data data = 100;
 }
 

diff --git a/google/protobuf/util/message_differencer_unittest.proto b/google/protobuf/util/message_differencer_unittest.proto
@@ -33,6 +33,7 @@
 //  Sanjay Ghemawat, Jeff Dean, and others.
 //
 // This file contains messages for testing repeated field comparison
+// LINT: ALLOW_GROUPS
 
 syntax = "proto2";
 
@@ -63,6 +64,7 @@ message TestDiffMessage {
     optional TestField m = 6;   // Test TreatAsMap when key is a message
     repeated TestField rm = 7;  // Test TreatAsMap when key is a repeated
                                 // message
+    map<string, int32> mp = 8;  // Test for map comparisons
   }
 
   optional int32 v = 13 [deprecated = true];
@@ -73,6 +75,5 @@ message TestDiffMessage {
   repeated TestField rm = 12 [deprecated = true];  // Test for combinations
   repeated google.protobuf.Any rany =
       16;  // Test for repeated Any type resolution
-
   extensions 100 to 199;
 }