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

Side by Side Diff: sync/internal_api/public/data_batch_impl_unittest.cc

Issue 1866243002: Convert //sync 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "sync/internal_api/public/data_batch_impl.h" 5 #include "sync/internal_api/public/data_batch_impl.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
8 9
9 namespace syncer_v2 { 10 namespace syncer_v2 {
10 11
11 TEST(DataBatchImplTest, PutAndNextWithReuse) { 12 TEST(DataBatchImplTest, PutAndNextWithReuse) {
12 EntityData* entity1 = new EntityData(); 13 EntityData* entity1 = new EntityData();
13 EntityData* entity2 = new EntityData(); 14 EntityData* entity2 = new EntityData();
14 15
15 DataBatchImpl batch; 16 DataBatchImpl batch;
16 EXPECT_FALSE(batch.HasNext()); 17 EXPECT_FALSE(batch.HasNext());
17 18
18 batch.Put("one", make_scoped_ptr(entity1)); 19 batch.Put("one", base::WrapUnique(entity1));
19 EXPECT_TRUE(batch.HasNext()); 20 EXPECT_TRUE(batch.HasNext());
20 21
21 const TagAndData& pair1 = batch.Next(); 22 const TagAndData& pair1 = batch.Next();
22 EXPECT_FALSE(batch.HasNext()); 23 EXPECT_FALSE(batch.HasNext());
23 EXPECT_EQ("one", pair1.first); 24 EXPECT_EQ("one", pair1.first);
24 EXPECT_EQ(entity1, pair1.second.get()); 25 EXPECT_EQ(entity1, pair1.second.get());
25 26
26 batch.Put("two", make_scoped_ptr(entity2)); 27 batch.Put("two", base::WrapUnique(entity2));
27 EXPECT_TRUE(batch.HasNext()); 28 EXPECT_TRUE(batch.HasNext());
28 29
29 const TagAndData& pair2 = batch.Next(); 30 const TagAndData& pair2 = batch.Next();
30 EXPECT_FALSE(batch.HasNext()); 31 EXPECT_FALSE(batch.HasNext());
31 EXPECT_EQ("two", pair2.first); 32 EXPECT_EQ("two", pair2.first);
32 EXPECT_EQ(entity2, pair2.second.get()); 33 EXPECT_EQ(entity2, pair2.second.get());
33 } 34 }
34 35
35 TEST(DataBatchImplTest, PutAndNextInterleaved) { 36 TEST(DataBatchImplTest, PutAndNextInterleaved) {
36 EntityData* entity1 = new EntityData(); 37 EntityData* entity1 = new EntityData();
37 EntityData* entity2 = new EntityData(); 38 EntityData* entity2 = new EntityData();
38 EntityData* entity3 = new EntityData(); 39 EntityData* entity3 = new EntityData();
39 40
40 DataBatchImpl batch; 41 DataBatchImpl batch;
41 EXPECT_FALSE(batch.HasNext()); 42 EXPECT_FALSE(batch.HasNext());
42 43
43 batch.Put("one", make_scoped_ptr(entity1)); 44 batch.Put("one", base::WrapUnique(entity1));
44 EXPECT_TRUE(batch.HasNext()); 45 EXPECT_TRUE(batch.HasNext());
45 batch.Put("two", make_scoped_ptr(entity2)); 46 batch.Put("two", base::WrapUnique(entity2));
46 EXPECT_TRUE(batch.HasNext()); 47 EXPECT_TRUE(batch.HasNext());
47 48
48 const TagAndData& pair1 = batch.Next(); 49 const TagAndData& pair1 = batch.Next();
49 EXPECT_TRUE(batch.HasNext()); 50 EXPECT_TRUE(batch.HasNext());
50 EXPECT_EQ("one", pair1.first); 51 EXPECT_EQ("one", pair1.first);
51 EXPECT_EQ(entity1, pair1.second.get()); 52 EXPECT_EQ(entity1, pair1.second.get());
52 53
53 batch.Put("three", make_scoped_ptr(entity3)); 54 batch.Put("three", base::WrapUnique(entity3));
54 EXPECT_TRUE(batch.HasNext()); 55 EXPECT_TRUE(batch.HasNext());
55 56
56 const TagAndData& pair2 = batch.Next(); 57 const TagAndData& pair2 = batch.Next();
57 EXPECT_TRUE(batch.HasNext()); 58 EXPECT_TRUE(batch.HasNext());
58 EXPECT_EQ("two", pair2.first); 59 EXPECT_EQ("two", pair2.first);
59 EXPECT_EQ(entity2, pair2.second.get()); 60 EXPECT_EQ(entity2, pair2.second.get());
60 61
61 const TagAndData& pair3 = batch.Next(); 62 const TagAndData& pair3 = batch.Next();
62 EXPECT_FALSE(batch.HasNext()); 63 EXPECT_FALSE(batch.HasNext());
63 EXPECT_EQ("three", pair3.first); 64 EXPECT_EQ("three", pair3.first);
64 EXPECT_EQ(entity3, pair3.second.get()); 65 EXPECT_EQ(entity3, pair3.second.get());
65 } 66 }
66 67
67 TEST(DataBatchImplTest, PutAndNextSharedTag) { 68 TEST(DataBatchImplTest, PutAndNextSharedTag) {
68 EntityData* entity1 = new EntityData(); 69 EntityData* entity1 = new EntityData();
69 EntityData* entity2 = new EntityData(); 70 EntityData* entity2 = new EntityData();
70 71
71 DataBatchImpl batch; 72 DataBatchImpl batch;
72 EXPECT_FALSE(batch.HasNext()); 73 EXPECT_FALSE(batch.HasNext());
73 74
74 batch.Put("same", make_scoped_ptr(entity1)); 75 batch.Put("same", base::WrapUnique(entity1));
75 EXPECT_TRUE(batch.HasNext()); 76 EXPECT_TRUE(batch.HasNext());
76 batch.Put("same", make_scoped_ptr(entity2)); 77 batch.Put("same", base::WrapUnique(entity2));
77 EXPECT_TRUE(batch.HasNext()); 78 EXPECT_TRUE(batch.HasNext());
78 79
79 const TagAndData& pair1 = batch.Next(); 80 const TagAndData& pair1 = batch.Next();
80 EXPECT_TRUE(batch.HasNext()); 81 EXPECT_TRUE(batch.HasNext());
81 EXPECT_EQ("same", pair1.first); 82 EXPECT_EQ("same", pair1.first);
82 EXPECT_EQ(entity1, pair1.second.get()); 83 EXPECT_EQ(entity1, pair1.second.get());
83 84
84 const TagAndData& pair2 = batch.Next(); 85 const TagAndData& pair2 = batch.Next();
85 EXPECT_FALSE(batch.HasNext()); 86 EXPECT_FALSE(batch.HasNext());
86 EXPECT_EQ("same", pair2.first); 87 EXPECT_EQ("same", pair2.first);
87 EXPECT_EQ(entity2, pair2.second.get()); 88 EXPECT_EQ(entity2, pair2.second.get());
88 } 89 }
89 90
90 } // namespace syncer_v2 91 } // namespace syncer_v2
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698