diff options
author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 11:33:43 +0000 |
---|---|---|
committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 11:33:43 +0000 |
commit | 2ec4e4bf8e81f90b90e861b5ca53b4de75705aa8 (patch) | |
tree | 4901a97361a2c2d240cf34d202401c05c9d0b9a6 /chrome/browser/chromeos/mobile_config_unittest.cc | |
parent | 960adc174bfa830e3f1fa9d46910cf4d5c539647 (diff) | |
download | chromium_src-2ec4e4bf8e81f90b90e861b5ca53b4de75705aa8.zip chromium_src-2ec4e4bf8e81f90b90e861b5ca53b4de75705aa8.tar.gz chromium_src-2ec4e4bf8e81f90b90e861b5ca53b4de75705aa8.tar.bz2 |
[cros] Add support for locale specific configuration in mobile config.
BUG=chrome-os-partner:8092
TEST=MobileConfigTest
Review URL: http://codereview.chromium.org/10141006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133667 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/mobile_config_unittest.cc')
-rw-r--r-- | chrome/browser/chromeos/mobile_config_unittest.cc | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/mobile_config_unittest.cc b/chrome/browser/chromeos/mobile_config_unittest.cc index 10c76b6..5f81513 100644 --- a/chrome/browser/chromeos/mobile_config_unittest.cc +++ b/chrome/browser/chromeos/mobile_config_unittest.cc @@ -46,6 +46,11 @@ const char kGoodMobileConfig[] = " ],\n" " }," " }," + " \"initial_locales\" : {\n" + " \"en-US\" : {\n" + " \"setup_url\" : \"accounts.carrier.com\",\n" + " }," + " }," "}"; const char kOldDealMobileConfig[] = @@ -106,7 +111,12 @@ const char kLocalMobileConfig[] = " },\n" " ],\n" " }," - " }," + " }," + " \"initial_locales\" : {\n" + " \"en-US\" : {\n" + " \"setup_url\" : \"accounts.carrier.com/localized/\",\n" + " }," + " }," "}"; } // anonymous namespace @@ -139,6 +149,17 @@ TEST(MobileConfigTest, Basic) { base::Time reference_time; base::Time::FromString("31/12/12 0:00", &reference_time); EXPECT_EQ(reference_time, deal->expire_date()); + + const MobileConfig::LocaleConfig* locale_config; + locale_config = config.GetLocaleConfig(); + EXPECT_TRUE(locale_config != NULL); + EXPECT_EQ("accounts.carrier.com", locale_config->setup_url()); + + // Check same manifest but with another initial locale. + MobileConfig config_uk(kGoodMobileConfig, "en-GB"); + EXPECT_TRUE(config_uk.IsReady()); + locale_config = config_uk.GetLocaleConfig(); + EXPECT_TRUE(locale_config == NULL); } TEST(MobileConfigTest, OldDeal) { @@ -213,6 +234,16 @@ TEST(MobileConfigTest, LocalConfig) { base::Time reference_time; base::Time::FromString("31/12/13 0:00", &reference_time); EXPECT_EQ(reference_time, deal->expire_date()); + + // Now reload same global/local config files but with proper initial locale. + MobileConfig config_us(kGoodMobileConfig, "en-US"); + EXPECT_TRUE(config_us.IsReady()); + config_us.LoadManifestFromString(kLocalMobileConfig); + EXPECT_TRUE(config_us.IsReady()); + const MobileConfig::LocaleConfig* locale_config; + locale_config = config_us.GetLocaleConfig(); + EXPECT_TRUE(locale_config != NULL); + EXPECT_EQ("accounts.carrier.com/localized/", locale_config->setup_url()); } } // namespace chromeos |