Update test protos copied from C++ protobuf (#1079)

Author: osa1

protoc_plugin/test/constructor_args_test.dart

@@ -44,7 +44,7 @@ void main() {
         optionalBool: true,
         optionalString: '115',
         optionalBytes: '116'.codeUnits,
-        optionalGroup: TestAllTypes_OptionalGroup(a: 117),
+        optionalgroup: TestAllTypes_OptionalGroup(a: 117),
         optionalNestedMessage: TestAllTypes_NestedMessage(bb: 118),
         optionalForeignMessage: ForeignMessage(c: 119),
         optionalImportMessage: ImportMessage(d: 120),
@@ -68,7 +68,7 @@ void main() {
         repeatedBool: [true, false],
         repeatedString: ['215', '315'],
         repeatedBytes: ['216'.codeUnits, '316'.codeUnits],
-        repeatedGroup: [
+        repeatedgroup: [
           TestAllTypes_RepeatedGroup(a: 217),
           TestAllTypes_RepeatedGroup(a: 317),
         ],

protoc_plugin/test/descriptor_test.dart

@@ -24,6 +24,8 @@ void main() {
       'FOREIGN_FOO',
       'FOREIGN_BAR',
       'FOREIGN_BAZ',
+      'FOREIGN_BAX',
+      'FOREIGN_LARGE',
     ]);
   });
   test('Can decode service descriptor', () {

protoc_plugin/test/extension_test.dart

@@ -118,27 +118,18 @@ void main() {
   });
 
   test('can merge extension', () {
-    final nestedMessage = TestAllTypes_NestedMessage()..i = 42;
     final mergeSource =
-        TestAllExtensions()..setExtension(
-          Unittest.optionalNestedMessageExtension,
-          nestedMessage,
-        );
+        TestAllExtensions()..addExtension(Unittest.repeatedInt32Extension, 123);
 
-    final nestedMessage2 = TestAllTypes_NestedMessage()..bb = 43;
     final mergeDest =
-        TestAllExtensions()..setExtension(
-          Unittest.optionalNestedMessageExtension,
-          nestedMessage2,
-        );
+        TestAllExtensions()..addExtension(Unittest.repeatedInt32Extension, 456);
 
     final result =
         TestAllExtensions()
           ..mergeFromMessage(mergeSource)
           ..mergeFromMessage(mergeDest);
 
-    expect(result.getExtension(Unittest.optionalNestedMessageExtension).i, 42);
-    expect(result.getExtension(Unittest.optionalNestedMessageExtension).bb, 43);
+    expect(result.getExtension(Unittest.repeatedInt32Extension), [123, 456]);
   });
 
   test("throws if field number isn't allowed for extension", () {
@@ -148,7 +139,7 @@ void main() {
         message.setExtension(Unittest.optionalInt32Extension, 0);
       },
       throwsArgError(
-        'Extension optionalInt32Extension not legal for message protobuf_unittest.TestAllTypes',
+        'Extension optionalInt32Extension not legal for message proto2_unittest.TestAllTypes',
       ),
     );
 
@@ -157,7 +148,7 @@ void main() {
         message.getExtension(Unittest.optionalInt32Extension);
       },
       throwsArgError(
-        'Extension optionalInt32Extension not legal for message protobuf_unittest.TestAllTypes',
+        'Extension optionalInt32Extension not legal for message proto2_unittest.TestAllTypes',
       ),
     );
   });
@@ -169,7 +160,7 @@ void main() {
         message.setExtension(Unittest.optionalInt32Extension, 'hello');
       },
       throwsArgError(
-        'Illegal to set field optionalInt32Extension (1) of protobuf_unittest.TestAllExtensions'
+        'Illegal to set field optionalInt32Extension (1) of proto2_unittest.TestAllExtensions'
         ' to value (hello): not type int',
       ),
     );
@@ -182,7 +173,7 @@ void main() {
         message.setExtension(Unittest.optionalInt64Extension, 123);
       },
       throwsArgError(
-        'Illegal to set field optionalInt64Extension (2) of protobuf_unittest.TestAllExtensions'
+        'Illegal to set field optionalInt64Extension (2) of proto2_unittest.TestAllExtensions'
         ' to value (123): not Int64',
       ),
     );
