summaryrefslogtreecommitdiff
path: root/chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc')
-rw-r--r--chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc97
1 files changed, 64 insertions, 33 deletions
diff --git a/chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc b/chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc
index bef78791741..3ee6da7cba4 100644
--- a/chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc
+++ b/chromium/components/history_clusters/core/ranking_cluster_finalizer_unittest.cc
@@ -38,14 +38,14 @@ TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsSameURL) {
history::ClusterVisit visit2 = testing::CreateClusterVisit(
testing::CreateDefaultAnnotatedVisit(2, GURL("https://bar.com/")));
- visit2.duplicate_visit_ids.push_back(1);
+ visit2.duplicate_visits.push_back(visit);
history::Cluster cluster;
- cluster.visits = {visit, visit2};
+ cluster.visits = {visit2};
FinalizeCluster(cluster);
EXPECT_THAT(testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(testing::VisitResult(1, 0.0),
- testing::VisitResult(2, 1.0, {1}))));
+ ElementsAre(ElementsAre(testing::VisitResult(
+ 2, 1.0, {testing::VisitResult(1, 0.0)}))));
}
TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsDifferentURLs) {
@@ -73,14 +73,14 @@ TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsSimilarURL) {
history::ClusterVisit visit2 =
testing::CreateClusterVisit(testing::CreateDefaultAnnotatedVisit(
2, GURL("https://example.com/normalized")));
- visit2.duplicate_visit_ids.push_back(1);
+ visit2.duplicate_visits.push_back(visit);
history::Cluster cluster;
- cluster.visits = {visit, visit2};
+ cluster.visits = {visit2};
FinalizeCluster(cluster);
EXPECT_THAT(testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(testing::VisitResult(1, 0.0),
- testing::VisitResult(2, 1.0, {1}))));
+ ElementsAre(ElementsAre(testing::VisitResult(
+ 2, 1.0, {testing::VisitResult(1, 0.0)}))));
}
TEST_F(RankingClusterFinalizerTest, ScoreMultipleVisitsDifferentDurations) {
@@ -98,7 +98,7 @@ TEST_F(RankingClusterFinalizerTest, ScoreMultipleVisitsDifferentDurations) {
history::ClusterVisit visit4 = testing::CreateClusterVisit(
testing::CreateDefaultAnnotatedVisit(4, GURL("https://github.com/")));
visit4.annotated_visit.visit_row.visit_duration = base::Seconds(20);
- visit4.duplicate_visit_ids.push_back(1);
+ visit4.duplicate_visits.push_back(visit);
history::ClusterVisit visit5 =
testing::CreateClusterVisit(testing::CreateDefaultAnnotatedVisit(
@@ -107,13 +107,13 @@ TEST_F(RankingClusterFinalizerTest, ScoreMultipleVisitsDifferentDurations) {
visit5.annotated_visit.visit_row.visit_duration = base::Seconds(10);
history::Cluster cluster;
- cluster.visits = {visit, visit2, visit4, visit5};
+ cluster.visits = {visit2, visit4, visit5};
FinalizeCluster(cluster);
- EXPECT_THAT(
- testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(
- testing::VisitResult(1, 0.0), testing::VisitResult(2, 1.0),
- testing::VisitResult(4, 1.0, {1}), testing::VisitResult(10, 0.5))));
+ EXPECT_THAT(testing::ToVisitResults({cluster}),
+ ElementsAre(ElementsAre(
+ testing::VisitResult(2, 1.0),
+ testing::VisitResult(4, 1.0, {testing::VisitResult(1, 0.0)}),
+ testing::VisitResult(10, 0.5))));
}
TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsSameURLBookmarked) {
@@ -124,14 +124,14 @@ TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsSameURLBookmarked) {
history::ClusterVisit visit2 = testing::CreateClusterVisit(
testing::CreateDefaultAnnotatedVisit(2, GURL("https://bar.com/")));
- visit2.duplicate_visit_ids.push_back(1);
+ visit2.duplicate_visits.push_back(visit);
history::Cluster cluster;
- cluster.visits = {visit, visit2};
+ cluster.visits = {visit2};
FinalizeCluster(cluster);
EXPECT_THAT(testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(testing::VisitResult(1, 0.0),
- testing::VisitResult(2, 1.0, {1}))));
+ ElementsAre(ElementsAre(testing::VisitResult(
+ 2, 1.0, {testing::VisitResult(1, 0.0)}))));
}
TEST_F(RankingClusterFinalizerTest, ScoreTwoVisitsWithBookmarksAndDuration) {
@@ -190,43 +190,74 @@ TEST_F(RankingClusterFinalizerTest, ScoreTwoCanonicalSearchResultsPages) {
testing::CreateDefaultAnnotatedVisit(
1, GURL("https://google.com/search?q=whatever#abc")),
GURL("https://google.com/search?q=whatever"));
- visit.is_search_visit = true;
+ visit.search_terms = u"whatever";
history::ClusterVisit visit2 = testing::CreateClusterVisit(
testing::CreateDefaultAnnotatedVisit(
2, GURL("https://google.com/search?q=bar#abc")),
GURL("https://google.com/search?q=bar"));
- visit2.is_search_visit = true;
+ visit2.search_terms = u"bar";
history::Cluster cluster;
cluster.visits = {visit, visit2};
FinalizeCluster(cluster);
- EXPECT_THAT(testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(testing::VisitResult(1, 1.0, {}, true),
- testing::VisitResult(2, 1.0, {}, true))));
+ EXPECT_THAT(
+ testing::ToVisitResults({cluster}),
+ ElementsAre(ElementsAre(testing::VisitResult(1, 1.0, {}, u"whatever"),
+ testing::VisitResult(2, 1.0, {}, u"bar"))));
}
TEST_F(RankingClusterFinalizerTest, ScoreSearchResultsPagesOneDuplicate) {
+ history::ClusterVisit visit2 = testing::CreateClusterVisit(
+ testing::CreateDefaultAnnotatedVisit(
+ 2, GURL("https://google.com/search?q=bar")),
+ GURL("https://google.com/search?q=bar"));
+ visit2.search_terms = u"bar";
+
// Visit2 is marked as a duplicate of visit
history::ClusterVisit visit = testing::CreateClusterVisit(
testing::CreateDefaultAnnotatedVisit(
1, GURL("https://google.com/search?q=whatever#abc")),
GURL("https://google.com/search?q=whatever"));
- visit.duplicate_visit_ids = {2};
- visit.is_search_visit = true;
+ visit.duplicate_visits = {visit2};
+ visit.search_terms = u"whatever";
+
+ history::Cluster cluster;
+ cluster.visits = {visit};
+ FinalizeCluster(cluster);
+ EXPECT_THAT(
+ testing::ToVisitResults({cluster}),
+ ElementsAre(ElementsAre(testing::VisitResult(
+ 1, 1.0, {testing::VisitResult(2, 0.0, {}, u"bar")}, u"whatever"))));
+}
+
+TEST_F(RankingClusterFinalizerTest, ScoreVisitsOnHasPageTitle) {
+ history::ClusterVisit visit1 = testing::CreateClusterVisit(
+ testing::CreateDefaultAnnotatedVisit(1, GURL("https://foo.com/")),
+ GURL("https://foo.com/"));
+ visit1.annotated_visit.url_row.set_title(u"chocolate");
history::ClusterVisit visit2 = testing::CreateClusterVisit(
- testing::CreateDefaultAnnotatedVisit(
- 2, GURL("https://google.com/search?q=bar")),
- GURL("https://google.com/search?q=bar"));
- visit2.is_search_visit = true;
+ testing::CreateDefaultAnnotatedVisit(2, GURL("https://bar.com/")),
+ GURL("https://bar.com/"));
+ visit2.annotated_visit.url_row.set_title(std::u16string());
+
+ history::ClusterVisit visit3 = testing::CreateClusterVisit(
+ testing::CreateDefaultAnnotatedVisit(3, GURL("https://baz.com/")),
+ GURL("https://baz.com/"));
+ visit3.annotated_visit.url_row.set_title(u"vanilla");
history::Cluster cluster;
- cluster.visits = {visit, visit2};
+ cluster.visits = {visit1, visit2, visit3};
FinalizeCluster(cluster);
EXPECT_THAT(testing::ToVisitResults({cluster}),
- ElementsAre(ElementsAre(testing::VisitResult(1, 1.0, {2}, true),
- testing::VisitResult(2, 0.0, {}, true))));
+ ElementsAre(ElementsAre(
+ testing::VisitResult(/*visit_id=*/1, /*score=*/1.0,
+ /*duplicate_visits=*/{}),
+ testing::VisitResult(/*visit_id=*/2, /*score=*/0.333333,
+ /*duplicate_visits=*/{}),
+ testing::VisitResult(/*visit_id=*/3, /*score=*/1.0,
+ /*duplicate_visits=*/{}))));
}
} // namespace
View Lorry Controller Status