| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/banners/app_banner_metrics.h" | 8 #include "chrome/browser/banners/app_banner_metrics.h" |
| 9 #include "chrome/browser/banners/app_banner_settings_helper.h" | 9 #include "chrome/browser/banners/app_banner_settings_helper.h" |
| 10 #include "chrome/browser/engagement/site_engagement_service.h" | 10 #include "chrome/browser/engagement/site_engagement_service.h" |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 642 AppBannerSettingsHelper::ShouldShowBanner( | 642 AppBannerSettingsHelper::ShouldShowBanner( |
| 643 web_contents(), url, kTestPackageName, reference_time)); | 643 web_contents(), url, kTestPackageName, reference_time)); |
| 644 | 644 |
| 645 // Block the site more recently. Now it should not be shown. | 645 // Block the site more recently. Now it should not be shown. |
| 646 AppBannerSettingsHelper::RecordBannerEvent( | 646 AppBannerSettingsHelper::RecordBannerEvent( |
| 647 web_contents(), url, kTestPackageName, | 647 web_contents(), url, kTestPackageName, |
| 648 AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, two_months_ago); | 648 AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK, two_months_ago); |
| 649 EXPECT_EQ(PREVIOUSLY_BLOCKED, | 649 EXPECT_EQ(PREVIOUSLY_BLOCKED, |
| 650 AppBannerSettingsHelper::ShouldShowBanner( | 650 AppBannerSettingsHelper::ShouldShowBanner( |
| 651 web_contents(), url, kTestPackageName, reference_time)); | 651 web_contents(), url, kTestPackageName, reference_time)); |
| 652 |
| 653 // Change the number of days enforced. |
| 654 AppBannerSettingsHelper::SetDaysAfterDismissAndIgnoreToTrigger(59, 14); |
| 655 |
| 656 EXPECT_EQ(NO_ERROR_DETECTED, |
| 657 AppBannerSettingsHelper::ShouldShowBanner( |
| 658 web_contents(), url, kTestPackageName, reference_time)); |
| 652 } | 659 } |
| 653 | 660 |
| 654 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterShowing) { | 661 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterShowing) { |
| 655 GURL url(kTestURL); | 662 GURL url(kTestURL); |
| 656 NavigateAndCommit(url); | 663 NavigateAndCommit(url); |
| 657 | 664 |
| 658 base::Time reference_time = GetReferenceTime(); | 665 base::Time reference_time = GetReferenceTime(); |
| 659 base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1); | 666 base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1); |
| 660 base::Time one_week_ago = reference_time - base::TimeDelta::FromDays(7); | 667 base::Time one_week_ago = reference_time - base::TimeDelta::FromDays(7); |
| 661 base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366); | 668 base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 684 AppBannerSettingsHelper::ShouldShowBanner( | 691 AppBannerSettingsHelper::ShouldShowBanner( |
| 685 web_contents(), url, kTestPackageName, reference_time)); | 692 web_contents(), url, kTestPackageName, reference_time)); |
| 686 | 693 |
| 687 // Show the site more recently. Now it should not be shown. | 694 // Show the site more recently. Now it should not be shown. |
| 688 AppBannerSettingsHelper::RecordBannerEvent( | 695 AppBannerSettingsHelper::RecordBannerEvent( |
| 689 web_contents(), url, kTestPackageName, | 696 web_contents(), url, kTestPackageName, |
| 690 AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW, one_week_ago); | 697 AppBannerSettingsHelper::APP_BANNER_EVENT_DID_SHOW, one_week_ago); |
| 691 EXPECT_EQ(PREVIOUSLY_IGNORED, | 698 EXPECT_EQ(PREVIOUSLY_IGNORED, |
| 692 AppBannerSettingsHelper::ShouldShowBanner( | 699 AppBannerSettingsHelper::ShouldShowBanner( |
| 693 web_contents(), url, kTestPackageName, reference_time)); | 700 web_contents(), url, kTestPackageName, reference_time)); |
| 701 |
| 702 // Change the number of days enforced. |
| 703 AppBannerSettingsHelper::SetDaysAfterDismissAndIgnoreToTrigger(90, 6); |
| 704 |
| 705 EXPECT_EQ(NO_ERROR_DETECTED, |
| 706 AppBannerSettingsHelper::ShouldShowBanner( |
| 707 web_contents(), url, kTestPackageName, reference_time)); |
| 694 } | 708 } |
| 695 | 709 |
| 696 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterAdding) { | 710 TEST_F(AppBannerSettingsHelperTest, ShouldNotShowAfterAdding) { |
| 697 GURL url(kTestURL); | 711 GURL url(kTestURL); |
| 698 NavigateAndCommit(url); | 712 NavigateAndCommit(url); |
| 699 | 713 |
| 700 base::Time reference_time = GetReferenceTime(); | 714 base::Time reference_time = GetReferenceTime(); |
| 701 base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1); | 715 base::Time one_day_ago = reference_time - base::TimeDelta::FromDays(1); |
| 702 base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366); | 716 base::Time one_year_ago = reference_time - base::TimeDelta::FromDays(366); |
| 703 | 717 |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 871 first_day); | 885 first_day); |
| 872 EXPECT_TRUE( | 886 EXPECT_TRUE( |
| 873 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, first_day)); | 887 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, first_day)); |
| 874 EXPECT_TRUE( | 888 EXPECT_TRUE( |
| 875 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, ninth_day)); | 889 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, ninth_day)); |
| 876 EXPECT_TRUE( | 890 EXPECT_TRUE( |
| 877 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, tenth_day)); | 891 AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, tenth_day)); |
| 878 EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, | 892 EXPECT_TRUE(AppBannerSettingsHelper::WasLaunchedRecently(profile(), url, |
| 879 eleventh_day)); | 893 eleventh_day)); |
| 880 } | 894 } |
| OLD | NEW |