Revert "third_party/protobuf: Update to HEAD (83d681ee2c)"

third_party/protobuf/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.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 16 matching lines @@
 // 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.LazyFieldsLite.LazyExtension;
 import protobuf_unittest.LazyFieldsLite.LazyInnerMessageLite;
 import protobuf_unittest.LazyFieldsLite.LazyMessageLite;
 import protobuf_unittest.LazyFieldsLite.LazyNestedInnerMessageLite;
+
+import junit.framework.TestCase;
+
 import java.util.ArrayList;
-import junit.framework.TestCase;
 
 /**
  * Unit test for messages with lazy fields.
  *
  * @author niwasaki@google.com (Naoki Iwasaki)
  */
 public class LazyMessageLiteTest extends TestCase {
 
   private Parser<LazyInnerMessageLite> originalLazyInnerMessageLiteParser;
 
@@ skipping 45 matching lines @@
         .setNum(1)
         .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119))
         .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122))
         .build();
 
     assertEquals(1, outer.getNum());
     assertEquals(2, outer.getRepeatedInnerCount());
     assertEquals(119, outer.getRepeatedInner(0).getNum());
     assertEquals(122, outer.getRepeatedInner(1).getNum());
   }
-  
-  public void testRepeatedMutability() throws Exception {
-    LazyMessageLite outer = LazyMessageLite.newBuilder()
-        .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(119))
-        .addRepeatedInner(LazyInnerMessageLite.newBuilder().setNum(122))
-        .build();
-    
-    outer = LazyMessageLite.parseFrom(outer.toByteArray());
-    try {
-      outer.getRepeatedInnerList().set(1, null);
-      fail();
-    } catch (UnsupportedOperationException expected) {}
-  }
 
   public void testAddAll() {
     ArrayList<LazyInnerMessageLite> inners = new ArrayList<LazyInnerMessageLite>();
     int count = 4;
     for (int i = 0; i < count; i++) {
       LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder()
           .setNum(i)
           .build();
       inners.add(inner);
     }
@@ skipping 128 matching lines @@
         .build();
     // Merging default-instance shouldn't overwrite values in the base message.
     assertEquals(119, merged.getNum());
     assertEquals(122, merged.getNumWithDefault());
     assertEquals(115, merged.getInner().getNum());
     assertEquals(42, merged.getInner().getNumWithDefault());
     assertEquals(115, merged.getOneofInner().getNum());
     assertEquals(42, merged.getOneofInner().getNumWithDefault());
   }
 
-  // Regression test for b/28198805.
-  public void testMergeOneofMessages() throws Exception {
-    LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder().build();
-    LazyMessageLite outer = LazyMessageLite.newBuilder().setOneofInner(inner).build();
-    ByteString data1 = outer.toByteString();
-
-    // The following should not alter the content of the 'outer' message.
-    LazyMessageLite.Builder merged = LazyMessageLite.newBuilder().mergeFrom(outer);
-    LazyInnerMessageLite anotherInner = LazyInnerMessageLite.newBuilder().setNum(12345).build();
-    merged.setOneofInner(anotherInner);
-
-    // Check that the 'outer' stays the same.
-    ByteString data2 = outer.toByteString();
-    assertEquals(data1, data2);
-    assertEquals(0, outer.getOneofInner().getNum());
-  }
-
   public void testSerialize() throws InvalidProtocolBufferException {
     LazyNestedInnerMessageLite nested = LazyNestedInnerMessageLite.newBuilder()
         .setNum(3)
         .build();
     LazyInnerMessageLite inner = LazyInnerMessageLite.newBuilder()
         .setNum(2)
         .setNested(nested)
         .build();
     LazyMessageLite outer = LazyMessageLite.newBuilder()
         .setNum(1)
@@ skipping 34 matching lines @@
     LazyInnerMessageLite innerMessage = innerBuilder.build();
     assertTrue(innerMessage.hasExtension(LazyExtension.extension));
     assertEquals("name", innerMessage.getExtension(LazyExtension.extension).getName());
 
     LazyMessageLite lite = LazyMessageLite.newBuilder()
         .setInner(innerMessage).build();
     assertTrue(lite.getInner().hasExtension(LazyExtension.extension));
     assertEquals("name", lite.getInner().getExtension(LazyExtension.extension).getName());
   }
 }