Fix PromoResourceServiceTest.NotificationPromoTest and make it use dynamic [future] dates.

chrome/browser/web_resource/promo_resource_service_unittest.cc

 // Copyright (c) 2012 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 <utility>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
+#include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/web_resource/notification_promo.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "unicode/smpdtfmt.h"
+
+namespace {
+
+const char* kDateFormat = "dd MMM yyyy HH:mm:ss zzz";

[Robert Sesek, 2013/01/07 19:58:46]

const char* -> const char kDateFormat[] removes a static initializer.

Not that it matters for test code, though

[Dan Beam, 2013/01/07 20:13:23]

Done.

+
+std::pair<double, std::string> YearFromNow() {
+  UErrorCode status = U_ZERO_ERROR;
+  icu::SimpleDateFormat simple_formatter(icu::UnicodeString(kDateFormat),
+                                         icu::Locale("en_US"),
+                                         status);
+  DCHECK(U_SUCCESS(status));
+
+  const double year_from_now =
+      (base::Time::Now() + base::TimeDelta::FromDays(365)).ToTimeT();
+
+  icu::UnicodeString date_unicode_string;
+  simple_formatter.format(static_cast<UDate>(year_from_now * 1000),
+                          date_unicode_string,
+                          status);
+  DCHECK(U_SUCCESS(status));
+
+  std::string date_string;
+  UTF16ToUTF8(date_unicode_string.getBuffer(),
+              static_cast<size_t>(date_unicode_string.length()),
+              &date_string);
+
+  return std::make_pair(year_from_now, date_string);
+}
+
+}  // namespace
 
 class PromoResourceServiceTest : public testing::Test {
  public:
   // |promo_resource_service_| must be created after |local_state_|.
   PromoResourceServiceTest()
       : local_state_(TestingBrowserProcess::GetGlobal()),
         promo_resource_service_(new PromoResourceService) {}
 
  protected:
   ScopedTestingLocalState local_state_;
@@ skipping 10 matching lines @@
         num_groups_(0),
         initial_segment_(0),
         increment_(1),
         time_slice_(0),
         max_group_(0),
         max_views_(0),
         closed_(false) {}
 
   void Init(const std::string& json,
             const std::string& promo_text,
-            double start, double end,
+            double start,
             int num_groups, int initial_segment, int increment,
             int time_slice, int max_group, int max_views) {
-    Value* value(base::JSONReader::Read(json));
+    std::pair<double, std::string> year_from_now = YearFromNow();
+    std::vector<std::string> replacements;
+    replacements.push_back(year_from_now.second);
+
+    std::string json_with_year(
+        ReplaceStringPlaceholders(json, replacements, NULL));
+    Value* value(base::JSONReader::Read(json_with_year));
     ASSERT_TRUE(value);
+
     DictionaryValue* dict = NULL;
     value->GetAsDictionary(&dict);
     ASSERT_TRUE(dict);
     test_json_.reset(dict);
 
     promo_type_ = NotificationPromo::NTP_NOTIFICATION_PROMO;
     promo_text_ = promo_text;
 
     start_ = start;
-    end_ = end;
+    end_ = year_from_now.first;
 
     num_groups_ = num_groups;
     initial_segment_ = initial_segment;
     increment_ = increment;
     time_slice_ = time_slice;
     max_group_ = max_group;
 
     max_views_ = max_views;
 
     closed_ = false;
@@ skipping 230 matching lines @@
 
   int max_views_;
 
   bool closed_;
 };
 
 // Test that everything gets parsed correctly, notifications are sent,
 // and CanShow() is handled correctly under variety of conditions.
 // Additionally, test that the first string in |strings| is used if
 // no payload.promo_short_message is specified in the JSON response.
-
-// hardcoded a date in Jan 2013. Srzly?? http://crbug.com/168561
-TEST_F(PromoResourceServiceTest, DISABLED_NotificationPromoTest) {
+TEST_F(PromoResourceServiceTest, NotificationPromoTest) {
   // Check that prefs are set correctly.
   NotificationPromoTest promo_test;
 
-  // Set up start and end dates and promo line in a Dictionary as if parsed
-  // from the service.
+  // Set up start date and promo line in a Dictionary as if parsed from the
+  // service. date[0].end is replaced with a date 1 year in the future.
   promo_test.Init("{"
                   "  \"ntp_notification_promo\": ["
                   "    {"
                   "      \"date\":"
                   "        ["
                   "          {"
                   "            \"start\":\"3 Aug 1999 9:26:06 GMT\","
-                  "            \"end\":\"7 Jan 2013 5:40:75 PST\""
+                  "            \"end\":\"$1\""
                   "          }"
                   "        ],"
                   "      \"strings\":"
                   "        {"
                   "          \"NTP4_HOW_DO_YOU_FEEL_ABOUT_CHROME\":"
                   "              \"What do you think of Chrome?\""
                   "        },"
                   "      \"grouping\":"
                   "        {"
                   "          \"buckets\":1000,"
                   "          \"segment\":200,"
                   "          \"increment\":100,"
                   "          \"increment_frequency\":3600,"
                   "          \"increment_max\":400"
                   "        },"
                   "      \"payload\":"
                   "        {"
                   "          \"days_active\":7,"
                   "          \"install_age_days\":21"
                   "        },"
                   "      \"max_views\":30"
                   "    }"
                   "  ]"
                   "}",
                   "What do you think of Chrome?",
                   // The starting date is in 1999 to make tests pass
                   // on Android devices with incorrect or unset date/time.
                   933672366,  // unix epoch for 3 Aug 1999 9:26:06 GMT.
-                  1357566075, // unix epoch for 7 Jan 2013 5:40:75 PST.
                   1000, 200, 100, 3600, 400, 30);
 
   promo_test.InitPromoFromJson(true);
 
   // Second time should not trigger a notification.
   promo_test.InitPromoFromJson(false);
 
   promo_test.TestInitFromPrefs();
 
   // Test various conditions of CanShow.
   // TestGroup Has the side effect of setting us to a passing group.
   promo_test.TestGroup();
   promo_test.TestViews();
   promo_test.TestClosed();
   promo_test.TestPromoText();
   promo_test.TestTime();
   promo_test.TestIncrement();
 }
 
 // Test that payload.promo_message_short is used if present.
 TEST_F(PromoResourceServiceTest, NotificationPromoCompatNoStringsTest) {
   // Check that prefs are set correctly.
   NotificationPromoTest promo_test;
 
-  // Set up start and end dates and promo line in a Dictionary as if parsed
-  // from the service.
+  // Set up start date and promo line in a Dictionary as if parsed from the
+  // service. date[0].end is replaced with a date 1 year in the future.
   promo_test.Init("{"
                   "  \"ntp_notification_promo\": ["
                   "    {"
                   "      \"date\":"
                   "        ["
                   "          {"
                   "            \"start\":\"3 Aug 1999 9:26:06 GMT\","
-                  "            \"end\":\"7 Jan 2013 5:40:75 PST\""
+                  "            \"end\":\"$1\""
                   "          }"
                   "        ],"
                   "      \"grouping\":"
                   "        {"
                   "          \"buckets\":1000,"
                   "          \"segment\":200,"
                   "          \"increment\":100,"
                   "          \"increment_frequency\":3600,"
                   "          \"increment_max\":400"
                   "        },"
                   "      \"payload\":"
                   "        {"
                   "          \"promo_message_short\":"
                   "              \"What do you think of Chrome?\","
                   "          \"days_active\":7,"
                   "          \"install_age_days\":21"
                   "        },"
                   "      \"max_views\":30"
                   "    }"
                   "  ]"
                   "}",
                   "What do you think of Chrome?",
                   // The starting date is in 1999 to make tests pass
                   // on Android devices with incorrect or unset date/time.
                   933672366,  // unix epoch for 3 Aug 1999 9:26:06 GMT.
-                  1357566075, // unix epoch for 7 Jan 2013 5:40:75 PST.
                   1000, 200, 100, 3600, 400, 30);
 
   promo_test.InitPromoFromJson(true);
   // Second time should not trigger a notification.
   promo_test.InitPromoFromJson(false);
   promo_test.TestInitFromPrefs();
 }
 
 // Test that strings.|payload.promo_message_short| is used if present.
 TEST_F(PromoResourceServiceTest, NotificationPromoCompatPayloadStringsTest) {
   // Check that prefs are set correctly.
   NotificationPromoTest promo_test;
 
-  // Set up start and end dates and promo line in a Dictionary as if parsed
-  // from the service.
+  // Set up start date and promo line in a Dictionary as if parsed from the
+  // service. date[0].end is replaced with a date 1 year in the future.
   promo_test.Init("{"
                   "  \"ntp_notification_promo\": ["
                   "    {"
                   "      \"date\":"
                   "        ["
                   "          {"
                   "            \"start\":\"3 Aug 1999 9:26:06 GMT\","
-                  "            \"end\":\"7 Jan 2013 5:40:75 PST\""
+                  "            \"end\":\"$1\""
                   "          }"
                   "        ],"
                   "      \"grouping\":"
                   "        {"
                   "          \"buckets\":1000,"
                   "          \"segment\":200,"
                   "          \"increment\":100,"
                   "          \"increment_frequency\":3600,"
                   "          \"increment_max\":400"
                   "        },"
@@ skipping 11 matching lines @@
                   "          \"install_age_days\":21"
                   "        },"
                   "      \"max_views\":30"
                   "    }"
                   "  ]"
                   "}",
                   "What do you think of Chrome?",
                   // The starting date is in 1999 to make tests pass
                   // on Android devices with incorrect or unset date/time.
                   933672366,  // unix epoch for 3 Aug 1999 9:26:06 GMT.
-                  1357566075, // unix epoch for 7 Jan 2013 5:40:75 PST.
                   1000, 200, 100, 3600, 400, 30);
 
   promo_test.InitPromoFromJson(true);
   // Second time should not trigger a notification.
   promo_test.InitPromoFromJson(false);
   promo_test.TestInitFromPrefs();
 }
 
 TEST_F(PromoResourceServiceTest, PromoServerURLTest) {
   GURL promo_server_url = NotificationPromo::PromoServerURL();
   EXPECT_FALSE(promo_server_url.is_empty());
   EXPECT_TRUE(promo_server_url.is_valid());
   EXPECT_TRUE(promo_server_url.SchemeIs(chrome::kHttpsScheme));
   // TODO(achuith): Test this better.
 }