Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java

Index: third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
diff --git a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
index cfe4c4536ea9525ee7e9b7c980b8217c57027ca3..73154c0fcb333c22378f981db1f0f78537a7cd97 100644
--- a/third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
+++ b/third_party/protobuf/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
@@ -31,99 +31,52 @@
 package com.google.protobuf;
 
 import com.google.protobuf.Descriptors.FieldDescriptor;
-import map_test.MapForProto2TestProto.BizarroTestMap;
-import map_test.MapForProto2TestProto.ReservedAsMapField;
-import map_test.MapForProto2TestProto.ReservedAsMapFieldWithEnumValue;
 import map_test.MapForProto2TestProto.TestMap;
 import map_test.MapForProto2TestProto.TestMap.MessageValue;
 import map_test.MapForProto2TestProto.TestMap.MessageWithRequiredFields;
-import map_test.MapForProto2TestProto.TestMapOrBuilder;
 import map_test.MapForProto2TestProto.TestRecursiveMap;
 import map_test.MapForProto2TestProto.TestUnknownEnumValue;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import junit.framework.TestCase;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import junit.framework.TestCase;
 
 /**
  * Unit tests for map fields in proto2 protos.
  */
 public class MapForProto2Test extends TestCase {
-
-  private void setMapValuesUsingMutableMap(TestMap.Builder builder) {
+  private void setMapValues(TestMap.Builder builder) {
     builder.getMutableInt32ToInt32Field().put(1, 11);
     builder.getMutableInt32ToInt32Field().put(2, 22);
     builder.getMutableInt32ToInt32Field().put(3, 33);
-  //
+
     builder.getMutableInt32ToStringField().put(1, "11");
     builder.getMutableInt32ToStringField().put(2, "22");
     builder.getMutableInt32ToStringField().put(3, "33");
-  //
+    
     builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("11"));
     builder.getMutableInt32ToBytesField().put(2, TestUtil.toBytes("22"));
     builder.getMutableInt32ToBytesField().put(3, TestUtil.toBytes("33"));
-  //
+    
     builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.FOO);
     builder.getMutableInt32ToEnumField().put(2, TestMap.EnumValue.BAR);
     builder.getMutableInt32ToEnumField().put(3, TestMap.EnumValue.BAZ);
-  //
+    
     builder.getMutableInt32ToMessageField().put(
         1, MessageValue.newBuilder().setValue(11).build());
     builder.getMutableInt32ToMessageField().put(
         2, MessageValue.newBuilder().setValue(22).build());
     builder.getMutableInt32ToMessageField().put(
         3, MessageValue.newBuilder().setValue(33).build());
-  //
+    
     builder.getMutableStringToInt32Field().put("1", 11);
     builder.getMutableStringToInt32Field().put("2", 22);
     builder.getMutableStringToInt32Field().put("3", 33);
   }
 
