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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/settings/device_settings_service_unittest.cc

Issue 14927015: Translate device-local account IDs to user IDs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed DeviceLocalAccountTest. Created 7 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/chromeos/policy/device_local_account_policy_service_unittest.cc ('K') | « chrome/browser/chromeos/settings/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/settings/device_settings_service_unittest.cc
diff --git a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
index 990b2bb25f0ab8975765db8245b3667c74f361ee..f83db2da442c7cd0c2d1e14fa0f8d56b2219aa77 100644
--- a/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_service_unittest.cc
@@ -58,12 +58,13 @@ class DeviceSettingsServiceTest : public DeviceSettingsTestBase {
}
void CheckPolicy() {
- ASSERT_TRUE(device_settings_service_.policy_data());
+ ASSERT_TRUE(DeviceSettingsService::Get()->policy_data());
EXPECT_EQ(device_policy_.policy_data().SerializeAsString(),
- device_settings_service_.policy_data()->SerializeAsString());
- ASSERT_TRUE(device_settings_service_.device_settings());
- EXPECT_EQ(device_policy_.payload().SerializeAsString(),
- device_settings_service_.device_settings()->SerializeAsString());
+ DeviceSettingsService::Get()->policy_data()->SerializeAsString());
+ ASSERT_TRUE(DeviceSettingsService::Get()->device_settings());
+ EXPECT_EQ(
+ device_policy_.payload().SerializeAsString(),
+ DeviceSettingsService::Get()->device_settings()->SerializeAsString());
}
bool operation_completed_;
@@ -79,9 +80,9 @@ TEST_F(DeviceSettingsServiceTest, LoadNoKey) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
- device_settings_service_.status());
- EXPECT_FALSE(device_settings_service_.policy_data());
- EXPECT_FALSE(device_settings_service_.device_settings());
+ DeviceSettingsService::Get()->status());
+ EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
+ EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
}
TEST_F(DeviceSettingsServiceTest, LoadNoPolicy) {
@@ -89,9 +90,9 @@ TEST_F(DeviceSettingsServiceTest, LoadNoPolicy) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_NO_POLICY,
- device_settings_service_.status());
- EXPECT_FALSE(device_settings_service_.policy_data());
- EXPECT_FALSE(device_settings_service_.device_settings());
+ DeviceSettingsService::Get()->status());
+ EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
+ EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
}
TEST_F(DeviceSettingsServiceTest, LoadValidationError) {
@@ -101,9 +102,9 @@ TEST_F(DeviceSettingsServiceTest, LoadValidationError) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_VALIDATION_ERROR,
- device_settings_service_.status());
- EXPECT_FALSE(device_settings_service_.policy_data());
- EXPECT_FALSE(device_settings_service_.device_settings());
+ DeviceSettingsService::Get()->status());
+ EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
+ EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
}
TEST_F(DeviceSettingsServiceTest, LoadValidationErrorFutureTimestamp) {
@@ -117,46 +118,47 @@ TEST_F(DeviceSettingsServiceTest, LoadValidationErrorFutureTimestamp) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_TEMP_VALIDATION_ERROR,
- device_settings_service_.status());
- EXPECT_FALSE(device_settings_service_.policy_data());
- EXPECT_FALSE(device_settings_service_.device_settings());
+ DeviceSettingsService::Get()->status());
+ EXPECT_FALSE(DeviceSettingsService::Get()->policy_data());
+ EXPECT_FALSE(DeviceSettingsService::Get()->device_settings());
}
TEST_F(DeviceSettingsServiceTest, LoadSuccess) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
CheckPolicy();
}
TEST_F(DeviceSettingsServiceTest, SignAndStoreNoKey) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings(
new em::ChromeDeviceSettingsProto(device_policy_.payload()));
new_device_settings->mutable_device_policy_refresh_rate()->
set_device_policy_refresh_rate(300);
- device_settings_service_.SignAndStore(
+ DeviceSettingsService::Get()->SignAndStore(
new_device_settings.Pass(),
base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
base::Unretained(this)));
FlushDeviceSettings();
EXPECT_TRUE(operation_completed_);
EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
CheckPolicy();
}
TEST_F(DeviceSettingsServiceTest, SignAndStoreFailure) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
owner_key_util_->SetPrivateKey(device_policy_.signing_key());
- device_settings_service_.SetUsername(device_policy_.policy_data().username());
+ DeviceSettingsService::Get()->SetUsername(
+ device_policy_.policy_data().username());
FlushDeviceSettings();
scoped_ptr<em::ChromeDeviceSettingsProto> new_device_settings(
@@ -164,30 +166,31 @@ TEST_F(DeviceSettingsServiceTest, SignAndStoreFailure) {
new_device_settings->mutable_device_policy_refresh_rate()->
set_device_policy_refresh_rate(300);
device_settings_test_helper_.set_store_result(false);
- device_settings_service_.SignAndStore(
+ DeviceSettingsService::Get()->SignAndStore(
new_device_settings.Pass(),
base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
base::Unretained(this)));
FlushDeviceSettings();
EXPECT_TRUE(operation_completed_);
EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
CheckPolicy();
}
TEST_F(DeviceSettingsServiceTest, SignAndStoreSuccess) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
owner_key_util_->SetPrivateKey(device_policy_.signing_key());
- device_settings_service_.SetUsername(device_policy_.policy_data().username());
+ DeviceSettingsService::Get()->SetUsername(
+ device_policy_.policy_data().username());
FlushDeviceSettings();
device_policy_.payload().mutable_device_policy_refresh_rate()->
set_device_policy_refresh_rate(300);
device_policy_.Build();
- device_settings_service_.SignAndStore(
+ DeviceSettingsService::Get()->SignAndStore(
scoped_ptr<em::ChromeDeviceSettingsProto>(
new em::ChromeDeviceSettingsProto(device_policy_.payload())),
base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
@@ -195,10 +198,11 @@ TEST_F(DeviceSettingsServiceTest, SignAndStoreSuccess) {
FlushDeviceSettings();
EXPECT_TRUE(operation_completed_);
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
- ASSERT_TRUE(device_settings_service_.device_settings());
- EXPECT_EQ(device_policy_.payload().SerializeAsString(),
- device_settings_service_.device_settings()->SerializeAsString());
+ DeviceSettingsService::Get()->status());
+ ASSERT_TRUE(DeviceSettingsService::Get()->device_settings());
+ EXPECT_EQ(
+ device_policy_.payload().SerializeAsString(),
+ DeviceSettingsService::Get()->device_settings()->SerializeAsString());
}
TEST_F(DeviceSettingsServiceTest, StoreFailure) {
@@ -206,17 +210,17 @@ TEST_F(DeviceSettingsServiceTest, StoreFailure) {
device_settings_test_helper_.set_policy_blob(std::string());
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
device_settings_test_helper_.set_store_result(false);
- device_settings_service_.Store(
+ DeviceSettingsService::Get()->Store(
device_policy_.GetCopy(),
base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
base::Unretained(this)));
FlushDeviceSettings();
EXPECT_TRUE(operation_completed_);
EXPECT_EQ(DeviceSettingsService::STORE_OPERATION_FAILED,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
}
TEST_F(DeviceSettingsServiceTest, StoreSuccess) {
@@ -224,98 +228,100 @@ TEST_F(DeviceSettingsServiceTest, StoreSuccess) {
device_settings_test_helper_.set_policy_blob(std::string());
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_KEY_UNAVAILABLE,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
- device_settings_service_.Store(
+ DeviceSettingsService::Get()->Store(
device_policy_.GetCopy(),
base::Bind(&DeviceSettingsServiceTest::SetOperationCompleted,
base::Unretained(this)));
FlushDeviceSettings();
EXPECT_TRUE(operation_completed_);
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
CheckPolicy();
}
TEST_F(DeviceSettingsServiceTest, StoreRotation) {
ReloadDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
device_policy_.payload().mutable_device_policy_refresh_rate()->
set_device_policy_refresh_rate(300);
device_policy_.set_new_signing_key(
policy::PolicyBuilder::CreateTestNewSigningKey());
device_policy_.Build();
- device_settings_service_.Store(device_policy_.GetCopy(), base::Closure());
+ DeviceSettingsService::Get()->Store(device_policy_.GetCopy(),
+ base::Closure());
FlushDeviceSettings();
owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.new_signing_key());
- device_settings_service_.OwnerKeySet(true);
+ DeviceSettingsService::Get()->OwnerKeySet(true);
FlushDeviceSettings();
EXPECT_EQ(DeviceSettingsService::STORE_SUCCESS,
- device_settings_service_.status());
+ DeviceSettingsService::Get()->status());
CheckPolicy();
// Check the new key has been loaded.
std::vector<uint8> key;
ASSERT_TRUE(device_policy_.new_signing_key()->ExportPublicKey(&key));
- EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
+ EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
}
TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {
owner_key_util_->Clear();
- EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
- EXPECT_FALSE(device_settings_service_.GetOwnerKey());
+ EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
+ EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey());
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_UNKNOWN,
- device_settings_service_.GetOwnershipStatus());
+ DeviceSettingsService::Get()->GetOwnershipStatus());
- device_settings_service_.GetOwnershipStatusAsync(
+ DeviceSettingsService::Get()->GetOwnershipStatusAsync(
base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
base::Unretained(this)));
FlushDeviceSettings();
- EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
- ASSERT_TRUE(device_settings_service_.GetOwnerKey());
- EXPECT_FALSE(device_settings_service_.GetOwnerKey()->public_key());
- EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key());
+ EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
+ ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
+ EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
+ EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE,
- device_settings_service_.GetOwnershipStatus());
+ DeviceSettingsService::Get()->GetOwnershipStatus());
EXPECT_FALSE(is_owner_);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_NONE, ownership_status_);
owner_key_util_->SetPublicKeyFromPrivateKey(device_policy_.signing_key());
ReloadDeviceSettings();
- device_settings_service_.GetOwnershipStatusAsync(
+ DeviceSettingsService::Get()->GetOwnershipStatusAsync(
base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
base::Unretained(this)));
FlushDeviceSettings();
- EXPECT_FALSE(device_settings_service_.HasPrivateOwnerKey());
- ASSERT_TRUE(device_settings_service_.GetOwnerKey());
- ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
+ EXPECT_FALSE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
+ ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
+ ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
std::vector<uint8> key;
ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));
- EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
- EXPECT_FALSE(device_settings_service_.GetOwnerKey()->private_key());
+ EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
+ EXPECT_FALSE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
- device_settings_service_.GetOwnershipStatus());
+ DeviceSettingsService::Get()->GetOwnershipStatus());
EXPECT_FALSE(is_owner_);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);
owner_key_util_->SetPrivateKey(device_policy_.signing_key());
- device_settings_service_.SetUsername(device_policy_.policy_data().username());
- device_settings_service_.GetOwnershipStatusAsync(
+ DeviceSettingsService::Get()->SetUsername(
+ device_policy_.policy_data().username());
+ DeviceSettingsService::Get()->GetOwnershipStatusAsync(
base::Bind(&DeviceSettingsServiceTest::SetOwnershipStatus,
base::Unretained(this)));
FlushDeviceSettings();
- EXPECT_TRUE(device_settings_service_.HasPrivateOwnerKey());
- ASSERT_TRUE(device_settings_service_.GetOwnerKey());
- ASSERT_TRUE(device_settings_service_.GetOwnerKey()->public_key());
+ EXPECT_TRUE(DeviceSettingsService::Get()->HasPrivateOwnerKey());
+ ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey());
+ ASSERT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->public_key());
ASSERT_TRUE(device_policy_.signing_key()->ExportPublicKey(&key));
- EXPECT_EQ(*device_settings_service_.GetOwnerKey()->public_key(), key);
- EXPECT_TRUE(device_settings_service_.GetOwnerKey()->private_key());
+ EXPECT_EQ(*DeviceSettingsService::Get()->GetOwnerKey()->public_key(), key);
+ EXPECT_TRUE(DeviceSettingsService::Get()->GetOwnerKey()->private_key());
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN,
- device_settings_service_.GetOwnershipStatus());
+ DeviceSettingsService::Get()->GetOwnershipStatus());
EXPECT_TRUE(is_owner_);
EXPECT_EQ(DeviceSettingsService::OWNERSHIP_TAKEN, ownership_status_);
}
@@ -323,7 +329,7 @@ TEST_F(DeviceSettingsServiceTest, OwnershipStatus) {
TEST_F(DeviceSettingsServiceTest, Observer) {
owner_key_util_->Clear();
MockDeviceSettingsObserver observer_;
- device_settings_service_.AddObserver(&observer_);
+ DeviceSettingsService::Get()->AddObserver(&observer_);
EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(1);
EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
@@ -338,17 +344,18 @@ TEST_F(DeviceSettingsServiceTest, Observer) {
EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
- device_settings_service_.Store(device_policy_.GetCopy(), base::Closure());
+ DeviceSettingsService::Get()->Store(device_policy_.GetCopy(),
+ base::Closure());
FlushDeviceSettings();
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_CALL(observer_, OwnershipStatusChanged()).Times(0);
EXPECT_CALL(observer_, DeviceSettingsUpdated()).Times(1);
- device_settings_service_.PropertyChangeComplete(true);
+ DeviceSettingsService::Get()->PropertyChangeComplete(true);
FlushDeviceSettings();
Mock::VerifyAndClearExpectations(&observer_);
- device_settings_service_.RemoveObserver(&observer_);
+ DeviceSettingsService::Get()->RemoveObserver(&observer_);
}
} // namespace chromeos
« chrome/browser/chromeos/policy/device_local_account_policy_service_unittest.cc ('K') | « chrome/browser/chromeos/settings/device_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('j') | chrome/browser/chromeos/settings/device_settings_test_helper.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698