@@ -198,7 +189,7 @@ void main() {
       },
       throwsArgError(
         'Illegal to set field optionalNestedMessageExtension (18)'
-        ' of protobuf_unittest.TestAllExtensions to value (123): not a GeneratedMessage',
+        ' of proto2_unittest.TestAllExtensions to value (123): not a GeneratedMessage',
       ),
     );
 
@@ -221,7 +212,7 @@ void main() {
       },
       throwsArgError(
         'Illegal to set field optionalNestedEnumExtension (21)'
-        ' of protobuf_unittest.TestAllExtensions to value (123): not type ProtobufEnum',
+        ' of proto2_unittest.TestAllExtensions to value (123): not type ProtobufEnum',
       ),
     );
 
@@ -272,7 +263,7 @@ void main() {
           ..addExtension(Unittest.repeatedStringExtension, 'world')
           ..setExtension(
             Unittest.optionalNestedMessageExtension,
-            TestAllTypes_NestedMessage()..i = 42,
+            TestAllTypes_NestedMessage()..bb = 42,
           )
           ..setExtension(
             Unittest.optionalNestedEnumExtension,
@@ -282,7 +273,7 @@ void main() {
     final expected =
         '[optionalInt32Extension]: 1\n'
         '[optionalNestedMessageExtension]: {\n'
-        '  i: 42\n'
+        '  bb: 42\n'
         '}\n'
         '[optionalNestedEnumExtension]: BAR\n'
         '[repeatedStringExtension]: hello\n'
@@ -438,8 +429,8 @@ void main() {
   test('ExtensionRegistry.reparseMessage will throw on malformed buffers', () {
     final r = ExtensionRegistry();
     Unittest.registerAllExtensions(r);
-    final r2 = ExtensionRegistry();
 
+    final r2 = ExtensionRegistry();
     Extend_unittest.registerAllExtensions(r2);
 
     // The message encoded in this buffer has an encoding error in the
@@ -709,7 +700,7 @@ void main() {
     },
   );
 
-  test('consistent hashcode for reparsed messages with extensions', () {
+  test('consistent hashCode for reparsed messages with extensions', () {
     final r = ExtensionRegistry()..add(Extend_unittest.outer);
     final m =
         TestAllExtensions()..setExtension(

protoc_plugin/test/generated_message_test.dart

@@ -315,6 +315,7 @@ void main() {
       TestAllTypes_NestedEnum.FOO,
       TestAllTypes_NestedEnum.BAR,
       TestAllTypes_NestedEnum.BAZ,
+      TestAllTypes_NestedEnum.NEG,
     ]);
     expect(TestAllTypes_NestedEnum.FOO.value, 1);
     expect(TestAllTypes_NestedEnum.BAR.value, 2);
@@ -897,9 +898,8 @@ void testCopy(TestAllTypes value1, TestAllTypes value2) {
   //   fields are immutable and can be shared.
   // value2.optionalBytes.add(123);
 
-  value2.optionalGroup.a += 1;
+  value2.optionalgroup.a += 1;
   value2.optionalNestedMessage.bb += 1;
-  value2.optionalNestedMessage.i += 1;
   value2.optionalImportMessage.d += 1;
   value2.optionalNestedEnum = TestAllTypes_NestedEnum.BAR;
   value2.optionalForeignEnum = ForeignEnum.FOREIGN_BAR;
@@ -967,7 +967,7 @@ void testCopyExtensions(TestAllExtensions value1, TestAllExtensions value2) {
   // Same as `testCopy`, don't test `bytes` fields.
   // value2.getExtension(Unittest.optionalBytesExtension).add(987);
 
-  value2.getExtension(Unittest.optionalGroupExtension).a += 1;
+  value2.getExtension(Unittest.optionalgroupExtension).a += 1;
   value2.getExtension(Unittest.optionalNestedMessageExtension).bb += 1;
   value2.getExtension(Unittest.optionalForeignMessageExtension).c += 1;
   value2.getExtension(Unittest.optionalImportMessageExtension).d += 1;
@@ -1002,7 +1002,7 @@ void testCopyExtensions(TestAllExtensions value1, TestAllExtensions value2) {
   value2.getExtension(Unittest.repeatedStringExtension).add("hi 4");
   value2.getExtension(Unittest.repeatedBytesExtension).add(<int>[1, 2, 3]);
   value2
-      .getExtension(Unittest.repeatedGroupExtension)
+      .getExtension(Unittest.repeatedgroupExtension)
       .add(RepeatedGroup_extension());
   value2
       .getExtension(Unittest.repeatedNestedMessageExtension)

protoc_plugin/test/message_test.dart

@@ -27,7 +27,7 @@ void main() {
           ..optionalInt32 = 1
           ..optionalString = 'foo'
           ..optionalForeignMessage = ForeignMessage()
-          ..optionalNestedMessage = (TestAllTypes_NestedMessage()..i = 42)
+          ..optionalNestedMessage = (TestAllTypes_NestedMessage()..bb = 42)
           ..repeatedString.add('bar');
 
     final mergeDest =
@@ -45,7 +45,6 @@ optionalInt64: 2
 optionalString: baz
 optionalNestedMessage: {
   bb: 43
-  i: 42
 }
 optionalForeignMessage: {
   c: 3

protoc_plugin/test/omit_message_names_test.dart

@@ -15,7 +15,7 @@ Future<void> main() async {
       TestAllTypes_NestedMessage().info_.qualifiedMessageName,
       const bool.fromEnvironment('protobuf.omit_message_names')
           ? ''
-          : 'protobuf_unittest.TestAllTypes.NestedMessage',
+          : 'proto2_unittest.TestAllTypes.NestedMessage',
     );
     expect(constant(), 'SHOULD_BE_PRESENT');
   });

protoc_plugin/test/proto3_json_test.dart

@@ -313,7 +313,7 @@ void main() {
           TestAllTypes()..optionalFixed64 = Int64(100),
         ).toProto3Json(typeRegistry: TypeRegistry([TestAllTypes()])),
         {
-          '@type': 'type.googleapis.com/protobuf_unittest.TestAllTypes',
+          '@type': 'type.googleapis.com/proto2_unittest.TestAllTypes',
           'optionalFixed64': '100',
         },
       );
@@ -920,16 +920,15 @@ void main() {
       expect(
         () =>
             Any()..mergeFromProto3Json({
-              '@type':
-                  'type.googleapis.com/protobuf_unittest.SparseEnumMessage',
+              '@type': 'type.googleapis.com/proto2_unittest.SparseEnumMessage',
               'sparseEnum': 'SPARSEB',
             }, typeRegistry: TypeRegistry([SparseEnumMessage()])),
         parseFailure(['sparseEnum']),
       );
       expect(
         Any()..mergeFromProto3Json(
           {
-            '@type': 'type.googleapis.com/protobuf_unittest.SparseEnumMessage',
+            '@type': 'type.googleapis.com/proto2_unittest.SparseEnumMessage',
             'sparseEnum': 'SPARSEB',
           },
           typeRegistry: TypeRegistry([SparseEnumMessage()]),
@@ -1106,7 +1105,7 @@ void main() {
     test('Any', () {
       final m1 =
           Any()..mergeFromProto3Json({
-            '@type': 'type.googleapis.com/protobuf_unittest.TestAllTypes',
+            '@type': 'type.googleapis.com/proto2_unittest.TestAllTypes',
             'optionalFixed64': '100',
           }, typeRegistry: TypeRegistry([TestAllTypes()]));
 

protoc_plugin/test/protos/extend_unittest.proto

@@ -39,7 +39,7 @@ extend InnerMost {
   optional string inner_most_extension_string = 2;
 }
 
-extend protobuf_unittest.TestAllExtensions {
+extend proto2_unittest.TestAllExtensions {
   optional Outer outer = 104;
 }