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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/policy_service_unittest.cc

Issue 10386097: Refactored ConfigurationPolicyProvider to provide PolicyBundles instead of PolicyMaps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased patch Created 8 years, 7 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
« chrome/browser/policy/policy_service_impl.cc ('K') | « chrome/browser/policy/policy_service_stub.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/policy_service_unittest.cc
diff --git a/chrome/browser/policy/policy_service_unittest.cc b/chrome/browser/policy/policy_service_unittest.cc
index 27cf3b3435c4ee37b1636665988e29761eb98759..d1ca0429ab0f641e926b7ab7e4652dfa392130c2 100644
--- a/chrome/browser/policy/policy_service_unittest.cc
+++ b/chrome/browser/policy/policy_service_unittest.cc
@@ -52,13 +52,6 @@ class PolicyServiceTest : public testing::Test {
PolicyServiceTest() {}
void SetUp() OVERRIDE {
- EXPECT_CALL(provider0_, ProvideInternal(_))
- .WillRepeatedly(CopyPolicyMap(&policy0_));
- EXPECT_CALL(provider1_, ProvideInternal(_))
- .WillRepeatedly(CopyPolicyMap(&policy1_));
- EXPECT_CALL(provider2_, ProvideInternal(_))
- .WillRepeatedly(CopyPolicyMap(&policy2_));
-
EXPECT_CALL(provider0_, IsInitializationComplete())
.WillRepeatedly(Return(true));
EXPECT_CALL(provider1_, IsInitializationComplete())
@@ -68,6 +61,7 @@ class PolicyServiceTest : public testing::Test {
policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(13));
+ provider0_.UpdateProviderChromePolicy(policy0_);
PolicyServiceImpl::Providers providers;
providers.push_back(&provider0_);
@@ -85,9 +79,7 @@ class PolicyServiceTest : public testing::Test {
bool VerifyPolicies(PolicyDomain domain,
const std::string& component_id,
const PolicyMap& expected) {
- const PolicyMap* policies =
- policy_service_->GetPolicies(domain, component_id);
- return policies && policies->Equals(expected);
+ return policy_service_->GetPolicies(domain, component_id).Equals(expected);
}
protected:
@@ -127,12 +119,12 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
EXPECT_CALL(observer, OnPolicyUpdated(POLICY_DOMAIN_CHROME, "",
PolicyEquals(&expectedPrevious),
PolicyEquals(&expectedCurrent)));
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
// No changes.
EXPECT_CALL(observer, OnPolicyUpdated(_, _, _, _)).Times(0);
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expectedCurrent));
@@ -145,7 +137,7 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
EXPECT_CALL(observer, OnPolicyUpdated(POLICY_DOMAIN_CHROME, "",
PolicyEquals(&expectedPrevious),
PolicyEquals(&expectedCurrent)));
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
// Removed policy.
@@ -155,7 +147,7 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
EXPECT_CALL(observer, OnPolicyUpdated(POLICY_DOMAIN_CHROME, "",
PolicyEquals(&expectedPrevious),
PolicyEquals(&expectedCurrent)));
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
// Changed policy.
@@ -168,12 +160,12 @@ TEST_F(PolicyServiceTest, NotifyObservers) {
EXPECT_CALL(observer, OnPolicyUpdated(POLICY_DOMAIN_CHROME, "",
PolicyEquals(&expectedPrevious),
PolicyEquals(&expectedCurrent)));
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
// No changes again.
EXPECT_CALL(observer, OnPolicyUpdated(_, _, _, _)).Times(0);
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(&observer);
EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expectedCurrent));
@@ -192,22 +184,22 @@ TEST_F(PolicyServiceTest, Priorities) {
base::Value::CreateIntegerValue(1));
policy2_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(2));
- provider0_.NotifyPolicyUpdated();
- provider1_.NotifyPolicyUpdated();
- provider2_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
+ provider1_.UpdateProviderChromePolicy(policy1_);
+ provider2_.UpdateProviderChromePolicy(policy2_);
EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expected));
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(1));
policy0_.Erase("aaa");
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expected));
expected.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(2));
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
base::Value::CreateIntegerValue(1));
- provider1_.NotifyPolicyUpdated();
+ provider1_.UpdateProviderChromePolicy(policy1_);
EXPECT_TRUE(VerifyPolicies(POLICY_DOMAIN_CHROME, "", expected));
}
@@ -231,14 +223,14 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
EXPECT_CALL(*this, OnPolicyValueUpdated(NULL, ValueEquals(&kValue0)));
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue0.DeepCopy());
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this);
// Changing other values doesn't trigger a notification.
EXPECT_CALL(*this, OnPolicyValueUpdated(_, _)).Times(0);
policy0_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue0.DeepCopy());
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this);
// Modifying the value triggers a notification.
@@ -247,13 +239,13 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
ValueEquals(&kValue1)));
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue1.DeepCopy());
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this);
// Removing the value triggers a notification.
EXPECT_CALL(*this, OnPolicyValueUpdated(ValueEquals(&kValue1), NULL));
policy0_.Erase("aaa");
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this);
// No more notifications after destroying the registrar.
@@ -263,7 +255,7 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
kValue1.DeepCopy());
policy0_.Set("pre", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue1.DeepCopy());
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
Mock::VerifyAndClearExpectations(this);
}
@@ -288,7 +280,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
base::FundamentalValue kValue0(0);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue0.DeepCopy());
- provider0_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
loop.RunAllPending();
Mock::VerifyAndClearExpectations(this);
@@ -296,7 +288,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
base::FundamentalValue kValue1(1);
policy1_.Set("aaa", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
kValue1.DeepCopy());
- provider1_.NotifyPolicyUpdated();
+ provider1_.UpdateProviderChromePolicy(policy1_);
loop.RunAllPending();
Mock::VerifyAndClearExpectations(this);
@@ -306,7 +298,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
policy1_.Set("bbb", POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER,
kValue1.DeepCopy());
- provider1_.NotifyPolicyUpdated();
+ provider1_.UpdateProviderChromePolicy(policy1_);
loop.RunAllPending();
Mock::VerifyAndClearExpectations(this);
@@ -322,7 +314,7 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
EXPECT_CALL(*this, OnPolicyRefresh()).Times(0);
policy2_.Set("bbb", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue0.DeepCopy());
- provider2_.NotifyPolicyUpdated();
+ provider2_.UpdateProviderChromePolicy(policy2_);
loop.RunAllPending();
Mock::VerifyAndClearExpectations(this);
@@ -331,16 +323,15 @@ TEST_F(PolicyServiceTest, RefreshPolicies) {
base::FundamentalValue kValue2(2);
policy0_.Set("aaa", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
kValue2.DeepCopy());
- provider0_.NotifyPolicyUpdated();
- provider1_.NotifyPolicyUpdated();
+ provider0_.UpdateProviderChromePolicy(policy0_);
+ provider1_.UpdateProviderChromePolicy(policy1_);
loop.RunAllPending();
Mock::VerifyAndClearExpectations(this);
- const PolicyMap* policies = policy_service_->GetPolicies(
+ const PolicyMap& policies = policy_service_->GetPolicies(
POLICY_DOMAIN_CHROME, "");
- ASSERT_TRUE(policies);
- EXPECT_TRUE(base::Value::Equals(&kValue2, policies->GetValue("aaa")));
- EXPECT_TRUE(base::Value::Equals(&kValue0, policies->GetValue("bbb")));
+ EXPECT_TRUE(base::Value::Equals(&kValue2, policies.GetValue("aaa")));
+ EXPECT_TRUE(base::Value::Equals(&kValue0, policies.GetValue("bbb")));
}
} // namespace policy
« chrome/browser/policy/policy_service_impl.cc ('K') | « chrome/browser/policy/policy_service_stub.cc ('k') | chrome/browser/prefs/proxy_policy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698