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

Unified Diff: chrome/browser/prefs/overlay_user_pref_store_unittest.cc

Issue 11243002: Move the bits of Prefs where production code has only trivially easy (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments, fix gypi problem Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/overlay_user_pref_store.cc ('k') | chrome/browser/prefs/pref_notifier.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/overlay_user_pref_store_unittest.cc
diff --git a/chrome/browser/prefs/overlay_user_pref_store_unittest.cc b/chrome/browser/prefs/overlay_user_pref_store_unittest.cc
deleted file mode 100644
index 18d10a09209d2a8a97822dd813ae8fa2cad53f7b..0000000000000000000000000000000000000000
--- a/chrome/browser/prefs/overlay_user_pref_store_unittest.cc
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/values.h"
-#include "chrome/browser/prefs/overlay_user_pref_store.h"
-#include "chrome/browser/prefs/testing_pref_store.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/pref_store_observer_mock.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using ::testing::Mock;
-using ::testing::StrEq;
-
-namespace {
-
-const char* overlay_key = prefs::kBrowserWindowPlacement;
-const char* regular_key = prefs::kShowBookmarkBar;
-// With the removal of the kWebKitGlobalXXX prefs, we'll no longer have real
-// prefs using the overlay pref store, so make up keys here.
-const char* mapped_overlay_key = "test.per_tab.javascript_enabled";
-const char* mapped_underlay_key = "test.per_profile.javascript_enabled";
-
-} // namespace
-
-class OverlayUserPrefStoreTest : public testing::Test {
- protected:
- OverlayUserPrefStoreTest()
- : underlay_(new TestingPrefStore()),
- overlay_(new OverlayUserPrefStore(underlay_.get())) {
- overlay_->RegisterOverlayPref(overlay_key);
- overlay_->RegisterOverlayPref(mapped_overlay_key, mapped_underlay_key);
- }
-
- virtual ~OverlayUserPrefStoreTest() {}
-
- scoped_refptr<TestingPrefStore> underlay_;
- scoped_refptr<OverlayUserPrefStore> overlay_;
-};
-
-TEST_F(OverlayUserPrefStoreTest, Observer) {
- PrefStoreObserverMock obs;
- overlay_->AddObserver(&obs);
-
- // Check that underlay first value is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that underlay overwriting is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(43));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that overwriting change in overlay is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(44));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that hidden underlay change is not reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(45));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that overlay remove is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- overlay_->RemoveValue(overlay_key);
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that underlay remove is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(1);
- underlay_->RemoveValue(overlay_key);
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check respecting of silence.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- overlay_->SetValueSilently(overlay_key, Value::CreateIntegerValue(46));
- Mock::VerifyAndClearExpectations(&obs);
-
- overlay_->RemoveObserver(&obs);
-
- // Check successful unsubscription.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(overlay_key))).Times(0);
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(48));
- Mock::VerifyAndClearExpectations(&obs);
-}
-
-TEST_F(OverlayUserPrefStoreTest, GetAndSet) {
- const Value* value = NULL;
- EXPECT_EQ(PrefStore::READ_NO_VALUE,
- overlay_->GetValue(overlay_key, &value));
- EXPECT_EQ(PrefStore::READ_NO_VALUE,
- underlay_->GetValue(overlay_key, &value));
-
- underlay_->SetValue(overlay_key, Value::CreateIntegerValue(42));
-
- // Value shines through:
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
-
- EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
-
- overlay_->SetValue(overlay_key, Value::CreateIntegerValue(43));
-
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
-
- EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
-
- overlay_->RemoveValue(overlay_key);
-
- // Value shines through:
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
-
- EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(42).Equals(value));
-}
-
-// Check that GetMutableValue does not return the dictionary of the underlay.
-TEST_F(OverlayUserPrefStoreTest, ModifyDictionaries) {
- underlay_->SetValue(overlay_key, new DictionaryValue);
-
- Value* modify = NULL;
- EXPECT_EQ(PrefStore::READ_OK,
- overlay_->GetMutableValue(overlay_key, &modify));
- ASSERT_TRUE(modify);
- ASSERT_TRUE(modify->IsType(Value::TYPE_DICTIONARY));
- static_cast<DictionaryValue*>(modify)->SetInteger(overlay_key, 42);
-
- Value* original_in_underlay = NULL;
- EXPECT_EQ(PrefStore::READ_OK,
- underlay_->GetMutableValue(overlay_key, &original_in_underlay));
- ASSERT_TRUE(original_in_underlay);
- ASSERT_TRUE(original_in_underlay->IsType(Value::TYPE_DICTIONARY));
- EXPECT_TRUE(static_cast<DictionaryValue*>(original_in_underlay)->empty());
-
- Value* modified = NULL;
- EXPECT_EQ(PrefStore::READ_OK,
- overlay_->GetMutableValue(overlay_key, &modified));
- ASSERT_TRUE(modified);
- ASSERT_TRUE(modified->IsType(Value::TYPE_DICTIONARY));
- EXPECT_TRUE(Value::Equals(modify, static_cast<DictionaryValue*>(modified)));
-}
-
-// Here we consider a global preference that is not overlayed.
-TEST_F(OverlayUserPrefStoreTest, GlobalPref) {
- PrefStoreObserverMock obs;
- overlay_->AddObserver(&obs);
-
- const Value* value = NULL;
-
- // Check that underlay first value is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(42));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that underlay overwriting is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(43));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that we get this value from the overlay
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
-
- // Check that overwriting change in overlay is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- overlay_->SetValue(regular_key, Value::CreateIntegerValue(44));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that we get this value from the overlay and the underlay.
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
- EXPECT_EQ(PrefStore::READ_OK, underlay_->GetValue(regular_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
-
- // Check that overlay remove is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(1);
- overlay_->RemoveValue(regular_key);
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that value was removed from overlay and underlay
- EXPECT_EQ(PrefStore::READ_NO_VALUE, overlay_->GetValue(regular_key, &value));
- EXPECT_EQ(PrefStore::READ_NO_VALUE, underlay_->GetValue(regular_key, &value));
-
- // Check respecting of silence.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0);
- overlay_->SetValueSilently(regular_key, Value::CreateIntegerValue(46));
- Mock::VerifyAndClearExpectations(&obs);
-
- overlay_->RemoveObserver(&obs);
-
- // Check successful unsubscription.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(regular_key))).Times(0);
- underlay_->SetValue(regular_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(regular_key, Value::CreateIntegerValue(48));
- Mock::VerifyAndClearExpectations(&obs);
-}
-
-// Check that names mapping works correctly.
-TEST_F(OverlayUserPrefStoreTest, NamesMapping) {
- PrefStoreObserverMock obs;
- overlay_->AddObserver(&obs);
-
- const Value* value = NULL;
-
- // Check that if there is no override in the overlay, changing underlay value
- // is reported as changing an overlay value.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(42));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that underlay overwriting is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(43));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that we get this value from the overlay with both keys
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(mapped_overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
- // In this case, overlay reads directly from the underlay.
- EXPECT_EQ(PrefStore::READ_OK,
- overlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
-
- // Check that overwriting change in overlay is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(44));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that we get an overriden value from overlay, while reading the
- // value from underlay still holds an old value.
- EXPECT_EQ(PrefStore::READ_OK, overlay_->GetValue(mapped_overlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(44).Equals(value));
- EXPECT_EQ(PrefStore::READ_OK,
- overlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
- EXPECT_EQ(PrefStore::READ_OK,
- underlay_->GetValue(mapped_underlay_key, &value));
- EXPECT_TRUE(base::FundamentalValue(43).Equals(value));
-
- // Check that hidden underlay change is not reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(45));
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that overlay remove is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- overlay_->RemoveValue(mapped_overlay_key);
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that underlay remove is reported.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(1);
- underlay_->RemoveValue(mapped_underlay_key);
- Mock::VerifyAndClearExpectations(&obs);
-
- // Check that value was removed.
- EXPECT_EQ(PrefStore::READ_NO_VALUE,
- overlay_->GetValue(mapped_overlay_key, &value));
- EXPECT_EQ(PrefStore::READ_NO_VALUE,
- overlay_->GetValue(mapped_underlay_key, &value));
-
- // Check respecting of silence.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0);
- overlay_->SetValueSilently(mapped_overlay_key, Value::CreateIntegerValue(46));
- Mock::VerifyAndClearExpectations(&obs);
-
- overlay_->RemoveObserver(&obs);
-
- // Check successful unsubscription.
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_overlay_key))).Times(0);
- EXPECT_CALL(obs, OnPrefValueChanged(StrEq(mapped_underlay_key))).Times(0);
- underlay_->SetValue(mapped_underlay_key, Value::CreateIntegerValue(47));
- overlay_->SetValue(mapped_overlay_key, Value::CreateIntegerValue(48));
- Mock::VerifyAndClearExpectations(&obs);
-}
« no previous file with comments | « chrome/browser/prefs/overlay_user_pref_store.cc ('k') | chrome/browser/prefs/pref_notifier.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698