Revert https://codereview.chromium.org/1291903002 (protobuf roll).

third_party/protobuf/src/google/protobuf/lite_unittest.cc

Index: third_party/protobuf/src/google/protobuf/lite_unittest.cc
diff --git a/third_party/protobuf/src/google/protobuf/lite_unittest.cc b/third_party/protobuf/src/google/protobuf/lite_unittest.cc
index 5af8b24deeb7d113ccdeec656fb170f9b653601c..7a0a57b77c05debe9cafec177458d06c42461ba5 100644
--- a/third_party/protobuf/src/google/protobuf/lite_unittest.cc
+++ b/third_party/protobuf/src/google/protobuf/lite_unittest.cc
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
+// http://code.google.com/p/protobuf/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -34,16 +34,8 @@
 #include <iostream>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/arena_test_util.h>
-#include <google/protobuf/map_lite_unittest.pb.h>
-#include <google/protobuf/map_lite_test_util.h>
 #include <google/protobuf/test_util_lite.h>
 #include <google/protobuf/unittest_lite.pb.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/wire_format_lite.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/stubs/strutil.h>
 
 using namespace std;
 
@@ -65,37 +57,10 @@ void AssignParsingMergeMessages(
   msg3->set_optional_string("hello");
 }
 
-void SetAllTypesInEmptyMessageUnknownFields(
-    google::protobuf::unittest::TestEmptyMessageLite* empty_message) {
-  protobuf_unittest::TestAllTypesLite message;
-  google::protobuf::TestUtilLite::ExpectClear(message);
-  google::protobuf::TestUtilLite::SetAllFields(&message);
-  string data = message.SerializeAsString();
-  empty_message->ParseFromString(data);
-}
-
-void SetSomeTypesInEmptyMessageUnknownFields(
-    google::protobuf::unittest::TestEmptyMessageLite* empty_message) {
-  protobuf_unittest::TestAllTypesLite message;
-  google::protobuf::TestUtilLite::ExpectClear(message);
-  message.set_optional_int32(101);
-  message.set_optional_int64(102);
-  message.set_optional_uint32(103);
-  message.set_optional_uint64(104);
-  string data = message.SerializeAsString();
-  empty_message->ParseFromString(data);
-}
-
 }  // namespace
 
