| Index: components/password_manager/core/browser/statistics_table_unittest.cc
|
| diff --git a/components/password_manager/core/browser/statistics_table_unittest.cc b/components/password_manager/core/browser/statistics_table_unittest.cc
|
| index e84e78bcccd691dbbcfa1d6edd4ce06f34e8eecf..2f03932eb0b0c3b56acdcaf8917993114b5a3b87 100644
|
| --- a/components/password_manager/core/browser/statistics_table_unittest.cc
|
| +++ b/components/password_manager/core/browser/statistics_table_unittest.cc
|
| @@ -61,9 +61,11 @@ class StatisticsTableTest : public testing::Test {
|
|
|
| TEST_F(StatisticsTableTest, Sanity) {
|
| EXPECT_TRUE(db()->AddRow(test_data()));
|
| + EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain),
|
| ElementsAre(test_data()));
|
| EXPECT_TRUE(db()->RemoveRow(test_data().origin_domain));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain), IsEmpty());
|
| }
|
|
|
| @@ -72,6 +74,7 @@ TEST_F(StatisticsTableTest, Reload) {
|
|
|
| ReloadDatabase();
|
|
|
| + EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain),
|
| ElementsAre(test_data()));
|
| }
|
| @@ -81,10 +84,12 @@ TEST_F(StatisticsTableTest, DoubleOperation) {
|
| test_data().dismissal_count++;
|
| EXPECT_TRUE(db()->AddRow(test_data()));
|
|
|
| + EXPECT_THAT(db()->GetAllRows(), ElementsAre(test_data()));
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain),
|
| ElementsAre(test_data()));
|
|
|
| EXPECT_TRUE(db()->RemoveRow(test_data().origin_domain));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain), IsEmpty());
|
| EXPECT_TRUE(db()->RemoveRow(test_data().origin_domain));
|
| }
|
| @@ -96,9 +101,11 @@ TEST_F(StatisticsTableTest, DifferentUsernames) {
|
|
|
| EXPECT_TRUE(db()->AddRow(stats1));
|
| EXPECT_TRUE(db()->AddRow(stats2));
|
| + EXPECT_THAT(db()->GetAllRows(), UnorderedElementsAre(stats1, stats2));
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain),
|
| UnorderedElementsAre(stats1, stats2));
|
| EXPECT_TRUE(db()->RemoveRow(test_data().origin_domain));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain), IsEmpty());
|
| }
|
|
|
| @@ -119,6 +126,8 @@ TEST_F(StatisticsTableTest, RemoveStatsByOriginAndTime) {
|
| EXPECT_TRUE(db()->AddRow(stats2));
|
| EXPECT_TRUE(db()->AddRow(stats3));
|
| EXPECT_TRUE(db()->AddRow(stats4));
|
| + EXPECT_THAT(db()->GetAllRows(),
|
| + UnorderedElementsAre(stats1, stats2, stats3, stats4));
|
| EXPECT_THAT(db()->GetRows(stats1.origin_domain), ElementsAre(stats1));
|
| EXPECT_THAT(db()->GetRows(stats2.origin_domain), ElementsAre(stats2));
|
| EXPECT_THAT(db()->GetRows(stats3.origin_domain), ElementsAre(stats3));
|
| @@ -128,6 +137,7 @@ TEST_F(StatisticsTableTest, RemoveStatsByOriginAndTime) {
|
| EXPECT_TRUE(
|
| db()->RemoveStatsByOriginAndTime(base::Callback<bool(const GURL&)>(),
|
| base::Time(), base::Time::FromTimeT(2)));
|
| + EXPECT_THAT(db()->GetAllRows(), UnorderedElementsAre(stats2, stats3, stats4));
|
| EXPECT_THAT(db()->GetRows(stats1.origin_domain), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats2.origin_domain), ElementsAre(stats2));
|
| EXPECT_THAT(db()->GetRows(stats3.origin_domain), ElementsAre(stats3));
|
| @@ -139,6 +149,7 @@ TEST_F(StatisticsTableTest, RemoveStatsByOriginAndTime) {
|
| base::Bind(static_cast<bool (*)(const GURL&, const GURL&)>(operator!=),
|
| stats3.origin_domain),
|
| base::Time::FromTimeT(2), base::Time()));
|
| + EXPECT_THAT(db()->GetAllRows(), ElementsAre(stats3));
|
| EXPECT_THAT(db()->GetRows(stats1.origin_domain), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats2.origin_domain), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats3.origin_domain), ElementsAre(stats3));
|
| @@ -149,6 +160,7 @@ TEST_F(StatisticsTableTest, RemoveStatsByOriginAndTime) {
|
| EXPECT_TRUE(
|
| db()->RemoveStatsByOriginAndTime(base::Callback<bool(const GURL&)>(),
|
| base::Time::FromTimeT(2), base::Time()));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats1.origin_domain), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats2.origin_domain), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(stats3.origin_domain), IsEmpty());
|
| @@ -158,6 +170,7 @@ TEST_F(StatisticsTableTest, RemoveStatsByOriginAndTime) {
|
| TEST_F(StatisticsTableTest, BadURL) {
|
| test_data().origin_domain = GURL("trash");
|
| EXPECT_FALSE(db()->AddRow(test_data()));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain), IsEmpty());
|
| EXPECT_FALSE(db()->RemoveRow(test_data().origin_domain));
|
| }
|
| @@ -165,6 +178,7 @@ TEST_F(StatisticsTableTest, BadURL) {
|
| TEST_F(StatisticsTableTest, EmptyURL) {
|
| test_data().origin_domain = GURL();
|
| EXPECT_FALSE(db()->AddRow(test_data()));
|
| + EXPECT_THAT(db()->GetAllRows(), IsEmpty());
|
| EXPECT_THAT(db()->GetRows(test_data().origin_domain), IsEmpty());
|
| EXPECT_FALSE(db()->RemoveRow(test_data().origin_domain));
|
| }
|
|
|