summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 18:12:30 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 18:12:30 +0000
commitf53a8bc489e8fb61cc4f090c268d9b07b3fd662b (patch)
tree9482b4b520aea6baaff2b09dba510d4492d6ee74 /chrome
parent3dff1ffc73892962c3006514ea86970d0b84e5ed (diff)
downloadchromium_src-f53a8bc489e8fb61cc4f090c268d9b07b3fd662b.zip
chromium_src-f53a8bc489e8fb61cc4f090c268d9b07b3fd662b.tar.gz
chromium_src-f53a8bc489e8fb61cc4f090c268d9b07b3fd662b.tar.bz2
Have UI tests use a profile where the dates in the segment_usage
table are current. By default, the NTP only uses data from the last 90 days, but the generated profile was created back in late 2008. Manually migrate the dates before launching chrome. This will probably impact the NTP perf tests, but it should give us a more realistic baseline. BUG=24369 Review URL: http://codereview.chromium.org/267056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/ui/ui_test.cc24
-rw-r--r--chrome/test/ui/ui_test.h9
2 files changed, 29 insertions, 4 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index d0959ca..10f8b58 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -7,6 +7,7 @@
#include <set>
#include <vector>
+#include "app/sql/connection.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/file_util.h"
@@ -363,6 +364,9 @@ void UITest::LaunchBrowser(const CommandLine& arguments, bool clear_profile) {
if (profile_type_ == UITest::COMPLEX_THEME) {
RewritePreferencesFile(user_data_dir_);
}
+
+ // Update the history file to include recent dates.
+ UpdateHistoryDates();
}
ASSERT_TRUE(LaunchBrowserHelper(arguments, use_existing_browser_, false,
@@ -921,6 +925,7 @@ void UITest::RewritePreferencesFile(const FilePath& user_data_dir) {
UTF16ToASCII(ReplaceStringPlaceholders(format_string, subst, NULL));
EXPECT_TRUE(file_util::WriteFile(pref_path, prefs_string.c_str(),
prefs_string.size()));
+ file_util::EvictFileFromSystemCache(pref_path);
}
// static
@@ -1140,3 +1145,22 @@ bool UITest::LaunchBrowserHelper(const CommandLine& arguments,
return true;
}
+
+void UITest::UpdateHistoryDates() {
+ // Migrate the times in the segment_usage table to yesterday so we get
+ // actual thumbnails on the NTP.
+ sql::Connection db;
+ FilePath history =
+ user_data_dir_.AppendASCII("Default").AppendASCII("History");
+ ASSERT_TRUE(db.Open(history));
+ base::Time yesterday = base::Time::Now() - base::TimeDelta::FromDays(1);
+ std::string yesterday_str = Int64ToString(yesterday.ToInternalValue());
+ std::string query = StringPrintf(
+ "UPDATE segment_usage "
+ "SET time_slot = %s "
+ "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);",
+ yesterday_str.c_str());
+ ASSERT_TRUE(db.Execute(query.c_str()));
+ db.Close();
+ file_util::EvictFileFromSystemCache(history);
+}
diff --git a/chrome/test/ui/ui_test.h b/chrome/test/ui/ui_test.h
index 4112549a..2ed3cf4 100644
--- a/chrome/test/ui/ui_test.h
+++ b/chrome/test/ui/ui_test.h
@@ -19,9 +19,6 @@
#include "build/build_config.h"
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
#include <string>
#include "base/command_line.h"
@@ -287,7 +284,6 @@ class UITest : public testing::Test {
bool need_equal,
bool delete_generated_file);
- public:
// Get/Set a flag to run the renderer in process when running the
// tests.
static bool in_process_renderer() { return in_process_renderer_; }
@@ -527,6 +523,11 @@ class UITest : public testing::Test {
bool wait,
base::ProcessHandle* process);
+ // We want to have a current history database when we start the browser so
+ // things like the NTP will have thumbnails. This method updates the dates
+ // in the history to be more recent.
+ void UpdateHistoryDates();
+
base::Time test_start_time_; // Time the test was started
// (so we can check for new crash dumps)
static bool no_sandbox_;