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

Side by Side Diff: core/fxcrt/cfx_weak_ptr_unittest.cpp

Issue 2385303002: Rename CFX_WeakPtr::Clear() to DestroyObject() (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « core/fxcrt/cfx_weak_ptr.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 PDFium 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 "core/fxcrt/cfx_weak_ptr.h" 5 #include "core/fxcrt/cfx_weak_ptr.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "core/fxcrt/fx_memory.h" 10 #include "core/fxcrt/fx_memory.h"
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 EXPECT_EQ(&thing2, ptr2.Get()); 114 EXPECT_EQ(&thing2, ptr2.Get());
115 EXPECT_FALSE(ptr1 == ptr2); 115 EXPECT_FALSE(ptr1 == ptr2);
116 EXPECT_TRUE(ptr1 != ptr2); 116 EXPECT_TRUE(ptr1 != ptr2);
117 EXPECT_EQ(0, thing1.delete_count()); 117 EXPECT_EQ(0, thing1.delete_count());
118 EXPECT_EQ(0, thing2.delete_count()); 118 EXPECT_EQ(0, thing2.delete_count());
119 } 119 }
120 EXPECT_EQ(1, thing1.delete_count()); 120 EXPECT_EQ(1, thing1.delete_count());
121 EXPECT_EQ(1, thing2.delete_count()); 121 EXPECT_EQ(1, thing2.delete_count());
122 } 122 }
123 123
124 TEST(fxcrt, WeakPtrClear) { 124 TEST(fxcrt, WeakPtrDeleteObject) {
125 PseudoDeletable thing; 125 PseudoDeletable thing;
126 { 126 {
127 UniquePtr unique(&thing); 127 UniquePtr unique(&thing);
128 WeakPtr ptr1(std::move(unique)); 128 WeakPtr ptr1(std::move(unique));
129 WeakPtr ptr2 = ptr1; 129 WeakPtr ptr2 = ptr1;
130 ptr1.Clear(); 130 ptr1.DeleteObject();
131 EXPECT_FALSE(ptr1); 131 EXPECT_FALSE(ptr1);
132 EXPECT_EQ(nullptr, ptr1.Get()); 132 EXPECT_EQ(nullptr, ptr1.Get());
133 EXPECT_FALSE(ptr2); 133 EXPECT_FALSE(ptr2);
134 EXPECT_EQ(nullptr, ptr2.Get()); 134 EXPECT_EQ(nullptr, ptr2.Get());
135 EXPECT_FALSE(ptr1 == ptr2); 135 EXPECT_FALSE(ptr1 == ptr2);
136 EXPECT_TRUE(ptr1 != ptr2); 136 EXPECT_TRUE(ptr1 != ptr2);
137 EXPECT_EQ(1, thing.delete_count()); 137 EXPECT_EQ(1, thing.delete_count());
138 } 138 }
139 EXPECT_EQ(1, thing.delete_count()); 139 EXPECT_EQ(1, thing.delete_count());
140 } 140 }
141 141
142 TEST(fxcrt, WeakPtrCyclic) { 142 TEST(fxcrt, WeakPtrCyclic) {
143 PseudoDeletable thing1; 143 PseudoDeletable thing1;
144 PseudoDeletable thing2; 144 PseudoDeletable thing2;
145 { 145 {
146 UniquePtr unique1(&thing1); 146 UniquePtr unique1(&thing1);
147 UniquePtr unique2(&thing2); 147 UniquePtr unique2(&thing2);
148 WeakPtr ptr1(std::move(unique1)); 148 WeakPtr ptr1(std::move(unique1));
149 WeakPtr ptr2(std::move(unique2)); 149 WeakPtr ptr2(std::move(unique2));
150 ptr1->SetNext(ptr2); 150 ptr1->SetNext(ptr2);
151 ptr2->SetNext(ptr1); 151 ptr2->SetNext(ptr1);
152 } 152 }
153 // Leaks without explicit clear. 153 // Leaks without explicit clear.
154 EXPECT_EQ(0, thing1.delete_count()); 154 EXPECT_EQ(0, thing1.delete_count());
155 EXPECT_EQ(0, thing2.delete_count()); 155 EXPECT_EQ(0, thing2.delete_count());
156 } 156 }
157 157
158 TEST(fxcrt, WeakPtrCyclicClear) { 158 TEST(fxcrt, WeakPtrCyclicDeleteObject) {
159 PseudoDeletable thing1; 159 PseudoDeletable thing1;
160 PseudoDeletable thing2; 160 PseudoDeletable thing2;
161 { 161 {
162 UniquePtr unique1(&thing1); 162 UniquePtr unique1(&thing1);
163 UniquePtr unique2(&thing2); 163 UniquePtr unique2(&thing2);
164 WeakPtr ptr1(std::move(unique1)); 164 WeakPtr ptr1(std::move(unique1));
165 WeakPtr ptr2(std::move(unique2)); 165 WeakPtr ptr2(std::move(unique2));
166 ptr1->SetNext(ptr2); 166 ptr1->SetNext(ptr2);
167 ptr2->SetNext(ptr1); 167 ptr2->SetNext(ptr1);
168 ptr1.Clear(); 168 ptr1.DeleteObject();
169 EXPECT_EQ(1, thing1.delete_count()); 169 EXPECT_EQ(1, thing1.delete_count());
170 EXPECT_EQ(0, thing2.delete_count()); 170 EXPECT_EQ(0, thing2.delete_count());
171 } 171 }
172 EXPECT_EQ(1, thing1.delete_count()); 172 EXPECT_EQ(1, thing1.delete_count());
173 EXPECT_EQ(1, thing2.delete_count()); 173 EXPECT_EQ(1, thing2.delete_count());
174 } 174 }
OLDNEW
« no previous file with comments | « core/fxcrt/cfx_weak_ptr.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698