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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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/supervised_user/supervised_user_sync_service_observer.h ('k') | chrome/browser/supervised_user/supervised_user_theme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
diff --git a/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
similarity index 61%
rename from chrome/browser/managed_mode/managed_user_sync_service_unittest.cc
rename to chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
index f59eea67e5680eb0ae53e592d718d48c852e6765..a0164efe7c5745f7ad66411107985cb767f0911d 100644
--- a/chrome/browser/managed_mode/managed_user_sync_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_sync_service_unittest.cc
@@ -10,8 +10,8 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/sequenced_worker_pool.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service.h"
-#include "chrome/browser/managed_mode/managed_user_sync_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service.h"
+#include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "sync/api/attachments/attachment_id.h"
@@ -76,18 +76,18 @@ SyncChange MockChangeProcessor::GetChange(const std::string& id) const {
return SyncChange();
}
-// Callback for ManagedUserSyncService::GetManagedUsersAsync().
-void GetManagedUsersCallback(const base::DictionaryValue** dict,
- const base::DictionaryValue* managed_users) {
- *dict = managed_users;
+// Callback for SupervisedUserSyncService::GetSupervisedUsersAsync().
+void GetSupervisedUsersCallback(const base::DictionaryValue** dict,
+ const base::DictionaryValue* supervised_users) {
+ *dict = supervised_users;
}
} // namespace
-class ManagedUserSyncServiceTest : public ::testing::Test {
+class SupervisedUserSyncServiceTest : public ::testing::Test {
public:
- ManagedUserSyncServiceTest();
- virtual ~ManagedUserSyncServiceTest();
+ SupervisedUserSyncServiceTest();
+ virtual ~SupervisedUserSyncServiceTest();
protected:
scoped_ptr<SyncChangeProcessor> CreateChangeProcessor();
@@ -97,42 +97,42 @@ class ManagedUserSyncServiceTest : public ::testing::Test {
const std::string& avatar);
PrefService* prefs() { return profile_.GetPrefs(); }
- ManagedUserSyncService* service() { return service_; }
+ SupervisedUserSyncService* service() { return service_; }
MockChangeProcessor* change_processor() { return change_processor_; }
private:
base::MessageLoop message_loop;
TestingProfile profile_;
- ManagedUserSyncService* service_;
+ SupervisedUserSyncService* service_;
- // Owned by the ManagedUserSyncService.
+ // Owned by the SupervisedUserSyncService.
MockChangeProcessor* change_processor_;
// A unique ID for creating "remote" Sync data.
int64 sync_data_id_;
};
-ManagedUserSyncServiceTest::ManagedUserSyncServiceTest()
+SupervisedUserSyncServiceTest::SupervisedUserSyncServiceTest()
: change_processor_(NULL),
sync_data_id_(0) {
- service_ = ManagedUserSyncServiceFactory::GetForProfile(&profile_);
+ service_ = SupervisedUserSyncServiceFactory::GetForProfile(&profile_);
}
-ManagedUserSyncServiceTest::~ManagedUserSyncServiceTest() {}
+SupervisedUserSyncServiceTest::~SupervisedUserSyncServiceTest() {}
scoped_ptr<SyncChangeProcessor>
-ManagedUserSyncServiceTest::CreateChangeProcessor() {
+SupervisedUserSyncServiceTest::CreateChangeProcessor() {
EXPECT_FALSE(change_processor_);
change_processor_ = new MockChangeProcessor();
return scoped_ptr<SyncChangeProcessor>(change_processor_);
}
scoped_ptr<SyncErrorFactory>
-ManagedUserSyncServiceTest::CreateErrorFactory() {
+SupervisedUserSyncServiceTest::CreateErrorFactory() {
return scoped_ptr<SyncErrorFactory>(new syncer::SyncErrorFactoryMock());
}
-SyncData ManagedUserSyncServiceTest::CreateRemoteData(
+SyncData SupervisedUserSyncServiceTest::CreateRemoteData(
const std::string& id,
const std::string& name,
const std::string& chrome_avatar) {
@@ -151,7 +151,7 @@ SyncData ManagedUserSyncServiceTest::CreateRemoteData(
syncer::AttachmentServiceProxyForTest::Create());
}
-TEST_F(ManagedUserSyncServiceTest, MergeEmpty) {
+TEST_F(SupervisedUserSyncServiceTest, MergeEmpty) {
SyncMergeResult result =
service()->MergeDataAndStartSyncing(SUPERVISED_USERS,
SyncDataList(),
@@ -163,14 +163,14 @@ TEST_F(ManagedUserSyncServiceTest, MergeEmpty) {
EXPECT_EQ(0, result.num_items_deleted());
EXPECT_EQ(0, result.num_items_before_association());
EXPECT_EQ(0, result.num_items_after_association());
- EXPECT_EQ(0u, service()->GetManagedUsers()->size());
+ EXPECT_EQ(0u, service()->GetSupervisedUsers()->size());
EXPECT_EQ(0u, change_processor()->changes().size());
service()->StopSyncing(SUPERVISED_USERS);
service()->Shutdown();
}
-TEST_F(ManagedUserSyncServiceTest, MergeExisting) {
+TEST_F(SupervisedUserSyncServiceTest, MergeExisting) {
const char kNameKey[] = "name";
const char kAcknowledgedKey[] = "acknowledged";
const char kChromeAvatarKey[] = "chromeAvatar";
@@ -194,19 +194,19 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {
const char kAvatar4[] = "";
{
DictionaryPrefUpdate update(prefs(), prefs::kSupervisedUsers);
- base::DictionaryValue* managed_users = update.Get();
+ base::DictionaryValue* supervised_users = update.Get();
base::DictionaryValue* dict = new base::DictionaryValue;
dict->SetString(kNameKey, kName1);
- managed_users->Set(kUserId1, dict);
+ supervised_users->Set(kUserId1, dict);
dict = new base::DictionaryValue;
dict->SetString(kNameKey, kName2);
dict->SetBoolean(kAcknowledgedKey, true);
- managed_users->Set(kUserId2, dict);
+ supervised_users->Set(kUserId2, dict);
}
- const base::DictionaryValue* async_managed_users = NULL;
- service()->GetManagedUsersAsync(
- base::Bind(&GetManagedUsersCallback, &async_managed_users));
+ const base::DictionaryValue* async_supervised_users = NULL;
+ service()->GetSupervisedUsersAsync(
+ base::Bind(&GetSupervisedUsersCallback, &async_supervised_users));
SyncDataList initial_sync_data;
initial_sync_data.push_back(CreateRemoteData(kUserId2, kName2, kAvatar2));
@@ -225,51 +225,52 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {
EXPECT_EQ(2, result.num_items_before_association());
EXPECT_EQ(4, result.num_items_after_association());
- const base::DictionaryValue* managed_users = service()->GetManagedUsers();
- EXPECT_EQ(4u, managed_users->size());
- EXPECT_TRUE(async_managed_users);
- EXPECT_TRUE(managed_users->Equals(async_managed_users));
+ const base::DictionaryValue* supervised_users =
+ service()->GetSupervisedUsers();
+ EXPECT_EQ(4u, supervised_users->size());
+ EXPECT_TRUE(async_supervised_users);
+ EXPECT_TRUE(supervised_users->Equals(async_supervised_users));
{
- const base::DictionaryValue* managed_user = NULL;
- ASSERT_TRUE(managed_users->GetDictionary(kUserId2, &managed_user));
- ASSERT_TRUE(managed_user);
+ const base::DictionaryValue* supervised_user = NULL;
+ ASSERT_TRUE(supervised_users->GetDictionary(kUserId2, &supervised_user));
+ ASSERT_TRUE(supervised_user);
std::string name;
- EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
+ EXPECT_TRUE(supervised_user->GetString(kNameKey, &name));
EXPECT_EQ(kName2, name);
bool acknowledged = false;
- EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
+ EXPECT_TRUE(supervised_user->GetBoolean(kAcknowledgedKey, &acknowledged));
EXPECT_TRUE(acknowledged);
std::string avatar;
- EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+ EXPECT_TRUE(supervised_user->GetString(kChromeAvatarKey, &avatar));
EXPECT_EQ(kAvatar2, avatar);
}
{
- const base::DictionaryValue* managed_user = NULL;
- ASSERT_TRUE(managed_users->GetDictionary(kUserId3, &managed_user));
- ASSERT_TRUE(managed_user);
+ const base::DictionaryValue* supervised_user = NULL;
+ ASSERT_TRUE(supervised_users->GetDictionary(kUserId3, &supervised_user));
+ ASSERT_TRUE(supervised_user);
std::string name;
- EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
+ EXPECT_TRUE(supervised_user->GetString(kNameKey, &name));
EXPECT_EQ(kName3, name);
bool acknowledged = false;
- EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
+ EXPECT_TRUE(supervised_user->GetBoolean(kAcknowledgedKey, &acknowledged));
EXPECT_TRUE(acknowledged);
std::string avatar;
- EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+ EXPECT_TRUE(supervised_user->GetString(kChromeAvatarKey, &avatar));
EXPECT_EQ(kAvatar3, avatar);
}
{
- const base::DictionaryValue* managed_user = NULL;
- ASSERT_TRUE(managed_users->GetDictionary(kUserId4, &managed_user));
- ASSERT_TRUE(managed_user);
+ const base::DictionaryValue* supervised_user = NULL;
+ ASSERT_TRUE(supervised_users->GetDictionary(kUserId4, &supervised_user));
+ ASSERT_TRUE(supervised_user);
std::string name;
- EXPECT_TRUE(managed_user->GetString(kNameKey, &name));
+ EXPECT_TRUE(supervised_user->GetString(kNameKey, &name));
EXPECT_EQ(kName4, name);
bool acknowledged = false;
- EXPECT_TRUE(managed_user->GetBoolean(kAcknowledgedKey, &acknowledged));
+ EXPECT_TRUE(supervised_user->GetBoolean(kAcknowledgedKey, &acknowledged));
EXPECT_TRUE(acknowledged);
std::string avatar;
- EXPECT_TRUE(managed_user->GetString(kChromeAvatarKey, &avatar));
+ EXPECT_TRUE(supervised_user->GetString(kChromeAvatarKey, &avatar));
EXPECT_EQ(kAvatar4, avatar);
}
@@ -278,25 +279,26 @@ TEST_F(ManagedUserSyncServiceTest, MergeExisting) {
SyncChange change = change_processor()->GetChange(kUserId1);
ASSERT_TRUE(change.IsValid());
EXPECT_EQ(SyncChange::ACTION_ADD, change.change_type());
- const ManagedUserSpecifics& managed_user =
+ const ManagedUserSpecifics& supervised_user =
change.sync_data().GetSpecifics().managed_user();
- EXPECT_EQ(kName1, managed_user.name());
- EXPECT_FALSE(managed_user.acknowledged());
- EXPECT_EQ(kAvatar1, managed_user.chrome_avatar());
+ EXPECT_EQ(kName1, supervised_user.name());
+ EXPECT_FALSE(supervised_user.acknowledged());
+ EXPECT_EQ(kAvatar1, supervised_user.chrome_avatar());
}
}
-TEST_F(ManagedUserSyncServiceTest, GetAvatarIndex) {
+TEST_F(SupervisedUserSyncServiceTest, GetAvatarIndex) {
int avatar = 100;
- EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(std::string(), &avatar));
- EXPECT_EQ(ManagedUserSyncService::kNoAvatar, avatar);
+ EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(std::string(),
+ &avatar));
+ EXPECT_EQ(SupervisedUserSyncService::kNoAvatar, avatar);
int avatar_index = 4;
#if defined(OS_CHROMEOS)
avatar_index += chromeos::kFirstDefaultImageIndex;
#endif
std::string avatar_str =
- ManagedUserSyncService::BuildAvatarString(avatar_index);
+ SupervisedUserSyncService::BuildAvatarString(avatar_index);
#if defined(OS_CHROMEOS)
EXPECT_EQ(base::StringPrintf("chromeos-avatar-index:%d", avatar_index),
avatar_str);
@@ -304,14 +306,14 @@ TEST_F(ManagedUserSyncServiceTest, GetAvatarIndex) {
EXPECT_EQ(base::StringPrintf("chrome-avatar-index:%d", avatar_index),
avatar_str);
#endif
- EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
+ EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
EXPECT_EQ(avatar_index, avatar);
avatar_index = 0;
#if defined(OS_CHROMEOS)
avatar_index += chromeos::kFirstDefaultImageIndex;
#endif
- avatar_str = ManagedUserSyncService::BuildAvatarString(avatar_index);
+ avatar_str = SupervisedUserSyncService::BuildAvatarString(avatar_index);
#if defined(OS_CHROMEOS)
EXPECT_EQ(base::StringPrintf("chromeos-avatar-index:%d", avatar_index),
avatar_str);
@@ -319,41 +321,50 @@ TEST_F(ManagedUserSyncServiceTest, GetAvatarIndex) {
EXPECT_EQ(base::StringPrintf("chrome-avatar-index:%d", avatar_index),
avatar_str);
#endif
- EXPECT_TRUE(ManagedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
+ EXPECT_TRUE(SupervisedUserSyncService::GetAvatarIndex(avatar_str, &avatar));
EXPECT_EQ(avatar_index, avatar);
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("wrong-prefix:5",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex("wrong-prefix:5",
+ &avatar));
#if defined(OS_CHROMEOS)
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-indes:2",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chromeos-avatar-indes:2",
+ &avatar));
EXPECT_FALSE(
- ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-indexxx:2",
- &avatar));
+ SupervisedUserSyncService::GetAvatarIndex("chromeos-avatar-indexxx:2",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chromeos-avatar-index:",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:x",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chromeos-avatar-index:x",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:5",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chrome-avatar-index:5",
+ &avatar));
#else
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-indes:2",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chrome-avatar-indes:2",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-indexxx:2",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chrome-avatar-indexxx:2",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chrome-avatar-index:",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chrome-avatar-index:x",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chrome-avatar-index:x",
+ &avatar));
- EXPECT_FALSE(ManagedUserSyncService::GetAvatarIndex("chromeos-avatar-index:5",
- &avatar));
+ EXPECT_FALSE(SupervisedUserSyncService::GetAvatarIndex(
+ "chromeos-avatar-index:5",
+ &avatar));
#endif
}
« no previous file with comments | « chrome/browser/supervised_user/supervised_user_sync_service_observer.h ('k') | chrome/browser/supervised_user/supervised_user_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698