chrome/browser/engagement/site_engagement_service_unittest.cc - Issue 1373453002: Allow the site engagement service thresholds to be varied via field trial.

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

Issue 1373453002: Allow the site engagement service thresholds to be varied via field trial. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@time-on-site-uma

Patch Set: 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

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 936e2e1aa675d54b611e4b6dc5c4d2a00aec18a1..a0db2ed490c4260d3fdb713aff7bb5aa9be0edc6 100644

--- a/chrome/browser/engagement/site_engagement_service_unittest.cc

+++ b/chrome/browser/engagement/site_engagement_service_unittest.cc

@@ -89,19 +89,19 @@ class SiteEngagementScoreTest : public testing::Test {

};

// Accumulate score many times on the same day. Ensure each time the score goes

-// up by kNavigationPoints, but not more than kMaxPointsPerDay.

+// up by gNavigationPoints, but not more than gMaxPointsPerDay.

TEST_F(SiteEngagementScoreTest, AccumulateOnSameDay) {

base::Time reference_time = GetReferenceTime();

test_clock_.SetNow(reference_time);

for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

- EXPECT_EQ(std::min(SiteEngagementScore::kMaxPointsPerDay,

- (i + 1) * SiteEngagementScore::kNavigationPoints),

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

+ EXPECT_EQ(std::min(SiteEngagementScore::gMaxPointsPerDay,

+ (i + 1) * SiteEngagementScore::gNavigationPoints),

score_.Score());

}

- EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());

+ EXPECT_EQ(SiteEngagementScore::gMaxPointsPerDay, score_.Score());

}

// Accumulate on the first day to max that day's engagement, then accumulate on

@@ -112,21 +112,21 @@ TEST_F(SiteEngagementScoreTest, AccumulateOnTwoDays) {

test_clock_.SetNow(reference_time);

for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

- EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());

+ EXPECT_EQ(SiteEngagementScore::gMaxPointsPerDay, score_.Score());

test_clock_.SetNow(later_date);

for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

double day_score =

- std::min(SiteEngagementScore::kMaxPointsPerDay,

- (i + 1) * SiteEngagementScore::kNavigationPoints);

- EXPECT_EQ(day_score + SiteEngagementScore::kMaxPointsPerDay,

+ std::min(SiteEngagementScore::gMaxPointsPerDay,

+ (i + 1) * SiteEngagementScore::gNavigationPoints);

+ EXPECT_EQ(day_score + SiteEngagementScore::gMaxPointsPerDay,

score_.Score());

}

- EXPECT_EQ(2 * SiteEngagementScore::kMaxPointsPerDay, score_.Score());

+ EXPECT_EQ(2 * SiteEngagementScore::gMaxPointsPerDay, score_.Score());

}

// Accumulate score on many consecutive days and ensure the score doesn't exceed

@@ -138,10 +138,10 @@ TEST_F(SiteEngagementScoreTest, AccumulateALotOnManyDays) {

current_day += base::TimeDelta::FromDays(1);

test_clock_.SetNow(current_day);

for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

EXPECT_EQ(std::min(SiteEngagementScore::kMaxPoints,

- (i + 1) * SiteEngagementScore::kMaxPointsPerDay),

+ (i + 1) * SiteEngagementScore::gMaxPointsPerDay),

score_.Score());

}

@@ -158,12 +158,12 @@ TEST_F(SiteEngagementScoreTest, AccumulateALittleOnManyDays) {

test_clock_.SetNow(current_day);

for (int j = 0; j < kLessAccumulationsThanNeededToMaxDailyEngagement; ++j)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

EXPECT_EQ(

std::min(SiteEngagementScore::kMaxPoints,

(i + 1) * kLessAccumulationsThanNeededToMaxDailyEngagement *

- SiteEngagementScore::kNavigationPoints),

+ SiteEngagementScore::gNavigationPoints),

score_.Score());

}

@@ -180,7 +180,7 @@ TEST_F(SiteEngagementScoreTest, ScoresDecayOverTime) {

test_clock_.SetNow(current_day);

for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

}

EXPECT_EQ(SiteEngagementScore::kMaxPoints, score_.Score());

@@ -189,15 +189,15 @@ TEST_F(SiteEngagementScoreTest, ScoresDecayOverTime) {

// elapsed.

test_clock_.SetNow(

current_day +

- base::TimeDelta::FromDays(SiteEngagementScore::kDecayPeriodInDays - 1));

+ base::TimeDelta::FromDays(SiteEngagementScore::gDecayPeriodInDays - 1));

EXPECT_EQ(SiteEngagementScore::kMaxPoints, score_.Score());

// The score should have decayed by one chunk after one decay period has

// elapsed.

