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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/engagement/site_engagement_service_unittest.cc

Issue 1338603002: Implement a site engagement score based on time-on-site. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More web contents validity checking Created 5 years, 3 months 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
« chrome/browser/engagement/site_engagement_helper.cc ('K') | « chrome/browser/engagement/site_engagement_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/engagement/site_engagement_service_unittest.cc
diff --git a/chrome/browser/engagement/site_engagement_service_unittest.cc b/chrome/browser/engagement/site_engagement_service_unittest.cc
index adff26216ee58491a3dc25391c426685b88f9148..7708c6e16a8e40916a7ee9b7f0e03681d6824255 100644
--- a/chrome/browser/engagement/site_engagement_service_unittest.cc
+++ b/chrome/browser/engagement/site_engagement_service_unittest.cc
@@ -14,9 +14,9 @@
namespace {
-const int kLessNavigationsThanNeededToMaxDailyEngagement = 2;
-const int kMoreNavigationsThanNeededToMaxDailyEngagement = 20;
-const int kMoreNavigationsThanNeededToMaxTotalEngagement = 200;
+const int kLessAccumulationsThanNeededToMaxDailyEngagement = 2;
+const int kMoreAccumulationsThanNeededToMaxDailyEngagement = 20;
+const int kMoreAccumulationsThanNeededToMaxTotalEngagement = 200;
const int kLessDaysThanNeededToMaxTotalEngagement = 4;
const int kMoreDaysThanNeededToMaxTotalEngagement = 40;
const int kLessPeriodsThanNeededToDecayMaxScore = 2;
@@ -88,40 +88,40 @@ class SiteEngagementScoreTest : public testing::Test {
SiteEngagementScore score_;
};
-// Navigate many times on the same day. Ensure each time the score goes up by
-// kNavigationPoints, but not more than kMaxPointsPerDay.
-TEST_F(SiteEngagementScoreTest, NavigateOnSameDay) {
+// Accumulate score many times on the same day. Ensure each time the score goes
+// up by kUserInputPoints, but not more than kMaxPointsPerDay.
+TEST_F(SiteEngagementScoreTest, AccumulateOnSameDay) {
base::Time reference_time = GetReferenceTime();
test_clock_.SetNow(reference_time);
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxDailyEngagement; ++i) {
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(std::min(SiteEngagementScore::kMaxPointsPerDay,
- (i + 1) * SiteEngagementScore::kNavigationPoints),
+ (i + 1) * SiteEngagementScore::kUserInputPoints),
score_.Score());
}
EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());
}
-// Navigate on the first day to max that day's engagement, then navigate on a
-// different day.
-TEST_F(SiteEngagementScoreTest, NavigateOnTwoDays) {
+// Accumulate on the first day to max that day's engagement, then accumulate on
+// a different day.
+TEST_F(SiteEngagementScoreTest, AccumulateOnTwoDays) {
base::Time reference_time = GetReferenceTime();
base::Time later_date = reference_time + base::TimeDelta::FromDays(2);
test_clock_.SetNow(reference_time);
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxDailyEngagement; ++i)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());
test_clock_.SetNow(later_date);
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxDailyEngagement; ++i) {
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
double day_score =
std::min(SiteEngagementScore::kMaxPointsPerDay,
- (i + 1) * SiteEngagementScore::kNavigationPoints);
+ (i + 1) * SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(day_score + SiteEngagementScore::kMaxPointsPerDay,
score_.Score());
}
@@ -129,16 +129,16 @@ TEST_F(SiteEngagementScoreTest, NavigateOnTwoDays) {
EXPECT_EQ(2 * SiteEngagementScore::kMaxPointsPerDay, score_.Score());
}
-// Navigate a lot on many consecutive days and ensure the score doesn't exceed
+// Accumulate score on many consecutive days and ensure the score doesn't exceed
// the maximum allowed.
-TEST_F(SiteEngagementScoreTest, NavigateALotOnManyDays) {
+TEST_F(SiteEngagementScoreTest, AccumulateALotOnManyDays) {
base::Time current_day = GetReferenceTime();
for (int i = 0; i < kMoreDaysThanNeededToMaxTotalEngagement; ++i) {
current_day += base::TimeDelta::FromDays(1);
test_clock_.SetNow(current_day);
- for (int j = 0; j < kMoreNavigationsThanNeededToMaxDailyEngagement; ++j)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(std::min(SiteEngagementScore::kMaxPoints,
(i + 1) * SiteEngagementScore::kMaxPointsPerDay),
@@ -148,29 +148,29 @@ TEST_F(SiteEngagementScoreTest, NavigateALotOnManyDays) {
EXPECT_EQ(SiteEngagementScore::kMaxPoints, score_.Score());
}
-// Navigate a little on many consecutive days and ensure the score doesn't
+// Accumulate a little on many consecutive days and ensure the score doesn't
// exceed the maximum allowed.
-TEST_F(SiteEngagementScoreTest, NavigateALittleOnManyDays) {
+TEST_F(SiteEngagementScoreTest, AccumulateALittleOnManyDays) {
base::Time current_day = GetReferenceTime();
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxTotalEngagement; ++i) {
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxTotalEngagement; ++i) {
current_day += base::TimeDelta::FromDays(1);
test_clock_.SetNow(current_day);
- for (int j = 0; j < kLessNavigationsThanNeededToMaxDailyEngagement; ++j)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int j = 0; j < kLessAccumulationsThanNeededToMaxDailyEngagement; ++j)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(
std::min(SiteEngagementScore::kMaxPoints,
- (i + 1) * kLessNavigationsThanNeededToMaxDailyEngagement *
- SiteEngagementScore::kNavigationPoints),
+ (i + 1) * kLessAccumulationsThanNeededToMaxDailyEngagement *
+ SiteEngagementScore::kUserInputPoints),
score_.Score());
}
EXPECT_EQ(SiteEngagementScore::kMaxPoints, score_.Score());
}
-// Navigate a bit, then check the score decays properly for a range of times.
+// Accumulate a bit, then check the score decays properly for a range of times.
TEST_F(SiteEngagementScoreTest, ScoresDecayOverTime) {
base::Time current_day = GetReferenceTime();
@@ -179,8 +179,8 @@ TEST_F(SiteEngagementScoreTest, ScoresDecayOverTime) {
current_day += base::TimeDelta::FromDays(1);
test_clock_.SetNow(current_day);
- for (int j = 0; j < kMoreNavigationsThanNeededToMaxDailyEngagement; ++j)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
}
EXPECT_EQ(SiteEngagementScore::kMaxPoints, score_.Score());
@@ -228,8 +228,8 @@ TEST_F(SiteEngagementScoreTest, DecaysAppliedBeforeAdd) {
current_day += base::TimeDelta::FromDays(1);
test_clock_.SetNow(current_day);
- for (int j = 0; j < kMoreNavigationsThanNeededToMaxDailyEngagement; ++j)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
}
double initial_score = kLessDaysThanNeededToMaxTotalEngagement *
@@ -248,8 +248,8 @@ TEST_F(SiteEngagementScoreTest, DecaysAppliedBeforeAdd) {
EXPECT_EQ(decayed_score, score_.Score());
// Now add some points.
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
- EXPECT_EQ(decayed_score + SiteEngagementScore::kNavigationPoints,
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
+ EXPECT_EQ(decayed_score + SiteEngagementScore::kUserInputPoints,
score_.Score());
}
@@ -258,8 +258,8 @@ TEST_F(SiteEngagementScoreTest, GoBackInTime) {
base::Time current_day = GetReferenceTime();
test_clock_.SetNow(current_day);
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxDailyEngagement; ++i)
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i)
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());
@@ -268,11 +268,11 @@ TEST_F(SiteEngagementScoreTest, GoBackInTime) {
test_clock_.SetNow(current_day - base::TimeDelta::FromDays(
kMorePeriodsThanNeededToDecayMaxScore *
SiteEngagementScore::kDecayPoints));
- for (int i = 0; i < kMoreNavigationsThanNeededToMaxDailyEngagement; ++i) {
- score_.AddPoints(SiteEngagementScore::kNavigationPoints);
+ for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {
+ score_.AddPoints(SiteEngagementScore::kUserInputPoints);
double day_score =
std::min(SiteEngagementScore::kMaxPointsPerDay,
- (i + 1) * SiteEngagementScore::kNavigationPoints);
+ (i + 1) * SiteEngagementScore::kUserInputPoints);
EXPECT_EQ(day_score + SiteEngagementScore::kMaxPointsPerDay,
score_.Score());
}
@@ -320,29 +320,6 @@ class SiteEngagementServiceTest : public BrowserWithTestWindowTest {
}
};
-
-// Tests that the Site Engagement service is hooked up properly to navigations
-// by performing two navigations and checking the engagement score increases
-// both times.
-TEST_F(SiteEngagementServiceTest, ScoreIncrementsOnPageRequest) {
benwells 2015/09/16 00:23:32 This test makes sure the whole system works togeth
dominickn 2015/09/18 06:05:28 I'm working on adding a browser/interactive UI tes
- SiteEngagementService* service =
- SiteEngagementServiceFactory::GetForProfile(profile());
- DCHECK(service);
-
- GURL url("http://www.google.com/");
-
- AddTab(browser(), GURL("about:blank"));
- EXPECT_EQ(0, service->GetScore(url));
- int prev_score = service->GetScore(url);
-
- NavigateAndCommitActiveTab(url);
- EXPECT_LT(prev_score, service->GetScore(url));
- prev_score = service->GetScore(url);
-
- NavigateAndCommitActiveTab(url);
- EXPECT_LT(prev_score, service->GetScore(url));
-}
-
// Expect that site engagement scores for several sites are correctly aggregated
// by GetTotalEngagementPoints().
TEST_F(SiteEngagementServiceTest, GetTotalEngagementPoints) {
@@ -359,21 +336,21 @@ TEST_F(SiteEngagementServiceTest, GetTotalEngagementPoints) {
EXPECT_EQ(0, service->GetScore(url2));
EXPECT_EQ(0, service->GetScore(url3));
- service->HandleNavigation(url1);
+ service->HandleUserInput(url1);
EXPECT_EQ(1, service->GetScore(url1));
EXPECT_EQ(1, service->GetTotalEngagementPoints());
- service->HandleNavigation(url2);
- service->HandleNavigation(url2);
+ service->HandleUserInput(url2);
+ service->HandleUserInput(url2);
EXPECT_EQ(2, service->GetScore(url2));
EXPECT_EQ(3, service->GetTotalEngagementPoints());
- service->HandleNavigation(url3);
+ service->HandleUserInput(url3);
EXPECT_EQ(1, service->GetScore(url3));
EXPECT_EQ(4, service->GetTotalEngagementPoints());
- service->HandleNavigation(url1);
- service->HandleNavigation(url1);
+ service->HandleUserInput(url1);
+ service->HandleUserInput(url1);
EXPECT_EQ(3, service->GetScore(url1));
EXPECT_EQ(6, service->GetTotalEngagementPoints());
}
« chrome/browser/engagement/site_engagement_helper.cc ('K') | « chrome/browser/engagement/site_engagement_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698