-#define EXPECT_TRUE GOOGLE_CHECK
-#define ASSERT_TRUE GOOGLE_CHECK
-#define EXPECT_FALSE(COND) GOOGLE_CHECK(!(COND))
-#define EXPECT_EQ GOOGLE_CHECK_EQ
-#define ASSERT_EQ GOOGLE_CHECK_EQ
-
 int main(int argc, char* argv[]) {
-  string data, data2, packed_data;
+  string data, packed_data;
 
   {
     protobuf_unittest::TestAllTypesLite message, message2, message3;
@@ -119,6 +84,7 @@ int main(int argc, char* argv[]) {
     google::protobuf::TestUtilLite::SetAllExtensions(&message);
     message2.CopyFrom(message);
     string extensions_data = message.SerializeAsString();
+    GOOGLE_CHECK(extensions_data == data);
     message3.ParseFromString(extensions_data);
     google::protobuf::TestUtilLite::ExpectAllExtensionsSet(message);
     google::protobuf::TestUtilLite::ExpectAllExtensionsSet(message2);
@@ -214,515 +180,6 @@ int main(int argc, char* argv[]) {
         google::protobuf::unittest::TestParsingMergeLite::repeated_ext) == 3);
   }
 
-  // Test unknown fields support for lite messages.
-  {
-    protobuf_unittest::TestAllTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    google::protobuf::TestUtilLite::ExpectClear(message);
-    google::protobuf::TestUtilLite::SetAllFields(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    google::protobuf::TestUtilLite::ExpectAllFieldsSet(message2);
-    message.Clear();
-    google::protobuf::TestUtilLite::ExpectClear(message);
-  }
-
-  {
-    protobuf_unittest::TestAllExtensionsLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    google::protobuf::TestUtilLite::ExpectExtensionsClear(message);
-    google::protobuf::TestUtilLite::SetAllExtensions(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    google::protobuf::TestUtilLite::ExpectAllExtensionsSet(message2);
-    message.Clear();
-    google::protobuf::TestUtilLite::ExpectExtensionsClear(message);
-  }
-
-  {
-    protobuf_unittest::TestPackedTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    google::protobuf::TestUtilLite::ExpectPackedClear(message);
-    google::protobuf::TestUtilLite::SetPackedFields(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    google::protobuf::TestUtilLite::ExpectPackedFieldsSet(message2);
-    message.Clear();
-    google::protobuf::TestUtilLite::ExpectPackedClear(message);
-  }
-
-  {
-    protobuf_unittest::TestPackedExtensionsLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    google::protobuf::TestUtilLite::ExpectPackedExtensionsClear(message);
-    google::protobuf::TestUtilLite::SetPackedExtensions(&message);
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data.clear();
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    data = message2.SerializeAsString();
-    google::protobuf::TestUtilLite::ExpectPackedExtensionsSet(message2);
-    message.Clear();
-    google::protobuf::TestUtilLite::ExpectPackedExtensionsClear(message);
-  }
-
-  {
-    // Test Unknown fields swap
-    protobuf_unittest::TestEmptyMessageLite empty_message, empty_message2;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    SetSomeTypesInEmptyMessageUnknownFields(&empty_message2);
-    data = empty_message.SerializeAsString();
-    data2 = empty_message2.SerializeAsString();
-    empty_message.Swap(&empty_message2);
-    GOOGLE_CHECK_EQ(data, empty_message2.SerializeAsString());
-    GOOGLE_CHECK_EQ(data2, empty_message.SerializeAsString());
-  }
-
-  {
-    // Test unknown fields swap with self
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    data = empty_message.SerializeAsString();
-    empty_message.Swap(&empty_message);
-    GOOGLE_CHECK_EQ(data, empty_message.SerializeAsString());
-  }
-
-  {
-    // Test MergeFrom with unknown fields
-    protobuf_unittest::TestAllTypesLite message, message2;
-    protobuf_unittest::TestEmptyMessageLite empty_message, empty_message2;
-    message.set_optional_int32(101);
-    message.add_repeated_int32(201);
-    message.set_optional_nested_enum(google::protobuf::unittest::TestAllTypesLite::BAZ);
-    message2.set_optional_int64(102);
-    message2.add_repeated_int64(202);
-    message2.set_optional_foreign_enum(google::protobuf::unittest::FOREIGN_LITE_BAZ);
-
-    data = message.SerializeAsString();
-    empty_message.ParseFromString(data);
-    data = message2.SerializeAsString();
-    empty_message2.ParseFromString(data);
-    message.MergeFrom(message2);
-    empty_message.MergeFrom(empty_message2);
-
-    data = empty_message.SerializeAsString();
-    message2.ParseFromString(data);
-    // We do not compare the serialized output of a normal message and a lite
-    // message because the order of fields do not match. We convert lite message
-    // back into normal message, then compare.
-    GOOGLE_CHECK_EQ(message.SerializeAsString(), message2.SerializeAsString());
-  }
-
-  {
-    // Test unknown enum value
-    protobuf_unittest::TestAllTypesLite message;
-    string buffer;
-    {
-      google::protobuf::io::StringOutputStream output_stream(&buffer);
-      google::protobuf::io::CodedOutputStream coded_output(&output_stream);
-      google::protobuf::internal::WireFormatLite::WriteTag(
-          protobuf_unittest::TestAllTypesLite::kOptionalNestedEnumFieldNumber,
-          google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT, &coded_output);
-      coded_output.WriteVarint32(10);
-      google::protobuf::internal::WireFormatLite::WriteTag(
-          protobuf_unittest::TestAllTypesLite::kRepeatedNestedEnumFieldNumber,
-          google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT, &coded_output);
-      coded_output.WriteVarint32(20);
-    }
-    message.ParseFromString(buffer);
-    data = message.SerializeAsString();
-    GOOGLE_CHECK_EQ(data, buffer);
-  }
-
-  {
-    // Test Clear with unknown fields
-    protobuf_unittest::TestEmptyMessageLite empty_message;
-    SetAllTypesInEmptyMessageUnknownFields(&empty_message);
-    empty_message.Clear();
-    GOOGLE_CHECK_EQ(0, empty_message.unknown_fields().size());
-  }
-
-  // Tests for map lite =============================================
-
-  {
-    // Accessors
-    protobuf_unittest::TestMapLite message;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message);
-
-    google::protobuf::MapLiteTestUtil::ModifyMapFields(&message);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsModified(message);
-  }
-
-  {
-    // SetMapFieldsInitialized
-    protobuf_unittest::TestMapLite message;
-
-    google::protobuf::MapLiteTestUtil::SetMapFieldsInitialized(&message);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSetInitialized(message);
-  }
-
-  {
-    // Proto2SetMapFieldsInitialized
-    protobuf_unittest::TestEnumStartWithNonZeroMapLite message;
-    EXPECT_EQ(protobuf_unittest::PROTO2_NON_ZERO_MAP_ENUM_FOO_LITE,
-              (*message.mutable_map_field())[0]);
-  }
-
-  {
-    // Clear
-    protobuf_unittest::TestMapLite message;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message);
-    message.Clear();
-    google::protobuf::MapLiteTestUtil::ExpectClear(message);
-  }
-
-  {
-    // ClearMessageMap
-    protobuf_unittest::TestMessageMapLite message;
-
-    // Creates a TestAllTypes with default value
-    google::protobuf::TestUtilLite::ExpectClear(
-        (*message.mutable_map_int32_message())[0]);
-  }
-
-  {
-    // CopyFrom
-    protobuf_unittest::TestMapLite message1, message2;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-    message2.CopyFrom(message1);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-
-    // Copying from self should be a no-op.
-    message2.CopyFrom(message2);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-  {
-    // CopyFromMessageMap
-    protobuf_unittest::TestMessageMapLite message1, message2;
-
-    (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-    (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-    message1.CopyFrom(message2);
-
-    // Checks repeated field is overwritten.
-    EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-    EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-  }
-
-  {
-    // SwapWithEmpty
-    protobuf_unittest::TestMapLite message1, message2;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message1);
-    google::protobuf::MapLiteTestUtil::ExpectClear(message2);
-
-    message1.Swap(&message2);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-    google::protobuf::MapLiteTestUtil::ExpectClear(message1);
-  }
-
-  {
-    // SwapWithSelf
-    protobuf_unittest::TestMapLite message;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message);
-
-    message.Swap(&message);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message);
-  }
-
-  {
-    // SwapWithOther
-    protobuf_unittest::TestMapLite message1, message2;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message2);
-    google::protobuf::MapLiteTestUtil::ModifyMapFields(&message2);
-
-    message1.Swap(&message2);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsModified(message1);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-  {
-    // CopyConstructor
-    protobuf_unittest::TestMapLite message1;
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-
-    protobuf_unittest::TestMapLite message2(message1);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-  {
-    // CopyAssignmentOperator
-    protobuf_unittest::TestMapLite message1;
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-
-    protobuf_unittest::TestMapLite message2;
-    message2 = message1;
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-
-    // Make sure that self-assignment does something sane.
-    message2.operator=(message2);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-  {
-    // NonEmptyMergeFrom
-    protobuf_unittest::TestMapLite message1, message2;
-
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-
-    // This field will test merging into an empty spot.
-    (*message2.mutable_map_int32_int32())[1] = 1;
-    message1.mutable_map_int32_int32()->erase(1);
-
-    // This tests overwriting.
-    (*message2.mutable_map_int32_double())[1] = 1;
-    (*message1.mutable_map_int32_double())[1] = 2;
-
-    message1.MergeFrom(message2);
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message1);
-  }
-
-  {
-    // MergeFromMessageMap
-    protobuf_unittest::TestMessageMapLite message1, message2;
-
-    (*message1.mutable_map_int32_message())[0].add_repeated_int32(100);
-    (*message2.mutable_map_int32_message())[0].add_repeated_int32(101);
-
-    message1.MergeFrom(message2);
-
-    // Checks repeated field is overwritten.
-    EXPECT_EQ(1, message1.map_int32_message().at(0).repeated_int32_size());
-    EXPECT_EQ(101, message1.map_int32_message().at(0).repeated_int32(0));
-  }
-
-  {
-    // Test the generated SerializeWithCachedSizesToArray()
-    protobuf_unittest::TestMapLite message1, message2;
-    string data;
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-    int size = message1.ByteSize();
-    data.resize(size);
-    ::google::protobuf::uint8* start = reinterpret_cast< ::google::protobuf::uint8*>(::google::protobuf::string_as_array(&data));
-    ::google::protobuf::uint8* end = message1.SerializeWithCachedSizesToArray(start);
-    EXPECT_EQ(size, end - start);
-    EXPECT_TRUE(message2.ParseFromString(data));
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-  {
-    // Test the generated SerializeWithCachedSizes()
-    protobuf_unittest::TestMapLite message1, message2;
-    google::protobuf::MapLiteTestUtil::SetMapFields(&message1);
-    int size = message1.ByteSize();
-    string data;
-    data.resize(size);
-    {
-      // Allow the output stream to buffer only one byte at a time.
-      google::protobuf::io::ArrayOutputStream array_stream(
-          ::google::protobuf::string_as_array(&data), size, 1);
-      google::protobuf::io::CodedOutputStream output_stream(&array_stream);
-      message1.SerializeWithCachedSizes(&output_stream);
-      EXPECT_FALSE(output_stream.HadError());
-      EXPECT_EQ(size, output_stream.ByteCount());
-    }
-    EXPECT_TRUE(message2.ParseFromString(data));
-    google::protobuf::MapLiteTestUtil::ExpectMapFieldsSet(message2);
-  }
-
-
-  {
-    // Proto2UnknownEnum
-    protobuf_unittest::TestEnumMapPlusExtraLite from;
-    (*from.mutable_known_map_field())[0] =
-        protobuf_unittest::E_PROTO2_MAP_ENUM_FOO_LITE;
-    (*from.mutable_unknown_map_field())[0] =
-        protobuf_unittest::E_PROTO2_MAP_ENUM_EXTRA_LITE;
-    string data;
-    from.SerializeToString(&data);
-
-    protobuf_unittest::TestEnumMapLite to;
-    EXPECT_TRUE(to.ParseFromString(data));
-    EXPECT_EQ(0, to.unknown_map_field().size());
-    EXPECT_FALSE(to.mutable_unknown_fields()->empty());
-    EXPECT_EQ(1, to.known_map_field().size());
-    EXPECT_EQ(protobuf_unittest::PROTO2_MAP_ENUM_FOO_LITE,
-              to.known_map_field().at(0));
-
-    data.clear();
-    from.Clear();
-    to.SerializeToString(&data);
-    EXPECT_TRUE(from.ParseFromString(data));
-    EXPECT_EQ(1, from.known_map_field().size());
-    EXPECT_EQ(protobuf_unittest::E_PROTO2_MAP_ENUM_FOO_LITE,
-              from.known_map_field().at(0));
-    EXPECT_EQ(1, from.unknown_map_field().size());
-    EXPECT_EQ(protobuf_unittest::E_PROTO2_MAP_ENUM_EXTRA_LITE,
-              from.unknown_map_field().at(0));
-  }
-
-  {
-    // StandardWireFormat
-    protobuf_unittest::TestMapLite message;
-    string data = "\x0A\x04\x08\x01\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(1));
-  }
-
-  {
-    // UnorderedWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // put value before key in wire format
-    string data = "\x0A\x04\x10\x01\x08\x02";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(2));
-  }
-
-  {
-    // DuplicatedKeyWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Two key fields in wire format
-    string data = "\x0A\x06\x08\x01\x08\x02\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(2));
-  }
-
-  {
-    // DuplicatedValueWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Two value fields in wire format
-    string data = "\x0A\x06\x08\x01\x10\x01\x10\x02";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(2, message.map_int32_int32().at(1));
-  }
-
-  {
-    // MissedKeyWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // No key field in wire format
-    string data = "\x0A\x02\x10\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(1, message.map_int32_int32().at(0));
-  }
-
-  {
-    // MissedValueWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // No value field in wire format
-    string data = "\x0A\x02\x08\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(0, message.map_int32_int32().at(1));
-  }
-
-  {
-    // UnknownFieldWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // Unknown field in wire format
-    string data = "\x0A\x06\x08\x02\x10\x03\x18\x01";
-
-    EXPECT_TRUE(message.ParseFromString(data));
-    EXPECT_EQ(1, message.map_int32_int32().size());
-    EXPECT_EQ(3, message.map_int32_int32().at(2));
-  }
-
-  {
-    // CorruptedWireFormat
-    protobuf_unittest::TestMapLite message;
-
-    // corrupted data in wire format
-    string data = "\x0A\x06\x08\x02\x11\x03";
-
-    EXPECT_FALSE(message.ParseFromString(data));
-  }
-
-  {
-    // IsInitialized
-    protobuf_unittest::TestRequiredMessageMapLite map_message;
-
-    // Add an uninitialized message.
-    (*map_message.mutable_map_field())[0];
-    EXPECT_FALSE(map_message.IsInitialized());
-
-    // Initialize uninitialized message
-    (*map_message.mutable_map_field())[0].set_a(0);
-    (*map_message.mutable_map_field())[0].set_b(0);
-    (*map_message.mutable_map_field())[0].set_c(0);
-    EXPECT_TRUE(map_message.IsInitialized());
-  }
-
-  // arena support for map  =========================================
-
-  {
-    // ParsingAndSerializingNoHeapAllocation
-
-    // Allocate a large initial block to avoid mallocs during hooked test.
-    std::vector<char> arena_block(128 * 1024);
-    google::protobuf::ArenaOptions options;
-    options.initial_block = &arena_block[0];
-    options.initial_block_size = arena_block.size();
-    google::protobuf::Arena arena(options);
-    string data;
-    data.reserve(128 * 1024);
-
-    {
-      google::protobuf::internal::NoHeapChecker no_heap;
-
-      protobuf_unittest::TestArenaMapLite* from =
-          google::protobuf::Arena::CreateMessage<protobuf_unittest::TestArenaMapLite>(
-              &arena);
-      google::protobuf::MapLiteTestUtil::SetArenaMapFields(from);
-      from->SerializeToString(&data);
-
-      protobuf_unittest::TestArenaMapLite* to =
-          google::protobuf::Arena::CreateMessage<protobuf_unittest::TestArenaMapLite>(
-              &arena);
-      to->ParseFromString(data);
-      google::protobuf::MapLiteTestUtil::ExpectArenaMapFieldsSet(*to);
-    }
-  }
-
-  std::cout << "PASS" << std::endl;
+  cout << "PASS" << endl;
   return 0;
 }