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

Side by Side Diff: chrome/browser/extensions/extension_service_sync_unittest.cc

Issue 1575523002: Comparison and streaming operators for base::Version (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes mistake in previous patch set. Created 4 years, 11 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 ASSERT_EQ(list.size(), 1U); 400 ASSERT_EQ(list.size(), 1U);
401 scoped_ptr<ExtensionSyncData> data = 401 scoped_ptr<ExtensionSyncData> data =
402 ExtensionSyncData::CreateFromSyncData(list[0]); 402 ExtensionSyncData::CreateFromSyncData(list[0]);
403 ASSERT_TRUE(data.get()); 403 ASSERT_TRUE(data.get());
404 EXPECT_EQ(extension->id(), data->id()); 404 EXPECT_EQ(extension->id(), data->id());
405 EXPECT_FALSE(data->uninstalled()); 405 EXPECT_FALSE(data->uninstalled());
406 EXPECT_EQ(service()->IsExtensionEnabled(good_crx), data->enabled()); 406 EXPECT_EQ(service()->IsExtensionEnabled(good_crx), data->enabled());
407 EXPECT_EQ(extensions::util::IsIncognitoEnabled(good_crx, profile()), 407 EXPECT_EQ(extensions::util::IsIncognitoEnabled(good_crx, profile()),
408 data->incognito_enabled()); 408 data->incognito_enabled());
409 EXPECT_EQ(ExtensionSyncData::BOOLEAN_UNSET, data->all_urls_enabled()); 409 EXPECT_EQ(ExtensionSyncData::BOOLEAN_UNSET, data->all_urls_enabled());
410 EXPECT_TRUE(data->version().Equals(*extension->version())); 410 EXPECT_EQ(data->version(), *extension->version());
411 EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(extension), 411 EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(extension),
412 data->update_url()); 412 data->update_url());
413 EXPECT_EQ(extension->name(), data->name()); 413 EXPECT_EQ(extension->name(), data->name());
414 } 414 }
415 415
416 TEST_F(ExtensionServiceSyncTest, GetSyncDataDisableReasons) { 416 TEST_F(ExtensionServiceSyncTest, GetSyncDataDisableReasons) {
417 InitializeEmptyExtensionService(); 417 InitializeEmptyExtensionService();
418 const Extension* extension = 418 const Extension* extension =
419 InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW); 419 InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
420 ASSERT_TRUE(extension); 420 ASSERT_TRUE(extension);
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 ASSERT_EQ(list.size(), 1U); 501 ASSERT_EQ(list.size(), 1U);
502 scoped_ptr<ExtensionSyncData> data = 502 scoped_ptr<ExtensionSyncData> data =
503 ExtensionSyncData::CreateFromSyncData(list[0]); 503 ExtensionSyncData::CreateFromSyncData(list[0]);
504 ASSERT_TRUE(data.get()); 504 ASSERT_TRUE(data.get());
505 EXPECT_EQ(extension->id(), data->id()); 505 EXPECT_EQ(extension->id(), data->id());
506 EXPECT_FALSE(data->uninstalled()); 506 EXPECT_FALSE(data->uninstalled());
507 EXPECT_EQ(service()->IsExtensionEnabled(good_crx), data->enabled()); 507 EXPECT_EQ(service()->IsExtensionEnabled(good_crx), data->enabled());
508 EXPECT_EQ(extensions::util::IsIncognitoEnabled(good_crx, profile()), 508 EXPECT_EQ(extensions::util::IsIncognitoEnabled(good_crx, profile()),
509 data->incognito_enabled()); 509 data->incognito_enabled());
510 EXPECT_EQ(ExtensionSyncData::BOOLEAN_UNSET, data->all_urls_enabled()); 510 EXPECT_EQ(ExtensionSyncData::BOOLEAN_UNSET, data->all_urls_enabled());
511 EXPECT_TRUE(data->version().Equals(*extension->version())); 511 EXPECT_EQ(data->version(), *extension->version());
512 EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(extension), 512 EXPECT_EQ(extensions::ManifestURL::GetUpdateURL(extension),
513 data->update_url()); 513 data->update_url());
514 EXPECT_EQ(extension->name(), data->name()); 514 EXPECT_EQ(extension->name(), data->name());
515 } 515 }
516 516
517 TEST_F(ExtensionServiceSyncTest, GetSyncDataFilter) { 517 TEST_F(ExtensionServiceSyncTest, GetSyncDataFilter) {
518 InitializeEmptyExtensionService(); 518 InitializeEmptyExtensionService();
519 InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW); 519 InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
520 const Extension* extension = service()->GetInstalledExtension(good_crx); 520 const Extension* extension = service()->GetInstalledExtension(good_crx);
521 ASSERT_TRUE(extension); 521 ASSERT_TRUE(extension);
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 // Should do nothing if extension version == sync version. 1054 // Should do nothing if extension version == sync version.
1055 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list); 1055 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
1056 EXPECT_FALSE(service()->updater()->WillCheckSoon()); 1056 EXPECT_FALSE(service()->updater()->WillCheckSoon());
1057 // Make sure the version we'll send back to sync didn't change. 1057 // Make sure the version we'll send back to sync didn't change.
1058 syncer::SyncDataList data = 1058 syncer::SyncDataList data =
1059 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS); 1059 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
1060 ASSERT_EQ(1u, data.size()); 1060 ASSERT_EQ(1u, data.size());
1061 scoped_ptr<ExtensionSyncData> extension_data = 1061 scoped_ptr<ExtensionSyncData> extension_data =
1062 ExtensionSyncData::CreateFromSyncData(data[0]); 1062 ExtensionSyncData::CreateFromSyncData(data[0]);
1063 ASSERT_TRUE(extension_data); 1063 ASSERT_TRUE(extension_data);
1064 EXPECT_TRUE(installed_version.Equals(extension_data->version())); 1064 EXPECT_EQ(installed_version, extension_data->version());
1065 } 1065 }
1066 1066
1067 // Should do nothing if extension version > sync version. 1067 // Should do nothing if extension version > sync version.
1068 { 1068 {
1069 ext_specifics->set_version("0.0.0.0"); 1069 ext_specifics->set_version("0.0.0.0");
1070 1070
1071 SyncChangeList list = 1071 SyncChangeList list =
1072 MakeSyncChangeList(good_crx, specifics, SyncChange::ACTION_UPDATE); 1072 MakeSyncChangeList(good_crx, specifics, SyncChange::ACTION_UPDATE);
1073 1073
1074 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list); 1074 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
1075 EXPECT_FALSE(service()->updater()->WillCheckSoon()); 1075 EXPECT_FALSE(service()->updater()->WillCheckSoon());
1076 // Make sure the version we'll send back to sync didn't change. 1076 // Make sure the version we'll send back to sync didn't change.
1077 syncer::SyncDataList data = 1077 syncer::SyncDataList data =
1078 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS); 1078 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
1079 ASSERT_EQ(1u, data.size()); 1079 ASSERT_EQ(1u, data.size());
1080 scoped_ptr<ExtensionSyncData> extension_data = 1080 scoped_ptr<ExtensionSyncData> extension_data =
1081 ExtensionSyncData::CreateFromSyncData(data[0]); 1081 ExtensionSyncData::CreateFromSyncData(data[0]);
1082 ASSERT_TRUE(extension_data); 1082 ASSERT_TRUE(extension_data);
1083 EXPECT_TRUE(installed_version.Equals(extension_data->version())); 1083 EXPECT_EQ(installed_version, extension_data->version());
1084 } 1084 }
1085 1085
1086 // Should kick off an update if extension version < sync version. 1086 // Should kick off an update if extension version < sync version.
1087 { 1087 {
1088 const base::Version new_version("9.9.9.9"); 1088 const base::Version new_version("9.9.9.9");
1089 ext_specifics->set_version(new_version.GetString()); 1089 ext_specifics->set_version(new_version.GetString());
1090 1090
1091 SyncChangeList list = 1091 SyncChangeList list =
1092 MakeSyncChangeList(good_crx, specifics, SyncChange::ACTION_UPDATE); 1092 MakeSyncChangeList(good_crx, specifics, SyncChange::ACTION_UPDATE);
1093 1093
1094 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list); 1094 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
1095 EXPECT_TRUE(service()->updater()->WillCheckSoon()); 1095 EXPECT_TRUE(service()->updater()->WillCheckSoon());
1096 // Make sure that we'll send the NEW version back to sync, even though we 1096 // Make sure that we'll send the NEW version back to sync, even though we
1097 // haven't actually updated yet. This is to prevent the data in sync from 1097 // haven't actually updated yet. This is to prevent the data in sync from
1098 // flip-flopping back and forth until all clients are up to date. 1098 // flip-flopping back and forth until all clients are up to date.
1099 syncer::SyncDataList data = 1099 syncer::SyncDataList data =
1100 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS); 1100 extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
1101 ASSERT_EQ(1u, data.size()); 1101 ASSERT_EQ(1u, data.size());
1102 scoped_ptr<ExtensionSyncData> extension_data = 1102 scoped_ptr<ExtensionSyncData> extension_data =
1103 ExtensionSyncData::CreateFromSyncData(data[0]); 1103 ExtensionSyncData::CreateFromSyncData(data[0]);
1104 ASSERT_TRUE(extension_data); 1104 ASSERT_TRUE(extension_data);
1105 EXPECT_TRUE(new_version.Equals(extension_data->version())); 1105 EXPECT_EQ(new_version, extension_data->version());
1106 } 1106 }
1107 1107
1108 EXPECT_FALSE(service()->pending_extension_manager()->IsIdPending(good_crx)); 1108 EXPECT_FALSE(service()->pending_extension_manager()->IsIdPending(good_crx));
1109 } 1109 }
1110 1110
1111 TEST_F(ExtensionServiceSyncTest, ProcessSyncDataNotInstalled) { 1111 TEST_F(ExtensionServiceSyncTest, ProcessSyncDataNotInstalled) {
1112 InitializeExtensionServiceWithUpdater(); 1112 InitializeExtensionServiceWithUpdater();
1113 extension_sync_service()->MergeDataAndStartSyncing( 1113 extension_sync_service()->MergeDataAndStartSyncing(
1114 syncer::EXTENSIONS, syncer::SyncDataList(), 1114 syncer::EXTENSIONS, syncer::SyncDataList(),
1115 make_scoped_ptr(new syncer::FakeSyncChangeProcessor()), 1115 make_scoped_ptr(new syncer::FakeSyncChangeProcessor()),
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
1871 1871
1872 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list); 1872 extension_sync_service()->ProcessSyncChanges(FROM_HERE, list);
1873 1873
1874 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id)); 1874 EXPECT_TRUE(registry()->enabled_extensions().GetByID(id));
1875 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); 1875 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile()));
1876 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile())); 1876 EXPECT_TRUE(extensions::util::HasSetAllowedScriptingOnAllUrls(id, profile()));
1877 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile())); 1877 EXPECT_FALSE(extensions::util::AllowedScriptingOnAllUrls(id, profile()));
1878 } 1878 }
1879 1879
1880 #endif // defined(ENABLE_SUPERVISED_USERS) 1880 #endif // defined(ENABLE_SUPERVISED_USERS)
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698