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

Side by Side Diff: extensions/browser/api/storage/settings_quota_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/json/json_writer.h" 5 #include "base/json/json_writer.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "extensions/browser/api/storage/settings_storage_quota_enforcer.h" 9 #include "extensions/browser/api/storage/settings_storage_quota_enforcer.h"
10 #include "extensions/browser/value_store/testing_value_store.h" 10 #include "extensions/browser/value_store/testing_value_store.h"
(...skipping 26 matching lines...) Expand all
37 void ValidateByteValues() { 37 void ValidateByteValues() {
38 std::string validate_sizes; 38 std::string validate_sizes;
39 base::JSONWriter::Write(byte_value_1_.get(), &validate_sizes); 39 base::JSONWriter::Write(byte_value_1_.get(), &validate_sizes);
40 ASSERT_EQ(1u, validate_sizes.size()); 40 ASSERT_EQ(1u, validate_sizes.size());
41 base::JSONWriter::Write(byte_value_16_.get(), &validate_sizes); 41 base::JSONWriter::Write(byte_value_16_.get(), &validate_sizes);
42 ASSERT_EQ(16u, validate_sizes.size()); 42 ASSERT_EQ(16u, validate_sizes.size());
43 base::JSONWriter::Write(byte_value_256_.get(), &validate_sizes); 43 base::JSONWriter::Write(byte_value_256_.get(), &validate_sizes);
44 ASSERT_EQ(256u, validate_sizes.size()); 44 ASSERT_EQ(256u, validate_sizes.size());
45 } 45 }
46 46
47 virtual void TearDown() OVERRIDE { 47 virtual void TearDown() OVERRIDE { ASSERT_TRUE(storage_.get() != nullptr); }
48 ASSERT_TRUE(storage_.get() != NULL);
49 }
50 48
51 protected: 49 protected:
52 // Creates |storage_|. Must only be called once. 50 // Creates |storage_|. Must only be called once.
53 void CreateStorage( 51 void CreateStorage(
54 size_t quota_bytes, size_t quota_bytes_per_item, size_t max_items) { 52 size_t quota_bytes, size_t quota_bytes_per_item, size_t max_items) {
55 ASSERT_TRUE(storage_.get() == NULL); 53 ASSERT_TRUE(storage_.get() == nullptr);
56 SettingsStorageQuotaEnforcer::Limits limits = 54 SettingsStorageQuotaEnforcer::Limits limits =
57 { quota_bytes, quota_bytes_per_item, max_items }; 55 { quota_bytes, quota_bytes_per_item, max_items };
58 storage_.reset(new SettingsStorageQuotaEnforcer(limits, delegate_)); 56 storage_.reset(new SettingsStorageQuotaEnforcer(limits, delegate_));
59 } 57 }
60 58
61 // Returns whether the settings in |storage_| and |delegate_| are the same as 59 // Returns whether the settings in |storage_| and |delegate_| are the same as
62 // |settings|. 60 // |settings|.
63 bool SettingsEqual(const base::DictionaryValue& settings) { 61 bool SettingsEqual(const base::DictionaryValue& settings) {
64 return settings.Equals(&storage_->Get()->settings()) && 62 return settings.Equals(&storage_->Get()->settings()) &&
65 settings.Equals(&delegate_->Get()->settings()); 63 settings.Equals(&delegate_->Get()->settings());
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 CreateStorage(266, UINT_MAX, 2); 184 CreateStorage(266, UINT_MAX, 2);
187 185
188 storage_->Set(DEFAULTS, "b", *byte_value_16_); 186 storage_->Set(DEFAULTS, "b", *byte_value_16_);
189 settings.Set("b", byte_value_16_->DeepCopy()); 187 settings.Set("b", byte_value_16_->DeepCopy());
190 // Not enough quota. 188 // Not enough quota.
191 storage_->Set(DEFAULTS, "c", *byte_value_256_); 189 storage_->Set(DEFAULTS, "c", *byte_value_256_);
192 EXPECT_TRUE(SettingsEqual(settings)); 190 EXPECT_TRUE(SettingsEqual(settings));
193 191
194 // Try again with "b" removed, enough quota. 192 // Try again with "b" removed, enough quota.
195 EXPECT_FALSE(storage_->Remove("b")->HasError()); 193 EXPECT_FALSE(storage_->Remove("b")->HasError());
196 settings.Remove("b", NULL); 194 settings.Remove("b", nullptr);
197 EXPECT_FALSE(storage_->Set(DEFAULTS, "c", *byte_value_256_)->HasError()); 195 EXPECT_FALSE(storage_->Set(DEFAULTS, "c", *byte_value_256_)->HasError());
198 settings.Set("c", byte_value_256_->DeepCopy()); 196 settings.Set("c", byte_value_256_->DeepCopy());
199 EXPECT_TRUE(SettingsEqual(settings)); 197 EXPECT_TRUE(SettingsEqual(settings));
200 198
201 // Enough byte quota but max keys not high enough. 199 // Enough byte quota but max keys not high enough.
202 EXPECT_FALSE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError()); 200 EXPECT_FALSE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError());
203 settings.Set("a", byte_value_1_->DeepCopy()); 201 settings.Set("a", byte_value_1_->DeepCopy());
204 EXPECT_TRUE(SettingsEqual(settings)); 202 EXPECT_TRUE(SettingsEqual(settings));
205 203
206 EXPECT_TRUE(storage_->Set(DEFAULTS, "b", *byte_value_1_)->HasError()); 204 EXPECT_TRUE(storage_->Set(DEFAULTS, "b", *byte_value_1_)->HasError());
207 EXPECT_TRUE(SettingsEqual(settings)); 205 EXPECT_TRUE(SettingsEqual(settings));
208 206
209 // Back under max keys. 207 // Back under max keys.
210 EXPECT_FALSE(storage_->Remove("a")->HasError()); 208 EXPECT_FALSE(storage_->Remove("a")->HasError());
211 settings.Remove("a", NULL); 209 settings.Remove("a", nullptr);
212 EXPECT_FALSE(storage_->Set(DEFAULTS, "b", *byte_value_1_)->HasError()); 210 EXPECT_FALSE(storage_->Set(DEFAULTS, "b", *byte_value_1_)->HasError());
213 settings.Set("b", byte_value_1_->DeepCopy()); 211 settings.Set("b", byte_value_1_->DeepCopy());
214 EXPECT_TRUE(SettingsEqual(settings)); 212 EXPECT_TRUE(SettingsEqual(settings));
215 } 213 }
216 214
217 TEST_F(ExtensionSettingsQuotaTest, RemovingNonexistentSettings) { 215 TEST_F(ExtensionSettingsQuotaTest, RemovingNonexistentSettings) {
218 base::DictionaryValue settings; 216 base::DictionaryValue settings;
219 CreateStorage(36, UINT_MAX, 3); 217 CreateStorage(36, UINT_MAX, 3);
220 218
221 // Max out bytes. 219 // Max out bytes.
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
388 settings.Set("c", byte_value_16_->DeepCopy()); 386 settings.Set("c", byte_value_16_->DeepCopy());
389 EXPECT_TRUE(SettingsEqual(settings)); 387 EXPECT_TRUE(SettingsEqual(settings));
390 388
391 // Remove to free up some more data. 389 // Remove to free up some more data.
392 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_256_)->HasError()); 390 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_256_)->HasError());
393 391
394 std::vector<std::string> to_remove; 392 std::vector<std::string> to_remove;
395 to_remove.push_back("a"); 393 to_remove.push_back("a");
396 to_remove.push_back("b"); 394 to_remove.push_back("b");
397 storage_->Remove(to_remove); 395 storage_->Remove(to_remove);
398 settings.Remove("a", NULL); 396 settings.Remove("a", nullptr);
399 settings.Remove("b", NULL); 397 settings.Remove("b", nullptr);
400 EXPECT_TRUE(SettingsEqual(settings)); 398 EXPECT_TRUE(SettingsEqual(settings));
401 399
402 EXPECT_FALSE(storage_->Set(DEFAULTS, "d", *byte_value_256_)->HasError()); 400 EXPECT_FALSE(storage_->Set(DEFAULTS, "d", *byte_value_256_)->HasError());
403 settings.Set("d", byte_value_256_->DeepCopy()); 401 settings.Set("d", byte_value_256_->DeepCopy());
404 EXPECT_TRUE(SettingsEqual(settings)); 402 EXPECT_TRUE(SettingsEqual(settings));
405 } 403 }
406 404
407 TEST_F(ExtensionSettingsQuotaTest, WithInitialDataAndMaxKeys) { 405 TEST_F(ExtensionSettingsQuotaTest, WithInitialDataAndMaxKeys) {
408 base::DictionaryValue settings; 406 base::DictionaryValue settings;
409 delegate_->Set(DEFAULTS, "a", *byte_value_1_); 407 delegate_->Set(DEFAULTS, "a", *byte_value_1_);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
451 CreateStorage(UINT_MAX, UINT_MAX, 2); 449 CreateStorage(UINT_MAX, UINT_MAX, 2);
452 EXPECT_TRUE(SettingsEqual(settings)); 450 EXPECT_TRUE(SettingsEqual(settings));
453 451
454 // Can't set either an existing or new setting. 452 // Can't set either an existing or new setting.
455 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_16_)->HasError()); 453 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_16_)->HasError());
456 EXPECT_TRUE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError()); 454 EXPECT_TRUE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError());
457 EXPECT_TRUE(SettingsEqual(settings)); 455 EXPECT_TRUE(SettingsEqual(settings));
458 456
459 // Should be able after removing 2. 457 // Should be able after removing 2.
460 storage_->Remove("a"); 458 storage_->Remove("a");
461 settings.Remove("a", NULL); 459 settings.Remove("a", nullptr);
462 storage_->Remove("b"); 460 storage_->Remove("b");
463 settings.Remove("b", NULL); 461 settings.Remove("b", nullptr);
464 EXPECT_TRUE(SettingsEqual(settings)); 462 EXPECT_TRUE(SettingsEqual(settings));
465 463
466 EXPECT_FALSE(storage_->Set(DEFAULTS, "e", *byte_value_1_)->HasError()); 464 EXPECT_FALSE(storage_->Set(DEFAULTS, "e", *byte_value_1_)->HasError());
467 settings.Set("e", byte_value_1_->DeepCopy()); 465 settings.Set("e", byte_value_1_->DeepCopy());
468 EXPECT_TRUE(SettingsEqual(settings)); 466 EXPECT_TRUE(SettingsEqual(settings));
469 467
470 // Still can't set any. 468 // Still can't set any.
471 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_16_)->HasError()); 469 EXPECT_TRUE(storage_->Set(DEFAULTS, "d", *byte_value_16_)->HasError());
472 EXPECT_TRUE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError()); 470 EXPECT_TRUE(storage_->Set(DEFAULTS, "a", *byte_value_1_)->HasError());
473 EXPECT_TRUE(SettingsEqual(settings)); 471 EXPECT_TRUE(SettingsEqual(settings));
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 586
589 storage_->Set(DEFAULTS, "c", *byte_value_1_); 587 storage_->Set(DEFAULTS, "c", *byte_value_1_);
590 588
591 EXPECT_EQ(6u, storage_->GetBytesInUse()); 589 EXPECT_EQ(6u, storage_->GetBytesInUse());
592 EXPECT_EQ(2u, storage_->GetBytesInUse("a")); 590 EXPECT_EQ(2u, storage_->GetBytesInUse("a"));
593 EXPECT_EQ(2u, storage_->GetBytesInUse("b")); 591 EXPECT_EQ(2u, storage_->GetBytesInUse("b"));
594 EXPECT_EQ(4u, storage_->GetBytesInUse(ab)); 592 EXPECT_EQ(4u, storage_->GetBytesInUse(ab));
595 } 593 }
596 594
597 } // namespace extensions 595 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698