promo_resource_service fixes/cleanup for promos.

chrome/browser/web_resource/promo_resource_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/json/json_reader.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/apps_promo.h"
@@ skipping 93 matching lines @@
       base::JSONReader::Read(json, false)));
 
   // 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;
 }
 
-TEST_F(PromoResourceServiceTest, UnpackPromoSignal) {
+TEST_F(PromoResourceServiceTest, UnpackNotificationSignal) {
   // Set up start and end dates and promo line in a Dictionary as if parsed
   // from the service.
   std::string json = "{ "
                      "  \"topic\": {"
                      "    \"answers\": ["
                      "       {"
                      "        \"name\": \"promo_start\","
-                     "        \"question\": \"3:2\","
+                     "        \"question\": \"3:2:5\","
                      "        \"tooltip\": \"Eat more pie!\","
                      "        \"inproduct\": \"31/01/10 01:00 GMT\""
                      "       },"
                      "       {"
                      "        \"name\": \"promo_end\","
                      "        \"inproduct\": \"31/01/12 01:00 GMT\""
                      "       }"
                      "    ]"
                      "  }"
                      "}";
   scoped_ptr<DictionaryValue> test_json(static_cast<DictionaryValue*>(
       base::JSONReader::Read(json, false)));
 
   // Check that prefs are set correctly.
-  web_resource_service_->UnpackPromoSignal(*(test_json.get()));
+  web_resource_service_->UnpackNotificationSignal(*(test_json.get()));
   PrefService* prefs = profile_.GetPrefs();
   ASSERT_TRUE(prefs != NULL);
 
   std::string promo_line = prefs->GetString(prefs::kNTPPromoLine);
   EXPECT_EQ(promo_line, "Eat more pie!");
 
   int promo_group = prefs->GetInteger(prefs::kNTPPromoGroup);
   EXPECT_GE(promo_group, 0);
-  EXPECT_LT(promo_group, 16);
+  EXPECT_LT(promo_group, 100);
 
   int promo_build_type = prefs->GetInteger(prefs::kNTPPromoBuild);
   EXPECT_EQ(promo_build_type & PromoResourceService::DEV_BUILD,
             PromoResourceService::DEV_BUILD);
   EXPECT_EQ(promo_build_type & PromoResourceService::BETA_BUILD,
             PromoResourceService::BETA_BUILD);
   EXPECT_EQ(promo_build_type & PromoResourceService::STABLE_BUILD, 0);
 
   int promo_time_slice = prefs->GetInteger(prefs::kNTPPromoGroupTimeSlice);
   EXPECT_EQ(promo_time_slice, 2);
 
-  double promo_start =
-      prefs->GetDouble(prefs::kNTPPromoStart);
-  int64 actual_start = 1264899600 +  // unix epoch for Jan 31 2010 0100 GMT.
-      promo_group * 2 * 60 * 60;
+  int promo_group_max = prefs->GetInteger(prefs::kNTPPromoGroupMax);
+  EXPECT_EQ(promo_group_max, 5);
+
+  double promo_start = prefs->GetDouble(prefs::kNTPPromoStart);
+  double actual_start = 1264899600;  // unix epoch for Jan 31 2010 0100 GMT.
   EXPECT_EQ(promo_start, actual_start);
 
-  double promo_end =
-      prefs->GetDouble(prefs::kNTPPromoEnd);
+  double modified_start = actual_start + promo_group * 2 * 60 * 60;
+  EXPECT_EQ(PromoResourceService::GetNotificationStartTime(prefs),
+      modified_start);
+
+  double promo_end = prefs->GetDouble(prefs::kNTPPromoEnd);
   EXPECT_EQ(promo_end, 1327971600);  // unix epoch for Jan 31 2012 0100 GMT.
+
+  // Unpack the same json a second time.
+  web_resource_service_->UnpackNotificationSignal(*(test_json.get()));
+
+  // All the data should be unchanged.
+  EXPECT_EQ(promo_line, prefs->GetString(prefs::kNTPPromoLine));
+  EXPECT_EQ(promo_group, prefs->GetInteger(prefs::kNTPPromoGroup));
+  EXPECT_EQ(promo_build_type, prefs->GetInteger(prefs::kNTPPromoBuild));
+  EXPECT_EQ(promo_time_slice,
+      prefs->GetInteger(prefs::kNTPPromoGroupTimeSlice));
+  EXPECT_EQ(promo_group_max, prefs->GetInteger(prefs::kNTPPromoGroupMax));
+  EXPECT_EQ(promo_start, prefs->GetDouble(prefs::kNTPPromoStart));
+  EXPECT_EQ(modified_start,
+      PromoResourceService::GetNotificationStartTime(prefs));
+  EXPECT_EQ(promo_end, prefs->GetDouble(prefs::kNTPPromoEnd));

[jstritar, 2011/09/19 22:20:54]

Maybe test CanShowNotificationPromo? You could try with an in-range and
out-of-range group number?

[achuithb, 2011/09/19 22:57:56]

I can't because of the build check in CanShowNotificationPromo.

I need to either have a way to separate out the build check of
CanShowNotificationPromo, or even better, as you once suggested, do the build
check during the parse stage and not in CanShowNotificationPromo. I've added an
action item to crbug.com/96290 to test CanShowNotificationPromo.

 }
 
 TEST_F(PromoResourceServiceTest, UnpackWebStoreSignal) {
   web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
 
   std::string json = "{ "
                      "  \"topic\": {"
                      "    \"answers\": ["
                      "       {"
                      "        \"answer_id\": \"341252\","
@@ skipping 248 matching lines @@
   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));
 }