third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.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 18 matching lines @@
 // 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;
 
 /**
- * Tests for {@link SingleFieldBuilder}. This tests basic functionality.
+ * Tests for {@link SingleFieldBuilderV3}. This tests basic functionality.
  * More extensive testing is provided via other tests that exercise the
  * builder.
  *
  * @author jonp@google.com (Jon Perlow)
  */
-public class SingleFieldBuilderTest extends TestCase {
+public class SingleFieldBuilderV3Test extends TestCase {
 
   public void testBasicUseAndInvalidations() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
             false);
     assertSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
     assertEquals(TestAllTypes.getDefaultInstance(),
         builder.getBuilder().buildPartial());
     assertEquals(0, mockParent.getInvalidationCount());
 
     builder.getBuilder().setOptionalInt32(10);
     assertEquals(0, mockParent.getInvalidationCount());
     TestAllTypes message = builder.build();
     assertEquals(10, message.getOptionalInt32());
 
     // Test that we receive invalidations now that build has been called.
     assertEquals(0, mockParent.getInvalidationCount());
     builder.getBuilder().setOptionalInt32(20);
     assertEquals(1, mockParent.getInvalidationCount());
 
     // Test that we don't keep getting invalidations on every change
     builder.getBuilder().setOptionalInt32(30);
     assertEquals(1, mockParent.getInvalidationCount());
 
   }
 
   public void testSetMessage() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
             false);
     builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
     assertEquals(0, builder.getMessage().getOptionalInt32());
 
     // Update message using the builder
     builder.getBuilder().setOptionalInt32(1);
     assertEquals(0, mockParent.getInvalidationCount());
     assertEquals(1, builder.getBuilder().getOptionalInt32());
     assertEquals(1, builder.getMessage().getOptionalInt32());
     builder.build();
     builder.getBuilder().setOptionalInt32(2);
     assertEquals(2, builder.getBuilder().getOptionalInt32());
     assertEquals(2, builder.getMessage().getOptionalInt32());
 
     // Make sure message stays cached
     assertSame(builder.getMessage(), builder.getMessage());
   }
 
   public void testClear() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
             false);
     builder.setMessage(TestAllTypes.newBuilder().setOptionalInt32(0).build());
     assertNotSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
     builder.clear();
     assertSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
 
     builder.getBuilder().setOptionalInt32(1);
     assertNotSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
     builder.clear();
     assertSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
   }
 
   public void testMerge() {
     TestUtil.MockBuilderParent mockParent = new TestUtil.MockBuilderParent();
-    SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+    SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
         TestAllTypesOrBuilder> builder =
-        new SingleFieldBuilder<TestAllTypes, TestAllTypes.Builder,
+        new SingleFieldBuilderV3<TestAllTypes, TestAllTypes.Builder,
             TestAllTypesOrBuilder>(
             TestAllTypes.getDefaultInstance(),
             mockParent,
             false);
 
     // Merge into default field.
     builder.mergeFrom(TestAllTypes.getDefaultInstance());
     assertSame(TestAllTypes.getDefaultInstance(), builder.getMessage());
 
     // Merge into non-default field on existing builder.
     builder.getBuilder().setOptionalInt32(2);
     builder.mergeFrom(TestAllTypes.newBuilder()
         .setOptionalDouble(4.0)
         .buildPartial());
     assertEquals(2, builder.getMessage().getOptionalInt32());
     assertEquals(4.0, builder.getMessage().getOptionalDouble());
 
     // Merge into non-default field on existing message
     builder.setMessage(TestAllTypes.newBuilder()
         .setOptionalInt32(10)
         .buildPartial());
     builder.mergeFrom(TestAllTypes.newBuilder()
         .setOptionalDouble(5.0)
         .buildPartial());
     assertEquals(10, builder.getMessage().getOptionalInt32());
     assertEquals(5.0, builder.getMessage().getOptionalDouble());
   }
 }