test_clock_.SetNow(

current_day +

- base::TimeDelta::FromDays(SiteEngagementScore::kDecayPeriodInDays));

- EXPECT_EQ(SiteEngagementScore::kMaxPoints - SiteEngagementScore::kDecayPoints,

+ base::TimeDelta::FromDays(SiteEngagementScore::gDecayPeriodInDays));

+ EXPECT_EQ(SiteEngagementScore::kMaxPoints - SiteEngagementScore::gDecayPoints,

score_.Score());

// The score should have decayed by the right number of chunks after a few

@@ -205,17 +205,17 @@ TEST_F(SiteEngagementScoreTest, ScoresDecayOverTime) {

test_clock_.SetNow(

current_day +

base::TimeDelta::FromDays(kLessPeriodsThanNeededToDecayMaxScore *

- SiteEngagementScore::kDecayPeriodInDays));

+ SiteEngagementScore::gDecayPeriodInDays));

EXPECT_EQ(SiteEngagementScore::kMaxPoints -

kLessPeriodsThanNeededToDecayMaxScore *

- SiteEngagementScore::kDecayPoints,

+ SiteEngagementScore::gDecayPoints,

score_.Score());

// The score should not decay below zero.

test_clock_.SetNow(

current_day +

base::TimeDelta::FromDays(kMorePeriodsThanNeededToDecayMaxScore *

- SiteEngagementScore::kDecayPeriodInDays));

+ SiteEngagementScore::gDecayPeriodInDays));

EXPECT_EQ(0, score_.Score());

}

@@ -229,27 +229,27 @@ TEST_F(SiteEngagementScoreTest, DecaysAppliedBeforeAdd) {

test_clock_.SetNow(current_day);

for (int j = 0; j < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++j)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

}

double initial_score = kLessDaysThanNeededToMaxTotalEngagement *

- SiteEngagementScore::kMaxPointsPerDay;

+ SiteEngagementScore::gMaxPointsPerDay;

EXPECT_EQ(initial_score, score_.Score());

// Go forward a few decay periods.

test_clock_.SetNow(

current_day +

base::TimeDelta::FromDays(kLessPeriodsThanNeededToDecayMaxScore *

- SiteEngagementScore::kDecayPeriodInDays));

+ SiteEngagementScore::gDecayPeriodInDays));

double decayed_score =

initial_score -

- kLessPeriodsThanNeededToDecayMaxScore * SiteEngagementScore::kDecayPoints;

+ kLessPeriodsThanNeededToDecayMaxScore * SiteEngagementScore::gDecayPoints;

EXPECT_EQ(decayed_score, score_.Score());

// Now add some points.

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

- EXPECT_EQ(decayed_score + SiteEngagementScore::kNavigationPoints,

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

+ EXPECT_EQ(decayed_score + SiteEngagementScore::gNavigationPoints,

score_.Score());

}

@@ -259,25 +259,25 @@ TEST_F(SiteEngagementScoreTest, GoBackInTime) {

test_clock_.SetNow(current_day);

for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i)

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

- EXPECT_EQ(SiteEngagementScore::kMaxPointsPerDay, score_.Score());

+ EXPECT_EQ(SiteEngagementScore::gMaxPointsPerDay, score_.Score());

// Adding to the score on an earlier date should be treated like another day,

// and should not cause any decay.

test_clock_.SetNow(current_day - base::TimeDelta::FromDays(

kMorePeriodsThanNeededToDecayMaxScore *

- SiteEngagementScore::kDecayPoints));

+ SiteEngagementScore::gDecayPoints));

for (int i = 0; i < kMoreAccumulationsThanNeededToMaxDailyEngagement; ++i) {

- score_.AddPoints(SiteEngagementScore::kNavigationPoints);

+ score_.AddPoints(SiteEngagementScore::gNavigationPoints);

double day_score =

- std::min(SiteEngagementScore::kMaxPointsPerDay,

- (i + 1) * SiteEngagementScore::kNavigationPoints);

- EXPECT_EQ(day_score + SiteEngagementScore::kMaxPointsPerDay,

+ std::min(SiteEngagementScore::gMaxPointsPerDay,

+ (i + 1) * SiteEngagementScore::gNavigationPoints);

+ EXPECT_EQ(day_score + SiteEngagementScore::gMaxPointsPerDay,

score_.Score());

}

- EXPECT_EQ(2 * SiteEngagementScore::kMaxPointsPerDay, score_.Score());

+ EXPECT_EQ(2 * SiteEngagementScore::gMaxPointsPerDay, score_.Score());

}

// Test that scores are read / written correctly from / to empty score

« chrome/browser/engagement/site_engagement_service.cc ('K') | « chrome/browser/engagement/site_engagement_service.cc ('k') | no next file » | no next file with comments »