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

Unified Diff: ios/chrome/browser/ui/history/history_util_unittest.mm

Issue 2590473002: Upstream Chrome on iOS source code [5/11]. (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « ios/chrome/browser/ui/history/history_util.mm ('k') | ios/chrome/browser/ui/history/tab_history_cell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ui/history/history_util_unittest.mm
diff --git a/ios/chrome/browser/ui/history/history_util_unittest.mm b/ios/chrome/browser/ui/history/history_util_unittest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..796539a5e446c68b42905edb4d3ed052a57aa76b
--- /dev/null
+++ b/ios/chrome/browser/ui/history/history_util_unittest.mm
@@ -0,0 +1,133 @@
+// Copyright 2016 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 "ios/chrome/browser/ui/history/history_util.h"
+
+#include <stdint.h>
+
+#include "base/macros.h"
+#include "base/strings/utf_string_conversions.h"
+#include "base/time/time.h"
+#include "ios/chrome/browser/ui/history/history_entry.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+namespace {
+
+struct TestResult {
+ std::string url;
+ int64_t hour_offset; // Visit time in hours past the baseline time.
+};
+
+// Duplicates on the same day in the local timezone are removed, so set a
+// baseline time in local time.
+const base::Time baseline_time = base::Time::UnixEpoch().LocalMidnight();
+
+// For each item in |results|, create a new Value representing the visit, and
+// insert it into |list_value|.
+void AddQueryResults(TestResult* test_results,
+ int test_results_size,
+ std::vector<history::HistoryEntry>* results) {
+ for (int i = 0; i < test_results_size; ++i) {
+ history::HistoryEntry entry;
+ entry.time =
+ baseline_time + base::TimeDelta::FromHours(test_results[i].hour_offset);
+ entry.url = GURL(test_results[i].url);
+ entry.all_timestamps.insert(entry.time.ToInternalValue());
+ results->push_back(entry);
+ }
+}
+
+// Returns true if |result| matches the test data given by |correct_result|,
+// otherwise returns false.
+bool ResultEquals(const history::HistoryEntry& result,
+ const TestResult& correct_result) {
+ base::Time correct_time =
+ baseline_time + base::TimeDelta::FromHours(correct_result.hour_offset);
+
+ return result.time == correct_time && result.url == GURL(correct_result.url);
+}
+
+} // namespace
+
+// Tests that the MergeDuplicateResults method correctly removes duplicate
+// visits to the same URL on the same day.
+TEST(HistoryUtilTest, MergeDuplicateResults) {
+ {
+ // Basic test that duplicates on the same day are removed.
+ TestResult test_data[] = {
+ {"http://testurl.com", 0},
+ {"http://testurl.de", 1},
+ {"http://testurl.com", 2},
+ {"http://testurl.com", 3} // Most recent.
+ };
+ std::vector<history::HistoryEntry> results;
+ AddQueryResults(test_data, arraysize(test_data), &results);
+ history::MergeDuplicateHistoryEntries(&results);
+
+ ASSERT_EQ(2U, results.size());
+ EXPECT_TRUE(ResultEquals(results[0], test_data[3]));
+ EXPECT_TRUE(ResultEquals(results[1], test_data[1]));
+ }
+
+ {
+ // Test that a duplicate URL on the next day is not removed.
+ TestResult test_data[] = {
+ {"http://testurl.com", 0},
+ {"http://testurl.com", 23},
+ {"http://testurl.com", 24}, // Most recent.
+ };
+ std::vector<history::HistoryEntry> results;
+ AddQueryResults(test_data, arraysize(test_data), &results);
+ history::MergeDuplicateHistoryEntries(&results);
+
+ ASSERT_EQ(2U, results.size());
+ EXPECT_TRUE(ResultEquals(results[0], test_data[2]));
+ EXPECT_TRUE(ResultEquals(results[1], test_data[1]));
+ }
+
+ {
+ // Test multiple duplicates across multiple days.
+ TestResult test_data[] = {
+ // First day.
+ {"http://testurl.de", 0},
+ {"http://testurl.com", 1},
+ {"http://testurl.de", 2},
+ {"http://testurl.com", 3},
+
+ // Second day.
+ {"http://testurl.de", 24},
+ {"http://testurl.com", 25},
+ {"http://testurl.de", 26},
+ {"http://testurl.com", 27}, // Most recent.
+ };
+ std::vector<history::HistoryEntry> results;
+ AddQueryResults(test_data, arraysize(test_data), &results);
+ history::MergeDuplicateHistoryEntries(&results);
+
+ ASSERT_EQ(4U, results.size());
+ EXPECT_TRUE(ResultEquals(results[0], test_data[7]));
+ EXPECT_TRUE(ResultEquals(results[1], test_data[6]));
+ EXPECT_TRUE(ResultEquals(results[2], test_data[3]));
+ EXPECT_TRUE(ResultEquals(results[3], test_data[2]));
+ }
+
+ {
+ // Test that timestamps for duplicates are properly saved.
+ TestResult test_data[] = {
+ {"http://testurl.com", 0},
+ {"http://testurl.de", 1},
+ {"http://testurl.com", 2},
+ {"http://testurl.com", 3} // Most recent.
+ };
+ std::vector<history::HistoryEntry> results;
+ AddQueryResults(test_data, arraysize(test_data), &results);
+ history::MergeDuplicateHistoryEntries(&results);
+
+ ASSERT_EQ(2U, results.size());
+ EXPECT_TRUE(ResultEquals(results[0], test_data[3]));
+ EXPECT_TRUE(ResultEquals(results[1], test_data[1]));
+ EXPECT_EQ(3u, results[0].all_timestamps.size());
+ EXPECT_EQ(1u, results[1].all_timestamps.size());
+ }
+}
« no previous file with comments | « ios/chrome/browser/ui/history/history_util.mm ('k') | ios/chrome/browser/ui/history/tab_history_cell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698