Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Unified Diff: third_party/protobuf/src/google/protobuf/any_test.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/protobuf/src/google/protobuf/any_test.cc
diff --git a/third_party/protobuf/src/google/protobuf/any_test.cc b/third_party/protobuf/src/google/protobuf/any_test.cc
deleted file mode 100644
index 1bfaa63d879e9a2cc9426382b1e705adf5fe7f74..0000000000000000000000000000000000000000
--- a/third_party/protobuf/src/google/protobuf/any_test.cc
+++ /dev/null
@@ -1,89 +0,0 @@
-// 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.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// 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.
-
-#include <google/protobuf/any_test.pb.h>
-#include <gtest/gtest.h>
-
-namespace google {
-namespace protobuf {
-namespace {
-
-TEST(AnyTest, TestPackAndUnpack) {
- protobuf_unittest::TestAny submessage;
- submessage.set_int32_value(12345);
- protobuf_unittest::TestAny message;
- message.mutable_any_value()->PackFrom(submessage);
-
- string data = message.SerializeAsString();
-
- ASSERT_TRUE(message.ParseFromString(data));
- EXPECT_TRUE(message.has_any_value());
- ASSERT_TRUE(message.any_value().UnpackTo(&submessage));
- EXPECT_EQ(12345, submessage.int32_value());
-}
-
-TEST(AnyTest, TestPackAndUnpackAny) {
- // We can pack a Any message inside another Any message.
- protobuf_unittest::TestAny submessage;
- submessage.set_int32_value(12345);
- google::protobuf::Any any;
- any.PackFrom(submessage);
- protobuf_unittest::TestAny message;
- message.mutable_any_value()->PackFrom(any);
-
- string data = message.SerializeAsString();
-
- ASSERT_TRUE(message.ParseFromString(data));
- EXPECT_TRUE(message.has_any_value());
- ASSERT_TRUE(message.any_value().UnpackTo(&any));
- ASSERT_TRUE(any.UnpackTo(&submessage));
- EXPECT_EQ(12345, submessage.int32_value());
-}
-
-TEST(AnyTest, TestIs) {
- protobuf_unittest::TestAny submessage;
- submessage.set_int32_value(12345);
- google::protobuf::Any any;
- any.PackFrom(submessage);
- ASSERT_TRUE(any.ParseFromString(any.SerializeAsString()));
- EXPECT_TRUE(any.Is<protobuf_unittest::TestAny>());
- EXPECT_FALSE(any.Is<google::protobuf::Any>());
-
- protobuf_unittest::TestAny message;
- message.mutable_any_value()->PackFrom(any);
- ASSERT_TRUE(message.ParseFromString(message.SerializeAsString()));
- EXPECT_FALSE(message.any_value().Is<protobuf_unittest::TestAny>());
- EXPECT_TRUE(message.any_value().Is<google::protobuf::Any>());
-}
-
-} // namespace
-} // namespace protobuf
-
-} // namespace google
« no previous file with comments | « third_party/protobuf/src/google/protobuf/any.pb.cc ('k') | third_party/protobuf/src/google/protobuf/any_test.proto » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698