-  private void setMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 11)
-        .putInt32ToInt32Field(2, 22)
-        .putInt32ToInt32Field(3, 33)
-
-        .putInt32ToStringField(1, "11")
-        .putInt32ToStringField(2, "22")
-        .putInt32ToStringField(3, "33")
-
-        .putInt32ToBytesField(1, TestUtil.toBytes("11"))
-        .putInt32ToBytesField(2, TestUtil.toBytes("22"))
-        .putInt32ToBytesField(3, TestUtil.toBytes("33"))
-
-        .putInt32ToEnumField(1, TestMap.EnumValue.FOO)
-        .putInt32ToEnumField(2, TestMap.EnumValue.BAR)
-        .putInt32ToEnumField(3, TestMap.EnumValue.BAZ)
-
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(11).build())
-        .putInt32ToMessageField(2, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(3, MessageValue.newBuilder().setValue(33).build())
-
-        .putStringToInt32Field("1", 11)
-        .putStringToInt32Field("2", 22)
-        .putStringToInt32Field("3", 33);
-  }
-
-  public void testSetMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertEquals(usingAccessors, usingMutableMap);
-  }
-
   private void copyMapValues(TestMap source, TestMap.Builder destination) {
     destination
         .putAllInt32ToInt32Field(source.getInt32ToInt32Field())
@@ -134,7 +87,7 @@ public class MapForProto2Test extends TestCase {
         .putAllStringToInt32Field(source.getStringToInt32Field());
   }
 
-  private void assertMapValuesSet(TestMapOrBuilder message) {
+  private void assertMapValuesSet(TestMap message) {
     assertEquals(3, message.getInt32ToInt32Field().size());
     assertEquals(11, message.getInt32ToInt32Field().get(1).intValue());
     assertEquals(22, message.getInt32ToInt32Field().get(2).intValue());
@@ -144,109 +97,56 @@ public class MapForProto2Test extends TestCase {
     assertEquals("11", message.getInt32ToStringField().get(1));
     assertEquals("22", message.getInt32ToStringField().get(2));
     assertEquals("33", message.getInt32ToStringField().get(3));
-
+    
     assertEquals(3, message.getInt32ToBytesField().size());
     assertEquals(TestUtil.toBytes("11"), message.getInt32ToBytesField().get(1));
     assertEquals(TestUtil.toBytes("22"), message.getInt32ToBytesField().get(2));
     assertEquals(TestUtil.toBytes("33"), message.getInt32ToBytesField().get(3));
-
+    
     assertEquals(3, message.getInt32ToEnumField().size());
     assertEquals(TestMap.EnumValue.FOO, message.getInt32ToEnumField().get(1));
     assertEquals(TestMap.EnumValue.BAR, message.getInt32ToEnumField().get(2));
     assertEquals(TestMap.EnumValue.BAZ, message.getInt32ToEnumField().get(3));
-
+    
     assertEquals(3, message.getInt32ToMessageField().size());
     assertEquals(11, message.getInt32ToMessageField().get(1).getValue());
     assertEquals(22, message.getInt32ToMessageField().get(2).getValue());
     assertEquals(33, message.getInt32ToMessageField().get(3).getValue());
-
+    
     assertEquals(3, message.getStringToInt32Field().size());
     assertEquals(11, message.getStringToInt32Field().get("1").intValue());
     assertEquals(22, message.getStringToInt32Field().get("2").intValue());
     assertEquals(33, message.getStringToInt32Field().get("3").intValue());
   }
 
-  private void updateMapValuesUsingMutableMap(TestMap.Builder builder) {
+  private void updateMapValues(TestMap.Builder builder) {
     builder.getMutableInt32ToInt32Field().put(1, 111);
     builder.getMutableInt32ToInt32Field().remove(2);
     builder.getMutableInt32ToInt32Field().put(4, 44);
-  //
+
     builder.getMutableInt32ToStringField().put(1, "111");
     builder.getMutableInt32ToStringField().remove(2);
     builder.getMutableInt32ToStringField().put(4, "44");
-  //
+    
     builder.getMutableInt32ToBytesField().put(1, TestUtil.toBytes("111"));
     builder.getMutableInt32ToBytesField().remove(2);
     builder.getMutableInt32ToBytesField().put(4, TestUtil.toBytes("44"));
-  //
+    
     builder.getMutableInt32ToEnumField().put(1, TestMap.EnumValue.BAR);
     builder.getMutableInt32ToEnumField().remove(2);
     builder.getMutableInt32ToEnumField().put(4, TestMap.EnumValue.QUX);
-  //
+    
     builder.getMutableInt32ToMessageField().put(
         1, MessageValue.newBuilder().setValue(111).build());
     builder.getMutableInt32ToMessageField().remove(2);
     builder.getMutableInt32ToMessageField().put(
         4, MessageValue.newBuilder().setValue(44).build());
-  //
+    
     builder.getMutableStringToInt32Field().put("1", 111);
     builder.getMutableStringToInt32Field().remove("2");
     builder.getMutableStringToInt32Field().put("4", 44);
   }
 
-  private void updateMapValuesUsingAccessors(TestMap.Builder builder) {
-    builder
-        .putInt32ToInt32Field(1, 111)
-        .removeInt32ToInt32Field(2)
-        .putInt32ToInt32Field(4, 44)
-
-        .putInt32ToStringField(1, "111")
-        .removeInt32ToStringField(2)
-        .putInt32ToStringField(4, "44")
-
-        .putInt32ToBytesField(1, TestUtil.toBytes("111"))
-        .removeInt32ToBytesField(2)
-        .putInt32ToBytesField(4, TestUtil.toBytes("44"))
-
-        .putInt32ToEnumField(1, TestMap.EnumValue.BAR)
-        .removeInt32ToEnumField(2)
-        .putInt32ToEnumField(4, TestMap.EnumValue.QUX)
-
-        .putInt32ToMessageField(1, MessageValue.newBuilder().setValue(111).build())
-        .removeInt32ToMessageField(2)
-        .putInt32ToMessageField(4, MessageValue.newBuilder().setValue(44).build())
-
-        .putStringToInt32Field("1", 111)
-        .removeStringToInt32Field("2")
-        .putStringToInt32Field("4", 44);
-  }
-
-  public void testUpdateMapValues() {
-    TestMap.Builder usingMutableMapBuilder = TestMap.newBuilder();
-    setMapValuesUsingMutableMap(usingMutableMapBuilder);
-    TestMap usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesSet(usingMutableMap);
-
-    TestMap.Builder usingAccessorsBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(usingAccessorsBuilder);
-    TestMap usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesSet(usingAccessors);
-
-    assertEquals(usingAccessors, usingMutableMap);
-    //
-    usingMutableMapBuilder = usingMutableMap.toBuilder();
-    updateMapValuesUsingMutableMap(usingMutableMapBuilder);
-    usingMutableMap = usingMutableMapBuilder.build();
-    assertMapValuesUpdated(usingMutableMap);
-
-    usingAccessorsBuilder = usingAccessors.toBuilder();
-    updateMapValuesUsingAccessors(usingAccessorsBuilder);
-    usingAccessors = usingAccessorsBuilder.build();
-    assertMapValuesUpdated(usingAccessors);
-
-    assertEquals(usingAccessors, usingMutableMap);
-  }
-
   private void assertMapValuesUpdated(TestMap message) {
     assertEquals(3, message.getInt32ToInt32Field().size());
     assertEquals(111, message.getInt32ToInt32Field().get(1).intValue());
@@ -257,72 +157,37 @@ public class MapForProto2Test extends TestCase {
     assertEquals("111", message.getInt32ToStringField().get(1));
     assertEquals("33", message.getInt32ToStringField().get(3));
     assertEquals("44", message.getInt32ToStringField().get(4));
-
+    
     assertEquals(3, message.getInt32ToBytesField().size());
     assertEquals(TestUtil.toBytes("111"), message.getInt32ToBytesField().get(1));
     assertEquals(TestUtil.toBytes("33"), message.getInt32ToBytesField().get(3));
     assertEquals(TestUtil.toBytes("44"), message.getInt32ToBytesField().get(4));
-
+    
     assertEquals(3, message.getInt32ToEnumField().size());
     assertEquals(TestMap.EnumValue.BAR, message.getInt32ToEnumField().get(1));
     assertEquals(TestMap.EnumValue.BAZ, message.getInt32ToEnumField().get(3));
     assertEquals(TestMap.EnumValue.QUX, message.getInt32ToEnumField().get(4));
-
+    
     assertEquals(3, message.getInt32ToMessageField().size());
     assertEquals(111, message.getInt32ToMessageField().get(1).getValue());
     assertEquals(33, message.getInt32ToMessageField().get(3).getValue());
     assertEquals(44, message.getInt32ToMessageField().get(4).getValue());
-
+    
     assertEquals(3, message.getStringToInt32Field().size());
     assertEquals(111, message.getStringToInt32Field().get("1").intValue());
     assertEquals(33, message.getStringToInt32Field().get("3").intValue());
     assertEquals(44, message.getStringToInt32Field().get("4").intValue());
   }
 
-  private void assertMapValuesCleared(TestMapOrBuilder testMapOrBuilder) {
-    assertEquals(0, testMapOrBuilder.getInt32ToInt32Field().size());
-    assertEquals(0, testMapOrBuilder.getInt32ToInt32FieldCount());
-    assertEquals(0, testMapOrBuilder.getInt32ToStringField().size());
-    assertEquals(0, testMapOrBuilder.getInt32ToStringFieldCount());
-    assertEquals(0, testMapOrBuilder.getInt32ToBytesField().size());
-    assertEquals(0, testMapOrBuilder.getInt32ToBytesFieldCount());
-    assertEquals(0, testMapOrBuilder.getInt32ToEnumField().size());
-    assertEquals(0, testMapOrBuilder.getInt32ToEnumFieldCount());
-    assertEquals(0, testMapOrBuilder.getInt32ToMessageField().size());
-    assertEquals(0, testMapOrBuilder.getInt32ToMessageFieldCount());
-    assertEquals(0, testMapOrBuilder.getStringToInt32Field().size());
-    assertEquals(0, testMapOrBuilder.getStringToInt32FieldCount());
-  }
-
-  public void testGetMapIsImmutable() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-
-    setMapValuesUsingAccessors(builder);
-    assertMapsAreImmutable(builder);
-    assertMapsAreImmutable(builder.build());
-  }
-
-  private void assertMapsAreImmutable(TestMapOrBuilder testMapOrBuilder) {
-    assertImmutable(testMapOrBuilder.getInt32ToInt32Field(), 1, 2);
-    assertImmutable(testMapOrBuilder.getInt32ToStringField(), 1, "2");
-    assertImmutable(testMapOrBuilder.getInt32ToBytesField(), 1, TestUtil.toBytes("2"));
-    assertImmutable(testMapOrBuilder.getInt32ToEnumField(), 1, TestMap.EnumValue.FOO);
-    assertImmutable(
-        testMapOrBuilder.getInt32ToMessageField(), 1, MessageValue.getDefaultInstance());
-    assertImmutable(testMapOrBuilder.getStringToInt32Field(), "1", 2);
-  }
-
-  private <K, V> void assertImmutable(Map<K, V> map, K key, V value) {
-    try {
-      map.put(key, value);
-      fail();
-    } catch (UnsupportedOperationException e) {
-      // expected
-    }
+  private void assertMapValuesCleared(TestMap message) {
+    assertEquals(0, message.getInt32ToInt32Field().size());
+    assertEquals(0, message.getInt32ToStringField().size());
+    assertEquals(0, message.getInt32ToBytesField().size());
+    assertEquals(0, message.getInt32ToEnumField().size());
+    assertEquals(0, message.getInt32ToMessageField().size());
+    assertEquals(0, message.getStringToInt32Field().size());
   }
-
+  
   public void testMutableMapLifecycle() {
     TestMap.Builder builder = TestMap.newBuilder();
     Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
@@ -337,7 +202,7 @@ public class MapForProto2Test extends TestCase {
     assertEquals(newMap(1, 2), builder.getInt32ToInt32Field());
     builder.getMutableInt32ToInt32Field().put(2, 3);
     assertEquals(newMap(1, 2, 2, 3), builder.getInt32ToInt32Field());
- //
+
     Map<Integer, TestMap.EnumValue> enumMap = builder.getMutableInt32ToEnumField();
     enumMap.put(1, TestMap.EnumValue.BAR);
     assertEquals(newMap(1, TestMap.EnumValue.BAR), builder.build().getInt32ToEnumField());
@@ -352,7 +217,7 @@ public class MapForProto2Test extends TestCase {
     assertEquals(
         newMap(1, TestMap.EnumValue.BAR, 2, TestMap.EnumValue.FOO),
         builder.getInt32ToEnumField());
-  //
+    
     Map<Integer, String> stringMap = builder.getMutableInt32ToStringField();
     stringMap.put(1, "1");
     assertEquals(newMap(1, "1"), builder.build().getInt32ToStringField());
@@ -367,7 +232,7 @@ public class MapForProto2Test extends TestCase {
     assertEquals(
         newMap(1, "1", 2, "2"),
         builder.getInt32ToStringField());
-  //
+    
     Map<Integer, TestMap.MessageValue> messageMap = builder.getMutableInt32ToMessageField();
     messageMap.put(1, TestMap.MessageValue.getDefaultInstance());
     assertEquals(newMap(1, TestMap.MessageValue.getDefaultInstance()),
@@ -386,7 +251,7 @@ public class MapForProto2Test extends TestCase {
             2, TestMap.MessageValue.getDefaultInstance()),
         builder.getInt32ToMessageField());
   }
-  //
+
   public void testMutableMapLifecycle_collections() {
     TestMap.Builder builder = TestMap.newBuilder();
     Map<Integer, Integer> intMap = builder.getMutableInt32ToInt32Field();
@@ -433,96 +298,52 @@ public class MapForProto2Test extends TestCase {
     assertEquals(newMap(1, 2), builder.build().getInt32ToInt32Field());
   }
 
-
   public void testGettersAndSetters() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
     TestMap message = builder.build();
     assertMapValuesCleared(message);
-
+    
     builder = message.toBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     message = builder.build();
     assertMapValuesSet(message);
-
+    
     builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
+    updateMapValues(builder);
     message = builder.build();
     assertMapValuesUpdated(message);
-
+    
     builder = message.toBuilder();
     builder.clear();
-    assertMapValuesCleared(builder);
     message = builder.build();
     assertMapValuesCleared(message);
   }
 
   public void testPutAll() throws Exception {
     TestMap.Builder sourceBuilder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(sourceBuilder);
+    setMapValues(sourceBuilder);
     TestMap source = sourceBuilder.build();
-    assertMapValuesSet(source);
 
     TestMap.Builder destination = TestMap.newBuilder();
     copyMapValues(source, destination);
     assertMapValuesSet(destination.build());
-
-    assertEquals(3, destination.getInt32ToEnumFieldCount());
-  }
-
-  public void testPutChecksNullKeysAndValues() throws Exception {
-    TestMap.Builder builder = TestMap.newBuilder();
-
-    try {
-      builder.putInt32ToStringField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToBytesField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToEnumField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putInt32ToMessageField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
-
-    try {
-      builder.putStringToInt32Field(null, 1);
-      fail();
-    } catch (NullPointerException e) {
-      // expected.
-    }
   }
 
   public void testSerializeAndParse() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     TestMap message = builder.build();
     assertEquals(message.getSerializedSize(), message.toByteString().size());
     message = TestMap.parser().parseFrom(message.toByteString());
     assertMapValuesSet(message);
-
+    
     builder = message.toBuilder();
-    updateMapValuesUsingAccessors(builder);
+    updateMapValues(builder);
     message = builder.build();
     assertEquals(message.getSerializedSize(), message.toByteString().size());
     message = TestMap.parser().parseFrom(message.toByteString());
     assertMapValuesUpdated(message);
-
+    
     builder = message.toBuilder();
     builder.clear();
     message = builder.build();
@@ -530,61 +351,12 @@ public class MapForProto2Test extends TestCase {
     message = TestMap.parser().parseFrom(message.toByteString());
     assertMapValuesCleared(message);
   }
-
-  private TestMap tryParseTestMap(BizarroTestMap bizarroMap) throws IOException {
-    ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-    CodedOutputStream output = CodedOutputStream.newInstance(byteArrayOutputStream);
-    bizarroMap.writeTo(output);
-    output.flush();
-    return TestMap.parser().parseFrom(ByteString.copyFrom(byteArrayOutputStream.toByteArray()));
-  }
-
-  public void testParseError() throws Exception {
-    ByteString bytes = TestUtil.toBytes("SOME BYTES");
-    String stringKey = "a string key";
-
-    TestMap map = tryParseTestMap(BizarroTestMap.newBuilder()
-        .putInt32ToInt32Field(5, bytes)
-        .build());
-    assertEquals(map.getInt32ToInt32FieldOrDefault(5, -1), 0);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder()
-        .putInt32ToStringField(stringKey, 5)
-        .build());
-    assertEquals(map.getInt32ToStringFieldOrDefault(0, null), "");
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder()
-        .putInt32ToBytesField(stringKey, 5)
-        .build());
-    assertEquals(map.getInt32ToBytesFieldOrDefault(0, null), ByteString.EMPTY);
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder()
-        .putInt32ToEnumField(stringKey, bytes)
-        .build());
-    assertEquals(map.getInt32ToEnumFieldOrDefault(0, null), TestMap.EnumValue.FOO);
-
-    try {
-      tryParseTestMap(BizarroTestMap.newBuilder()
-          .putInt32ToMessageField(stringKey, bytes)
-          .build());
-      fail();
-    } catch (InvalidProtocolBufferException expected) {
-      assertTrue(expected.getUnfinishedMessage() instanceof TestMap);
-      map = (TestMap) expected.getUnfinishedMessage();
-      assertTrue(map.getInt32ToMessageField().isEmpty());
-    }
-
-    map = tryParseTestMap(BizarroTestMap.newBuilder()
-        .putStringToInt32Field(stringKey, bytes)
-        .build());
-    assertEquals(map.getStringToInt32FieldOrDefault(stringKey, -1), 0);
-  }
-
+  
   public void testMergeFrom() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     TestMap message = builder.build();
-
+    
     TestMap.Builder other = TestMap.newBuilder();
     other.mergeFrom(message);
     assertMapValuesSet(other.build());
@@ -593,51 +365,51 @@ public class MapForProto2Test extends TestCase {
   public void testEqualsAndHashCode() throws Exception {
     // Test that generated equals() and hashCode() will disregard the order
     // of map entries when comparing/hashing map fields.
-
+    
     // We can't control the order of elements in a HashMap. The best we can do
     // here is to add elements in different order.
     TestMap.Builder b1 = TestMap.newBuilder();
-    b1.putInt32ToInt32Field(1, 2);
-    b1.putInt32ToInt32Field(3, 4);
-    b1.putInt32ToInt32Field(5, 6);
+    b1.getMutableInt32ToInt32Field().put(1, 2);
+    b1.getMutableInt32ToInt32Field().put(3, 4);
+    b1.getMutableInt32ToInt32Field().put(5, 6);
     TestMap m1 = b1.build();
-
+    
     TestMap.Builder b2 = TestMap.newBuilder();
-    b2.putInt32ToInt32Field(5, 6);
-    b2.putInt32ToInt32Field(1, 2);
-    b2.putInt32ToInt32Field(3, 4);
+    b2.getMutableInt32ToInt32Field().put(5, 6);
+    b2.getMutableInt32ToInt32Field().put(1, 2);
+    b2.getMutableInt32ToInt32Field().put(3, 4);
     TestMap m2 = b2.build();
-
+    
     assertEquals(m1, m2);
     assertEquals(m1.hashCode(), m2.hashCode());
-
+    
     // Make sure we did compare map fields.
-    b2.putInt32ToInt32Field(1, 0);
+    b2.getMutableInt32ToInt32Field().put(1, 0);
     m2 = b2.build();
     assertFalse(m1.equals(m2));
     // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
     // to be different.
   }
-
-
+  
+  
   // The following methods are used to test reflection API.
-
+  
   private static FieldDescriptor f(String name) {
     return TestMap.getDescriptor().findFieldByName(name);
   }
-
+  
   private static Object getFieldValue(Message mapEntry, String name) {
     FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
     return mapEntry.getField(field);
   }
-
+  
   private static Message.Builder setFieldValue(
       Message.Builder mapEntry, String name, Object value) {
     FieldDescriptor field = mapEntry.getDescriptorForType().findFieldByName(name);
     mapEntry.setField(field, value);
     return mapEntry;
   }
-
+  
   private static void assertHasMapValues(Message message, String name, Map<?, ?> values) {
     FieldDescriptor field = f(name);
     for (Object entry : (List<?>) message.getField(field)) {
@@ -656,7 +428,7 @@ public class MapForProto2Test extends TestCase {
       assertEquals(value, values.get(key));
     }
   }
-
+  
   private static <KeyType, ValueType>
   Message newMapEntry(Message.Builder builder, String name, KeyType key, ValueType value) {
     FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
@@ -667,7 +439,7 @@ public class MapForProto2Test extends TestCase {
     entryBuilder.setField(valueField, value);
     return entryBuilder.build();
   }
-
+  
   private static void setMapValues(Message.Builder builder, String name, Map<?, ?> values) {
     List<Message> entryList = new ArrayList<Message>();
     for (Map.Entry<?, ?> entry : values.entrySet()) {
@@ -676,8 +448,9 @@ public class MapForProto2Test extends TestCase {
     FieldDescriptor field = builder.getDescriptorForType().findFieldByName(name);
     builder.setField(field, entryList);
   }
-
-  private static <KeyType, ValueType> Map<KeyType, ValueType> mapForValues(
+  
+  private static <KeyType, ValueType>
+  Map<KeyType, ValueType> mapForValues(
       KeyType key1, ValueType value1, KeyType key2, ValueType value2) {
     Map<KeyType, ValueType> map = new HashMap<KeyType, ValueType>();
     map.put(key1, value1);
@@ -687,11 +460,13 @@ public class MapForProto2Test extends TestCase {
 
   public void testReflectionApi() throws Exception {
     // In reflection API, map fields are just repeated message fields.
-    TestMap.Builder builder = TestMap.newBuilder()
-        .putInt32ToInt32Field(1, 2)
-        .putInt32ToInt32Field(3, 4)
-        .putInt32ToMessageField(11, MessageValue.newBuilder().setValue(22).build())
-        .putInt32ToMessageField(33, MessageValue.newBuilder().setValue(44).build());
+    TestMap.Builder builder = TestMap.newBuilder();
+    builder.getMutableInt32ToInt32Field().put(1, 2);
+    builder.getMutableInt32ToInt32Field().put(3, 4);
+    builder.getMutableInt32ToMessageField().put(
+        11, MessageValue.newBuilder().setValue(22).build());
+    builder.getMutableInt32ToMessageField().put(
+        33, MessageValue.newBuilder().setValue(44).build());
     TestMap message = builder.build();
 
     // Test getField(), getRepeatedFieldCount(), getRepeatedField().
@@ -701,14 +476,14 @@ public class MapForProto2Test extends TestCase {
         mapForValues(
             11, MessageValue.newBuilder().setValue(22).build(),
             33, MessageValue.newBuilder().setValue(44).build()));
-
+    
     // Test clearField()
     builder.clearField(f("int32_to_int32_field"));
     builder.clearField(f("int32_to_message_field"));
     message = builder.build();
     assertEquals(0, message.getInt32ToInt32Field().size());
     assertEquals(0, message.getInt32ToMessageField().size());
-
+    
     // Test setField()
     setMapValues(builder, "int32_to_int32_field",
         mapForValues(11, 22, 33, 44));
@@ -721,7 +496,7 @@ public class MapForProto2Test extends TestCase {
     assertEquals(44, message.getInt32ToInt32Field().get(33).intValue());
     assertEquals(222, message.getInt32ToMessageField().get(111).getValue());
     assertEquals(444, message.getInt32ToMessageField().get(333).getValue());
-
+    
     // Test addRepeatedField
     builder.addRepeatedField(f("int32_to_int32_field"),
         newMapEntry(builder, "int32_to_int32_field", 55, 66));
@@ -741,7 +516,7 @@ public class MapForProto2Test extends TestCase {
     message = builder.build();
     assertEquals(55, message.getInt32ToInt32Field().get(55).intValue());
     assertEquals(555, message.getInt32ToMessageField().get(555).getValue());
-
+    
     // Test setRepeatedField
     for (int i = 0; i < builder.getRepeatedFieldCount(f("int32_to_int32_field")); i++) {
       Message mapEntry = (Message) builder.getRepeatedField(f("int32_to_int32_field"), i);
@@ -758,35 +533,35 @@ public class MapForProto2Test extends TestCase {
     assertEquals(33, message.getInt32ToInt32Field().get(44).intValue());
     assertEquals(55, message.getInt32ToInt32Field().get(55).intValue());
   }
-
+  
   public void testTextFormat() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     TestMap message = builder.build();
-
+    
     String textData = TextFormat.printToString(message);
-
+    
     builder = TestMap.newBuilder();
     TextFormat.merge(textData, builder);
     message = builder.build();
-
+    
     assertMapValuesSet(message);
   }
-
+  
   public void testDynamicMessage() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     TestMap message = builder.build();
-
+    
     Message dynamicDefaultInstance =
         DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
     Message dynamicMessage = dynamicDefaultInstance
         .newBuilderForType().mergeFrom(message.toByteString()).build();
-
+    
     assertEquals(message, dynamicMessage);
     assertEquals(message.hashCode(), dynamicMessage.hashCode());
   }
-
+  
   public void testReflectionEqualsAndHashCode() throws Exception {
     // Test that generated equals() and hashCode() will disregard the order
     // of map entries when comparing/hashing map fields.
@@ -795,22 +570,22 @@ public class MapForProto2Test extends TestCase {
     Message dynamicDefaultInstance =
         DynamicMessage.getDefaultInstance(TestMap.getDescriptor());
     FieldDescriptor field = f("int32_to_int32_field");
-
+    
     Message.Builder b1 = dynamicDefaultInstance.newBuilderForType();
     b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 1, 2));
     b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 3, 4));
     b1.addRepeatedField(field, newMapEntry(b1, "int32_to_int32_field", 5, 6));
     Message m1 = b1.build();
-
+    
     Message.Builder b2 = dynamicDefaultInstance.newBuilderForType();
     b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 5, 6));
     b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 1, 2));
     b2.addRepeatedField(field, newMapEntry(b2, "int32_to_int32_field", 3, 4));
     Message m2 = b2.build();
-
+    
     assertEquals(m1, m2);
     assertEquals(m1.hashCode(), m2.hashCode());
-
+    
     // Make sure we did compare map fields.
     b2.setRepeatedField(field, 0, newMapEntry(b1, "int32_to_int32_field", 0, 0));
     m2 = b2.build();
@@ -818,11 +593,12 @@ public class MapForProto2Test extends TestCase {
     // Don't check m1.hashCode() != m2.hashCode() because it's not guaranteed
     // to be different.
   }
-
+  
   public void testUnknownEnumValues() throws Exception {
-    TestUnknownEnumValue.Builder builder = TestUnknownEnumValue.newBuilder()
-        .putInt32ToInt32Field(1, 1)
-        .putInt32ToInt32Field(2, 54321);
+    TestUnknownEnumValue.Builder builder =
+        TestUnknownEnumValue.newBuilder();
+    builder.getMutableInt32ToInt32Field().put(1, 1);
+    builder.getMutableInt32ToInt32Field().put(2, 54321);
     ByteString data = builder.build().toByteString();
 
     TestMap message = TestMap.parseFrom(data);
@@ -841,21 +617,26 @@ public class MapForProto2Test extends TestCase {
     assertEquals(54321, messageWithUnknownEnums.getInt32ToInt32Field().get(2).intValue());
   }
 
+
   public void testRequiredMessage() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    builder.putRequiredMessageMap(0, MessageWithRequiredFields.newBuilder().buildPartial());
+    builder.getMutableRequiredMessageMap().put(0,
+        MessageWithRequiredFields.newBuilder().buildPartial());
     TestMap message = builder.buildPartial();
     assertFalse(message.isInitialized());
 
-    builder.putRequiredMessageMap(0, MessageWithRequiredFields.newBuilder().setValue(1).build());
+    builder.getMutableRequiredMessageMap().put(0,
+        MessageWithRequiredFields.newBuilder().setValue(1).build());
     message = builder.build();
     assertTrue(message.isInitialized());
   }
 
   public void testRecursiveMap() throws Exception {
     TestRecursiveMap.Builder builder = TestRecursiveMap.newBuilder();
-    builder.putRecursiveMapField(1, TestRecursiveMap.newBuilder().setValue(2).build());
-    builder.putRecursiveMapField(3, TestRecursiveMap.newBuilder().setValue(4).build());
+    builder.getMutableRecursiveMapField().put(
+        1, TestRecursiveMap.newBuilder().setValue(2).build());
+    builder.getMutableRecursiveMapField().put(
+        3, TestRecursiveMap.newBuilder().setValue(4).build());
     ByteString data = builder.build().toByteString();
 
     TestRecursiveMap message = TestRecursiveMap.parseFrom(data);
@@ -865,266 +646,13 @@ public class MapForProto2Test extends TestCase {
 
   public void testIterationOrder() throws Exception {
     TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
+    setMapValues(builder);
     TestMap message = builder.build();
 
     assertEquals(Arrays.asList("1", "2", "3"),
         new ArrayList<String>(message.getStringToInt32Field().keySet()));
   }
 
-  public void testContains() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertMapContainsSetValues(builder);
-    assertMapContainsSetValues(builder.build());
-  }
-
-  private void assertMapContainsSetValues(TestMapOrBuilder testMapOrBuilder) {
-    assertTrue(testMapOrBuilder.containsInt32ToInt32Field(1));
-    assertTrue(testMapOrBuilder.containsInt32ToInt32Field(2));
-    assertTrue(testMapOrBuilder.containsInt32ToInt32Field(3));
-    assertFalse(testMapOrBuilder.containsInt32ToInt32Field(-1));
-
-    assertTrue(testMapOrBuilder.containsInt32ToStringField(1));
-    assertTrue(testMapOrBuilder.containsInt32ToStringField(2));
-    assertTrue(testMapOrBuilder.containsInt32ToStringField(3));
-    assertFalse(testMapOrBuilder.containsInt32ToStringField(-1));
-
-    assertTrue(testMapOrBuilder.containsInt32ToBytesField(1));
-    assertTrue(testMapOrBuilder.containsInt32ToBytesField(2));
-    assertTrue(testMapOrBuilder.containsInt32ToBytesField(3));
-    assertFalse(testMapOrBuilder.containsInt32ToBytesField(-1));
-
-    assertTrue(testMapOrBuilder.containsInt32ToEnumField(1));
-    assertTrue(testMapOrBuilder.containsInt32ToEnumField(2));
-    assertTrue(testMapOrBuilder.containsInt32ToEnumField(3));
-    assertFalse(testMapOrBuilder.containsInt32ToEnumField(-1));
-
-    assertTrue(testMapOrBuilder.containsInt32ToMessageField(1));
-    assertTrue(testMapOrBuilder.containsInt32ToMessageField(2));
-    assertTrue(testMapOrBuilder.containsInt32ToMessageField(3));
-    assertFalse(testMapOrBuilder.containsInt32ToMessageField(-1));
-
-    assertTrue(testMapOrBuilder.containsStringToInt32Field("1"));
-    assertTrue(testMapOrBuilder.containsStringToInt32Field("2"));
-    assertTrue(testMapOrBuilder.containsStringToInt32Field("3"));
-    assertFalse(testMapOrBuilder.containsStringToInt32Field("-1"));
-  }
-
-  public void testCount() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-
-    setMapValuesUsingAccessors(builder);
-    assertMapCounts(3, builder);
-
-    TestMap message = builder.build();
-    assertMapCounts(3, message);
-
-    builder = message.toBuilder().putInt32ToInt32Field(4, 44);
-    assertEquals(4, builder.getInt32ToInt32FieldCount());
-    assertEquals(4, builder.build().getInt32ToInt32FieldCount());
-
-    // already present - should be unchanged
-    builder.putInt32ToInt32Field(4, 44);
-    assertEquals(4, builder.getInt32ToInt32FieldCount());
-  }
-
-  private void assertMapCounts(int expectedCount, TestMapOrBuilder testMapOrBuilder) {
-    assertEquals(expectedCount, testMapOrBuilder.getInt32ToInt32FieldCount());
-    assertEquals(expectedCount, testMapOrBuilder.getInt32ToStringFieldCount());
-    assertEquals(expectedCount, testMapOrBuilder.getInt32ToBytesFieldCount());
-    assertEquals(expectedCount, testMapOrBuilder.getInt32ToEnumFieldCount());
-    assertEquals(expectedCount, testMapOrBuilder.getInt32ToMessageFieldCount());
-    assertEquals(expectedCount, testMapOrBuilder.getStringToInt32FieldCount());
-  }
-
-  public void testGetOrDefault() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrDefault(TestMapOrBuilder testMapOrBuilder) {
-    assertEquals(11, testMapOrBuilder.getInt32ToInt32FieldOrDefault(1, -11));
-    assertEquals(-11, testMapOrBuilder.getInt32ToInt32FieldOrDefault(-1, -11));
-
-    assertEquals("11", testMapOrBuilder.getInt32ToStringFieldOrDefault(1, "-11"));
-    assertNull("-11", testMapOrBuilder.getInt32ToStringFieldOrDefault(-1, null));
-
-    assertEquals(TestUtil.toBytes("11"), testMapOrBuilder.getInt32ToBytesFieldOrDefault(1, null));
-    assertNull(testMapOrBuilder.getInt32ToBytesFieldOrDefault(-1, null));
-
-    assertEquals(TestMap.EnumValue.FOO, testMapOrBuilder.getInt32ToEnumFieldOrDefault(1, null));
-    assertNull(testMapOrBuilder.getInt32ToEnumFieldOrDefault(-1, null));
-
-    assertEquals(MessageValue.newBuilder().setValue(11).build(),
-        testMapOrBuilder.getInt32ToMessageFieldOrDefault(1, null));
-    assertNull(testMapOrBuilder.getInt32ToMessageFieldOrDefault(-1, null));
-
-    assertEquals(11, testMapOrBuilder.getStringToInt32FieldOrDefault("1", -11));
-    assertEquals(-11, testMapOrBuilder.getStringToInt32FieldOrDefault("-1", -11));
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrDefault(null, -11);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  public void testGetOrThrow() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    assertMapCounts(0, builder);
-    setMapValuesUsingAccessors(builder);
-    doTestGetOrDefault(builder);
-    doTestGetOrDefault(builder.build());
-  }
-
-  public void doTestGetOrThrow(TestMapOrBuilder testMapOrBuilder) {
-    assertEquals(11, testMapOrBuilder.getInt32ToInt32FieldOrThrow(1));
-    try {
-      testMapOrBuilder.getInt32ToInt32FieldOrThrow(-1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertEquals("11", testMapOrBuilder.getInt32ToStringFieldOrThrow(1));
-
-    try {
-      testMapOrBuilder.getInt32ToStringFieldOrThrow(-1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertEquals(TestUtil.toBytes("11"), testMapOrBuilder.getInt32ToBytesFieldOrThrow(1));
-
-    try {
-      testMapOrBuilder.getInt32ToBytesFieldOrThrow(-1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertEquals(TestMap.EnumValue.FOO, testMapOrBuilder.getInt32ToEnumFieldOrThrow(1));
-    try {
-      testMapOrBuilder.getInt32ToEnumFieldOrThrow(-1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertEquals(MessageValue.newBuilder().setValue(11).build(),
-        testMapOrBuilder.getInt32ToMessageFieldOrThrow(1));
-    try {
-      testMapOrBuilder.getInt32ToMessageFieldOrThrow(-1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    assertEquals(11, testMapOrBuilder.getStringToInt32FieldOrThrow("1"));
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow("-1");
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-
-    try {
-      testMapOrBuilder.getStringToInt32FieldOrThrow(null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  public void testPut() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    builder.putInt32ToInt32Field(1, 11);
-    assertEquals(11, builder.getInt32ToInt32FieldOrThrow(1));
-
-    builder.putInt32ToStringField(1, "a");
-    assertEquals("a", builder.getInt32ToStringFieldOrThrow(1));
-    try {
-      builder.putInt32ToStringField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToBytesField(1, TestUtil.toBytes("11"));
-    assertEquals(TestUtil.toBytes("11"), builder.getInt32ToBytesFieldOrThrow(1));
-    try {
-      builder.putInt32ToBytesField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putInt32ToEnumField(1, TestMap.EnumValue.FOO);
-    assertEquals(TestMap.EnumValue.FOO, builder.getInt32ToEnumFieldOrThrow(1));
-    try {
-      builder.putInt32ToEnumField(1, null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-
-    builder.putStringToInt32Field("a", 1);
-    assertEquals(1, builder.getStringToInt32FieldOrThrow("a"));
-    try {
-      builder.putStringToInt32Field(null, -1);
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
-  public void testRemove() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertEquals(11, builder.getInt32ToInt32FieldOrThrow(1));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToInt32Field(1);
-      assertEquals(-1, builder.getInt32ToInt32FieldOrDefault(1, -1));
-    }
-
-    assertEquals("11", builder.getInt32ToStringFieldOrThrow(1));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToStringField(1);
-      assertNull(builder.getInt32ToStringFieldOrDefault(1, null));
-    }
-
-    assertEquals(TestUtil.toBytes("11"), builder.getInt32ToBytesFieldOrThrow(1));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToBytesField(1);
-      assertNull(builder.getInt32ToBytesFieldOrDefault(1, null));
-    }
-
-    assertEquals(TestMap.EnumValue.FOO, builder.getInt32ToEnumFieldOrThrow(1));
-    for (int times = 0; times < 2; times++) {
-      builder.removeInt32ToEnumField(1);
-      assertNull(builder.getInt32ToEnumFieldOrDefault(1, null));
-    }
-
-    assertEquals(11, builder.getStringToInt32FieldOrThrow("1"));
-    for (int times = 0; times < 2; times++) {
-      builder.removeStringToInt32Field("1");
-      assertEquals(-1, builder.getStringToInt32FieldOrDefault("1", -1));
-    }
-
-    try {
-      builder.removeStringToInt32Field(null);
-      fail();
-    } catch (NullPointerException e) {
-      // expected
-    }
-  }
-
   // Regression test for b/20494788
   public void testMapInitializationOrder() throws Exception {
     assertEquals("RedactAllTypes", map_test.RedactAllTypes
@@ -1132,47 +660,24 @@ public class MapForProto2Test extends TestCase {
 
     map_test.Message1.Builder builder =
         map_test.Message1.newBuilder();
-    builder.putMapField("key", true);
+    builder.getMutableMapField().put("key", true);
     map_test.Message1 message = builder.build();
     Message mapEntry = (Message) message.getRepeatedField(
         message.getDescriptorForType().findFieldByName("map_field"), 0);
     assertEquals(2, mapEntry.getAllFields().size());
   }
-
-  public void testReservedWordsFieldNames() {
-    ReservedAsMapField.newBuilder().build();
-    ReservedAsMapFieldWithEnumValue.newBuilder().build();
-  }
-
+  
   private static <K, V> Map<K, V> newMap(K key1, V value1) {
     Map<K, V> map = new HashMap<K, V>();
     map.put(key1, value1);
     return map;
   }
-
+  
   private static <K, V> Map<K, V> newMap(K key1, V value1, K key2, V value2) {
     Map<K, V> map = new HashMap<K, V>();
     map.put(key1, value1);
     map.put(key2, value2);
     return map;
   }
-
-  public void testGetMap() {
-    TestMap.Builder builder = TestMap.newBuilder();
-    setMapValuesUsingAccessors(builder);
-    assertMapValuesSet(builder);
-    TestMap message = builder.build();
-    assertEquals(
-        message.getStringToInt32Field(),
-        message.getStringToInt32FieldMap());
-    assertEquals(
-        message.getInt32ToBytesField(),
-        message.getInt32ToBytesFieldMap());
-    assertEquals(
-        message.getInt32ToEnumField(),
-        message.getInt32ToEnumFieldMap());
-    assertEquals(
-        message.getInt32ToMessageField(),
-        message.getInt32ToMessageFieldMap());
-  }
 }
+