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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: google_apis/gcm/base/mcs_message_unittest.cc

Issue 1873663002: Convert //google_apis from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 unified diff | Download patch
« google_apis/drive/base_requests.cc ('K') | « google_apis/gcm/base/mcs_message.cc ('k') | google_apis/gcm/base/mcs_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "google_apis/gcm/base/mcs_message.h" 5 #include "google_apis/gcm/base/mcs_message.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 25 matching lines...) Expand all
36 36
37 MCSMessageTest::~MCSMessageTest() { 37 MCSMessageTest::~MCSMessageTest() {
38 } 38 }
39 39
40 TEST_F(MCSMessageTest, Invalid) { 40 TEST_F(MCSMessageTest, Invalid) {
41 MCSMessage message; 41 MCSMessage message;
42 EXPECT_FALSE(message.IsValid()); 42 EXPECT_FALSE(message.IsValid());
43 } 43 }
44 44
45 TEST_F(MCSMessageTest, InitInferTag) { 45 TEST_F(MCSMessageTest, InitInferTag) {
46 scoped_ptr<mcs_proto::LoginRequest> login_request( 46 std::unique_ptr<mcs_proto::LoginRequest> login_request(
47 BuildLoginRequest(kAndroidId, kSecret, "")); 47 BuildLoginRequest(kAndroidId, kSecret, ""));
48 scoped_ptr<google::protobuf::MessageLite> login_copy( 48 std::unique_ptr<google::protobuf::MessageLite> login_copy(
49 new mcs_proto::LoginRequest(*login_request)); 49 new mcs_proto::LoginRequest(*login_request));
50 MCSMessage message(*login_copy); 50 MCSMessage message(*login_copy);
51 login_copy.reset(); 51 login_copy.reset();
52 ASSERT_TRUE(message.IsValid()); 52 ASSERT_TRUE(message.IsValid());
53 EXPECT_EQ(kLoginRequestTag, message.tag()); 53 EXPECT_EQ(kLoginRequestTag, message.tag());
54 EXPECT_EQ(login_request->ByteSize(), message.size()); 54 EXPECT_EQ(login_request->ByteSize(), message.size());
55 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString()); 55 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString());
56 EXPECT_EQ(login_request->SerializeAsString(), 56 EXPECT_EQ(login_request->SerializeAsString(),
57 message.GetProtobuf().SerializeAsString()); 57 message.GetProtobuf().SerializeAsString());
58 login_copy = message.CloneProtobuf(); 58 login_copy = message.CloneProtobuf();
59 EXPECT_EQ(login_request->SerializeAsString(), 59 EXPECT_EQ(login_request->SerializeAsString(),
60 login_copy->SerializeAsString()); 60 login_copy->SerializeAsString());
61 } 61 }
62 62
63 TEST_F(MCSMessageTest, InitWithTag) { 63 TEST_F(MCSMessageTest, InitWithTag) {
64 scoped_ptr<mcs_proto::LoginRequest> login_request( 64 std::unique_ptr<mcs_proto::LoginRequest> login_request(
65 BuildLoginRequest(kAndroidId, kSecret, "")); 65 BuildLoginRequest(kAndroidId, kSecret, ""));
66 scoped_ptr<google::protobuf::MessageLite> login_copy( 66 std::unique_ptr<google::protobuf::MessageLite> login_copy(
67 new mcs_proto::LoginRequest(*login_request)); 67 new mcs_proto::LoginRequest(*login_request));
68 MCSMessage message(kLoginRequestTag, *login_copy); 68 MCSMessage message(kLoginRequestTag, *login_copy);
69 login_copy.reset(); 69 login_copy.reset();
70 ASSERT_TRUE(message.IsValid()); 70 ASSERT_TRUE(message.IsValid());
71 EXPECT_EQ(kLoginRequestTag, message.tag()); 71 EXPECT_EQ(kLoginRequestTag, message.tag());
72 EXPECT_EQ(login_request->ByteSize(), message.size()); 72 EXPECT_EQ(login_request->ByteSize(), message.size());
73 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString()); 73 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString());
74 EXPECT_EQ(login_request->SerializeAsString(), 74 EXPECT_EQ(login_request->SerializeAsString(),
75 message.GetProtobuf().SerializeAsString()); 75 message.GetProtobuf().SerializeAsString());
76 login_copy = message.CloneProtobuf(); 76 login_copy = message.CloneProtobuf();
77 EXPECT_EQ(login_request->SerializeAsString(), 77 EXPECT_EQ(login_request->SerializeAsString(),
78 login_copy->SerializeAsString()); 78 login_copy->SerializeAsString());
79 } 79 }
80 80
81 TEST_F(MCSMessageTest, InitPassOwnership) { 81 TEST_F(MCSMessageTest, InitPassOwnership) {
82 scoped_ptr<mcs_proto::LoginRequest> login_request( 82 std::unique_ptr<mcs_proto::LoginRequest> login_request(
83 BuildLoginRequest(kAndroidId, kSecret, "")); 83 BuildLoginRequest(kAndroidId, kSecret, ""));
84 scoped_ptr<google::protobuf::MessageLite> login_copy( 84 std::unique_ptr<google::protobuf::MessageLite> login_copy(
85 new mcs_proto::LoginRequest(*login_request)); 85 new mcs_proto::LoginRequest(*login_request));
86 MCSMessage message(kLoginRequestTag, std::move(login_copy)); 86 MCSMessage message(kLoginRequestTag, std::move(login_copy));
87 EXPECT_FALSE(login_copy.get()); 87 EXPECT_FALSE(login_copy.get());
88 ASSERT_TRUE(message.IsValid()); 88 ASSERT_TRUE(message.IsValid());
89 EXPECT_EQ(kLoginRequestTag, message.tag()); 89 EXPECT_EQ(kLoginRequestTag, message.tag());
90 EXPECT_EQ(login_request->ByteSize(), message.size()); 90 EXPECT_EQ(login_request->ByteSize(), message.size());
91 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString()); 91 EXPECT_EQ(login_request->SerializeAsString(), message.SerializeAsString());
92 EXPECT_EQ(login_request->SerializeAsString(), 92 EXPECT_EQ(login_request->SerializeAsString(),
93 message.GetProtobuf().SerializeAsString()); 93 message.GetProtobuf().SerializeAsString());
94 login_copy = message.CloneProtobuf(); 94 login_copy = message.CloneProtobuf();
95 EXPECT_EQ(login_request->SerializeAsString(), 95 EXPECT_EQ(login_request->SerializeAsString(),
96 login_copy->SerializeAsString()); 96 login_copy->SerializeAsString());
97 } 97 }
98 98
99 } // namespace gcm 99 } // namespace gcm
OLDNEW
« google_apis/drive/base_requests.cc ('K') | « google_apis/gcm/base/mcs_message.cc ('k') | google_apis/gcm/base/mcs_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698