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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1368533004: Add UMA metrics to the site engagement service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@time-on-site
Patch Set: Rebase 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_service.cc ('K') | « chrome/browser/engagement/site_engagement_service_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | 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 8db3b4114e60e6a5ac1537724b97c86508e787fc..6c0cca2f4a3532c3af9ad9f7c7c98a79d8d45a3e 100644
--- a/chrome/browser/engagement/site_engagement_service_unittest.cc
+++ b/chrome/browser/engagement/site_engagement_service_unittest.cc
@@ -3,9 +3,11 @@
// found in the LICENSE file.
#include "base/command_line.h"
+#include "base/test/histogram_tester.h"
#include "base/test/simple_test_clock.h"
#include "base/values.h"
#include "chrome/browser/engagement/site_engagement_helper.h"
+#include "chrome/browser/engagement/site_engagement_metrics.h"
#include "chrome/browser/engagement/site_engagement_service.h"
#include "chrome/browser/engagement/site_engagement_service_factory.h"
#include "chrome/common/chrome_switches.h"
@@ -345,9 +347,22 @@ TEST_F(SiteEngagementServiceTest, ScoreIncrementsOnPageRequest) {
// Expect that site engagement scores for several sites are correctly aggregated
// by GetTotalEngagementPoints().
TEST_F(SiteEngagementServiceTest, GetTotalNavigationPoints) {
- SiteEngagementService* service =
- SiteEngagementServiceFactory::GetForProfile(profile());
- DCHECK(service);
+ base::SimpleTestClock* clock = new base::SimpleTestClock();
+ scoped_ptr<SiteEngagementService> service(
+ new SiteEngagementService(profile(), make_scoped_ptr(clock)));
+
+ base::Time current_day = GetReferenceTime();
+ clock->SetNow(current_day);
+
+ base::HistogramTester histograms;
+
+ // Histograms should start empty.
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 0);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
// The https and http versions of www.google.com should be separate.
GURL url1("https://www.google.com/");
@@ -361,26 +376,104 @@ TEST_F(SiteEngagementServiceTest, GetTotalNavigationPoints) {
service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
EXPECT_EQ(0.5, service->GetScore(url1));
EXPECT_EQ(0.5, service->GetTotalEngagementPoints());
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 1);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 1);
+
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(59));
service->HandleNavigation(url2, ui::PAGE_TRANSITION_GENERATED);
service->HandleNavigation(url2, ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
EXPECT_EQ(1, service->GetScore(url2));
EXPECT_EQ(1.5, service->GetTotalEngagementPoints());
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 3);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 3);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(60));
service->HandleNavigation(url3, ui::PAGE_TRANSITION_TYPED);
EXPECT_EQ(0.5, service->GetScore(url3));
EXPECT_EQ(2, service->GetTotalEngagementPoints());
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 4);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 4);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
service->HandleNavigation(url1, ui::PAGE_TRANSITION_GENERATED);
service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
EXPECT_EQ(1.5, service->GetScore(url1));
EXPECT_EQ(3, service->GetTotalEngagementPoints());
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 6);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_NAVIGATION, 6);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 2);
+
+ // Advance an origin to the max for a day and advance the clock an hour before
+ // the last increment before max. Expect the histogram to be updated.
+ for (int i = 0; i < 6; ++i)
+ service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
+
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(121));
+ service->HandleNavigation(url1, ui::PAGE_TRANSITION_TYPED);
+
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 13);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 3);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 3);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 3);
}
TEST_F(SiteEngagementServiceTest, GetTotalUserInputPoints) {
- SiteEngagementService* service =
- SiteEngagementServiceFactory::GetForProfile(profile());
- DCHECK(service);
+ base::SimpleTestClock* clock = new base::SimpleTestClock();
+ scoped_ptr<SiteEngagementService> service(
+ new SiteEngagementService(profile(), make_scoped_ptr(clock)));
+
+ base::Time current_day = GetReferenceTime();
+ clock->SetNow(current_day);
+
+ base::HistogramTester histograms;
+
+ // Histograms should start off empty.
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 0);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0);
// The https and http versions of www.google.com should be separate.
GURL url1("https://www.google.com/");
@@ -391,23 +484,88 @@ TEST_F(SiteEngagementServiceTest, GetTotalUserInputPoints) {
EXPECT_EQ(0, service->GetScore(url2));
EXPECT_EQ(0, service->GetScore(url3));
- service->HandleUserInput(url1);
+ service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
EXPECT_DOUBLE_EQ(0.05, service->GetScore(url1));
EXPECT_DOUBLE_EQ(0.05, service->GetTotalEngagementPoints());
-
- service->HandleUserInput(url2);
- service->HandleUserInput(url2);
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 1);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_MOUSE, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 1);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 1);
+
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(45));
+ service->HandleUserInput(url2, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(60));
+ service->HandleUserInput(url2, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
EXPECT_DOUBLE_EQ(0.1, service->GetScore(url2));
EXPECT_DOUBLE_EQ(0.15, service->GetTotalEngagementPoints());
-
- service->HandleUserInput(url3);
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 3);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_MOUSE, 2);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 2);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 2);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 2);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 2);
+
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(150));
+ service->HandleUserInput(url3, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
EXPECT_DOUBLE_EQ(0.05, service->GetScore(url3));
EXPECT_DOUBLE_EQ(0.2, service->GetTotalEngagementPoints());
-
- service->HandleUserInput(url1);
- service->HandleUserInput(url1);
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 4);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 2);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 3);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 3);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 3);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 3);
+
+ service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_KEYPRESS);
+ service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
EXPECT_DOUBLE_EQ(0.15, service->GetScore(url1));
EXPECT_DOUBLE_EQ(0.3, service->GetTotalEngagementPoints());
+ histograms.ExpectTotalCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ 6);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_MOUSE, 3);
+ histograms.ExpectBucketCount(SiteEngagementMetrics::kEngagementTypeHistogram,
+ SiteEngagementMetrics::ENGAGEMENT_KEYPRESS, 3);
+
+ // Advance an origin to the max and ensure the histogram is correctly
+ // incremented.
+ for (int i = 0; i < 1996; ++i)
+ service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+ clock->SetNow(GetReferenceTime() + base::TimeDelta::FromMinutes(210));
+ service->HandleUserInput(url1, SiteEngagementMetrics::ENGAGEMENT_MOUSE);
+
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 4);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 0, 3);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxDailyEngagementHistogram, 1, 1);
+ histograms.ExpectTotalCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 4);
+ histograms.ExpectBucketCount(
+ SiteEngagementMetrics::kOriginsWithMaxEngagementHistogram, 0, 4);
}
// Expect that sites that have reached zero engagement are cleaned up.
« chrome/browser/engagement/site_engagement_service.cc ('K') | « chrome/browser/engagement/site_engagement_service_browsertest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698