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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/web_resource/promo_resource_service_unittest.cc

Issue 10539045: Purge Logo/WebstoreSignal. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: missed a file Created 8 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
« chrome/browser/web_resource/promo_resource_service.cc ('K') | « chrome/browser/web_resource/promo_resource_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_resource/promo_resource_service_unittest.cc
===================================================================
--- chrome/browser/web_resource/promo_resource_service_unittest.cc (revision 140512)
+++ chrome/browser/web_resource/promo_resource_service_unittest.cc (working copy)
@@ -9,7 +9,6 @@
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/extensions/apps_promo.h"
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/web_resource/notification_promo.h"
@@ -38,85 +37,6 @@
MessageLoop loop_;
};
-// Verifies that custom dates read from a web resource server are written to
-// the preferences file.
-TEST_F(PromoResourceServiceTest, UnpackLogoSignal) {
- // Set up start and end dates in a Dictionary as if parsed from the service.
- std::string json = "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"name\": \"custom_logo_start\","
- " \"inproduct\": \"31/01/10 01:00 GMT\""
- " },"
- " {"
- " \"name\": \"custom_logo_end\","
- " \"inproduct\": \"31/01/12 01:00 GMT\""
- " }"
- " ]"
- " }"
- "}";
- scoped_ptr<DictionaryValue> test_json(
- static_cast<DictionaryValue*>(base::JSONReader::Read(json)));
-
- // Check that prefs are set correctly.
- web_resource_service_->UnpackLogoSignal(*(test_json.get()));
- PrefService* prefs = profile_.GetPrefs();
- ASSERT_TRUE(prefs != NULL);
-
- double logo_start =
- prefs->GetDouble(prefs::kNtpCustomLogoStart);
- EXPECT_EQ(logo_start, 1264899600); // unix epoch for Jan 31 2010 0100 GMT.
- double logo_end =
- prefs->GetDouble(prefs::kNtpCustomLogoEnd);
- EXPECT_EQ(logo_end, 1327971600); // unix epoch for Jan 31 2012 0100 GMT.
-
- // Change the start only and recheck.
- json = "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"name\": \"custom_logo_start\","
- " \"inproduct\": \"28/02/10 14:00 GMT\""
- " },"
- " {"
- " \"name\": \"custom_logo_end\","
- " \"inproduct\": \"31/01/12 01:00 GMT\""
- " }"
- " ]"
- " }"
- "}";
- test_json->Clear();
- test_json.reset(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- // Check that prefs are set correctly.
- web_resource_service_->UnpackLogoSignal(*(test_json.get()));
-
- logo_start = prefs->GetDouble(prefs::kNtpCustomLogoStart);
- EXPECT_EQ(logo_start, 1267365600); // date changes to Feb 28 2010 1400 GMT.
-
- // If no date is included in the prefs, reset custom logo dates to 0.
- json = "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " }"
- " ]"
- " }"
- "}";
- test_json->Clear();
- test_json.reset(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- // Check that prefs are set correctly.
- web_resource_service_->UnpackLogoSignal(*(test_json.get()));
- logo_start = prefs->GetDouble(prefs::kNtpCustomLogoStart);
- EXPECT_EQ(logo_start, 0); // date value reset to 0;
- logo_end = prefs->GetDouble(prefs::kNtpCustomLogoEnd);
- EXPECT_EQ(logo_end, 0); // date value reset to 0;
-}
-
class NotificationPromoTest {
public:
explicit NotificationPromoTest(Profile* profile)
@@ -494,274 +414,3 @@
EXPECT_TRUE(promo_server_url.SchemeIs("https"));
// TODO(achuith): Test this better.
}
-
-TEST_F(PromoResourceServiceTest, UnpackWebStoreSignal) {
- web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
-
- std::string json = "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"answer_id\": \"341252\","
- " \"name\": \"webstore_promo:15:1:\","
- " \"question\": \"The header!\","
- " \"inproduct_target\": \"The button label!\","
- " \"inproduct\": \"http://link.com\","
- " \"tooltip\": \"No thanks, hide this.\""
- " }"
- " ]"
- " }"
- "}";
- scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- // Set the source logo URL to verify that it gets cleared.
- AppsPromo::SetSourcePromoLogoURL(GURL("https://www.google.com/test.png"));
-
- // Check that prefs are set correctly.
- web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
-
- AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
- EXPECT_EQ("341252", actual_data.id);
- EXPECT_EQ("The header!", actual_data.header);
- EXPECT_EQ("The button label!", actual_data.button);
- EXPECT_EQ(GURL("http://link.com"), actual_data.link);
- EXPECT_EQ("No thanks, hide this.", actual_data.expire);
- EXPECT_EQ(AppsPromo::USERS_NEW, actual_data.user_group);
-
- // When we don't download a logo, we revert to the default and clear the
- // source pref.
- EXPECT_EQ(GURL("chrome://theme/IDR_WEBSTORE_ICON"), actual_data.logo);
- EXPECT_EQ(GURL(""), AppsPromo::GetSourcePromoLogoURL());
-}
-
-// Tests that the "web store active" flag is set even when the web store promo
-// fails parsing.
-TEST_F(PromoResourceServiceTest, UnpackPartialWebStoreSignal) {
- std::string json = "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"answer_id\": \"sdlfj32\","
- " \"name\": \"webstore_promo:#klsdjlfSD\""
- " }"
- " ]"
- " }"
- "}";
- scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- // Check that prefs are set correctly.
- web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
- EXPECT_FALSE(AppsPromo::IsPromoSupportedForLocale());
- EXPECT_TRUE(AppsPromo::IsWebStoreSupportedForLocale());
-}
-
-// Tests that we can successfully unpack web store signals with HTTPS
-// logos.
-TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogo) {
- web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
-
- std::string logo_url = "https://www.google.com/image/test.png";
- std::string png_data = "!$#%,./nvl;iadh9oh82";
- std::string png_base64 = "data:image/png;base64,ISQjJSwuL252bDtpYWRoOW9oODI=";
-
- FakeURLFetcherFactory factory;
- factory.SetFakeResponse(logo_url, png_data, true);
-
- std::string json =
- "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"answer_id\": \"340252\","
- " \"name\": \"webstore_promo:15:1:" + logo_url + "\","
- " \"question\": \"Header!\","
- " \"inproduct_target\": \"The button label!\","
- " \"inproduct\": \"http://link.com\","
- " \"tooltip\": \"No thanks, hide this.\""
- " }"
- " ]"
- " }"
- "}";
-
- scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- // Update the promo multiple times to verify the logo is cached correctly.
- for (size_t i = 0; i < 2; ++i) {
- web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
-
- // We should only need to run the message loop the first time since the
- // image is then cached.
- if (i == 0)
- loop_.RunAllPending();
-
- // Reset this scoped_ptr to prevent a DCHECK.
- web_resource_service_->apps_promo_logo_fetcher_.reset();
-
- AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
- EXPECT_EQ("340252", actual_data.id);
- EXPECT_EQ("Header!", actual_data.header);
- EXPECT_EQ("The button label!", actual_data.button);
- EXPECT_EQ(GURL("http://link.com"), actual_data.link);
- EXPECT_EQ("No thanks, hide this.", actual_data.expire);
- EXPECT_EQ(AppsPromo::USERS_NEW, actual_data.user_group);
-
- // The logo should now be a base64 DATA URL.
- EXPECT_EQ(GURL(png_base64), actual_data.logo);
-
- // And the source pref should hold the source HTTPS URL.
- EXPECT_EQ(GURL(logo_url), AppsPromo::GetSourcePromoLogoURL());
- }
-}
-
-// Tests that we revert to the default logo when the fetch fails.
-TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpsLogoError) {
- web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
-
- std::string logo_url = "https://www.google.com/image/test.png";
- std::string png_data = "!$#%,./nvl;iadh9oh82";
- std::string png_base64 = "ISQjJSwuL252bDtpYWRoOW9oODI=";
-
- FakeURLFetcherFactory factory;
-
- // Have URLFetcher return a 500 error.
- factory.SetFakeResponse(logo_url, png_data, false);
-
- std::string json =
- "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"answer_id\": \"340252\","
- " \"name\": \"webstore_promo:15:1:" + logo_url + "\","
- " \"question\": \"Header!\","
- " \"inproduct_target\": \"The button label!\","
- " \"inproduct\": \"http://link.com\","
- " \"tooltip\": \"No thanks, hide this.\""
- " }"
- " ]"
- " }"
- "}";
-
- scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
-
- loop_.RunAllPending();
-
- // Reset this scoped_ptr to prevent a DCHECK.
- web_resource_service_->apps_promo_logo_fetcher_.reset();
-
- AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
- EXPECT_EQ("340252", actual_data.id);
- EXPECT_EQ("Header!", actual_data.header);
- EXPECT_EQ("The button label!", actual_data.button);
- EXPECT_EQ(GURL("http://link.com"), actual_data.link);
- EXPECT_EQ("No thanks, hide this.", actual_data.expire);
- EXPECT_EQ(AppsPromo::USERS_NEW, actual_data.user_group);
-
- // Logos are the default values.
- EXPECT_EQ(GURL("chrome://theme/IDR_WEBSTORE_ICON"), actual_data.logo);
- EXPECT_EQ(GURL(""), AppsPromo::GetSourcePromoLogoURL());
-}
-
-// Tests that we don't download images over HTTP.
-TEST_F(PromoResourceServiceTest, UnpackWebStoreSignalHttpLogo) {
- web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
-
- // Use an HTTP URL.
- std::string logo_url = "http://www.google.com/image/test.png";
- std::string png_data = "!$#%,./nvl;iadh9oh82";
- std::string png_base64 = "ISQjJSwuL252bDtpYWRoOW9oODI=";
-
- FakeURLFetcherFactory factory;
- factory.SetFakeResponse(logo_url, png_data, true);
-
- std::string json =
- "{ "
- " \"topic\": {"
- " \"answers\": ["
- " {"
- " \"answer_id\": \"340252\","
- " \"name\": \"webstore_promo:15:1:" + logo_url + "\","
- " \"question\": \"Header!\","
- " \"inproduct_target\": \"The button label!\","
- " \"inproduct\": \"http://link.com\","
- " \"tooltip\": \"No thanks, hide this.\""
- " }"
- " ]"
- " }"
- "}";
-
- scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
- base::JSONReader::Read(json)));
-
- web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
-
- loop_.RunAllPending();
-
- // Reset this scoped_ptr to prevent a DCHECK.
- web_resource_service_->apps_promo_logo_fetcher_.reset();
-
- AppsPromo::PromoData actual_data = AppsPromo::GetPromo();
- EXPECT_EQ("340252", actual_data.id);
- EXPECT_EQ("Header!", actual_data.header);
- EXPECT_EQ("The button label!", actual_data.button);
- EXPECT_EQ(GURL("http://link.com"), actual_data.link);
- EXPECT_EQ("No thanks, hide this.", actual_data.expire);
- EXPECT_EQ(AppsPromo::USERS_NEW, actual_data.user_group);
-
- // Logos should be the default values because HTTP URLs are not valid.
- EXPECT_EQ(GURL("chrome://theme/IDR_WEBSTORE_ICON"), actual_data.logo);
- EXPECT_EQ(GURL(""), AppsPromo::GetSourcePromoLogoURL());
-}
-
-TEST_F(PromoResourceServiceTest, IsBuildTargetedTest) {
- // canary
- const chrome::VersionInfo::Channel canary =
- chrome::VersionInfo::CHANNEL_CANARY;
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 1));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 3));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 7));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 15));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 8));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 11));
-
- // dev
- const chrome::VersionInfo::Channel dev =
- chrome::VersionInfo::CHANNEL_DEV;
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 1));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 3));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 7));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 15));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(dev, 8));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 11));
-
- // beta
- const chrome::VersionInfo::Channel beta =
- chrome::VersionInfo::CHANNEL_BETA;
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(beta, 1));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 3));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 7));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 15));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(beta, 8));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 11));
-
- // stable
- const chrome::VersionInfo::Channel stable =
- chrome::VersionInfo::CHANNEL_STABLE;
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 1));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 3));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 7));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 15));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 8));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 11));
- EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 12));
-
- // invalid
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, -1));
- EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, INT_MAX));
-}
« chrome/browser/web_resource/promo_resource_service.cc ('K') | « chrome/browser/web_resource/promo_resource_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698