Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

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

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // 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
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
@@ skipping 14 matching lines @@
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.google.protobuf;
 
 import protobuf_unittest.UnittestProto.TestAllTypes;
 import protobuf_unittest.UnittestProto.TestAllTypesOrBuilder;
+
+import junit.framework.TestCase;
+
 import java.util.Collections;
 import java.util.List;
-import junit.framework.TestCase;
 
 /**
- * Tests for {@link RepeatedFieldBuilderV3}. This tests basic functionality.
+ * Tests for {@link RepeatedFieldBuilder}. This tests basic functionality.
  * More extensive testing is provided via other tests that exercise the
  * builder.
  *
  * @author jonp@google.com (Jon Perlow)
  */
-public class RepeatedFieldBuilderV3Test extends TestCase {
+public class RepeatedFieldBuilderTest extends TestCase {
 
   public void testBasicUse() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
-        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent);
+    RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilder(mockParent);
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
     assertEquals(0, builder.getMessage(0).getOptionalInt32());
     assertEquals(1, builder.getMessage(1).getOptionalInt32());
 
     List<TestAllTypes> list = builder.build();
     assertEquals(2, list.size());
     assertEquals(0, list.get(0).getOptionalInt32());
     assertEquals(1, list.get(1).getOptionalInt32());
     assertIsUnmodifiable(list);
 
     // Make sure it doesn't change.
     List<TestAllTypes> list2 = builder.build();
     assertSame(list, list2);
     assertEquals(0, mockParent.getInvalidationCount());
   }
 
   public void testGoingBackAndForth() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
-        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent);
+    RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilder(mockParent);
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
     assertEquals(0, builder.getMessage(0).getOptionalInt32());
     assertEquals(1, builder.getMessage(1).getOptionalInt32());
 
     // Convert to list
     List<TestAllTypes> list = builder.build();
     assertEquals(2, list.size());
     assertEquals(0, list.get(0).getOptionalInt32());
     assertEquals(1, list.get(1).getOptionalInt32());
     assertIsUnmodifiable(list);
 
     // Update 0th item
     assertEquals(0, mockParent.getInvalidationCount());
     builder.getBuilder(0).setOptionalString("foo");
     assertEquals(1, mockParent.getInvalidationCount());
     list = builder.build();
     assertEquals(2, list.size());
     assertEquals(0, list.get(0).getOptionalInt32());
       assertEquals("foo", list.get(0).getOptionalString());
     assertEquals(1, list.get(1).getOptionalInt32());
     assertIsUnmodifiable(list);
     assertEquals(1, mockParent.getInvalidationCount());
   }
 
   public void testVariousMethods() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
-        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent);
+    RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilder(mockParent);
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(2).build());
     builder.addBuilder(0, TestAllTypes.getDefaultInstance())
         .setOptionalInt32(0);
     builder.addBuilder(TestAllTypes.getDefaultInstance()).setOptionalInt32(3);
 
     assertEquals(0, builder.getMessage(0).getOptionalInt32());
     assertEquals(1, builder.getMessage(1).getOptionalInt32());
     assertEquals(2, builder.getMessage(2).getOptionalInt32());
     assertEquals(3, builder.getMessage(3).getOptionalInt32());
@@ skipping 20 matching lines @@
 
     // Test clear.
     builder.clear();
     assertEquals(1, mockParent.getInvalidationCount());
     assertEquals(0, builder.getCount());
     assertTrue(builder.isEmpty());
   }
 
   public void testLists() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
-        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilderV3(mockParent);
+    RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        TestAllTypesOrBuilder> builder = newRepeatedFieldBuilder(mockParent);
     builder.addMessage(TestAllTypes.newBuilder().setOptionalInt32(1).build());
     builder.addMessage(0,
         TestAllTypes.newBuilder().setOptionalInt32(0).build());
     assertEquals(0, builder.getMessage(0).getOptionalInt32());
     assertEquals(1, builder.getMessage(1).getOptionalInt32());
 
     // Use list of builders.
     List<TestAllTypes.Builder> builders = builder.getBuilderList();
     assertEquals(0, builders.get(0).getOptionalInt32());
     assertEquals(1, builders.get(1).getOptionalInt32());
@@ skipping 17 matching lines @@
     } else {
       try {
         list.clear();
         fail("List wasn't immutable");
       } catch (UnsupportedOperationException e) {
         // good
       }
     }
   }
 
-  private RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+  private RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
       TestAllTypesOrBuilder>
-      newRepeatedFieldBuilderV3(GeneratedMessage.BuilderParent parent) {
-    return new RepeatedFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
+      newRepeatedFieldBuilder(GeneratedMessage.BuilderParent parent) {
+    return new RepeatedFieldBuilder<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder>(Collections.<TestAllTypes>emptyList(), false,
         parent, false);
   }
 }