diff options
| author | vabr <vabr@chromium.org> | 2015-08-03 01:12:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-03 08:13:41 +0000 |
| commit | ae9604308c926cc7df6205b5207dbf63c6e55314 (patch) | |
| tree | bb67df846860f03c89bab7a5b65477397af11e67 /sql | |
| parent | cf4613a24a12cdf5cd6c457ed07fddbae1d23795 (diff) | |
| download | chromium_src-ae9604308c926cc7df6205b5207dbf63c6e55314.zip chromium_src-ae9604308c926cc7df6205b5207dbf63c6e55314.tar.gz chromium_src-ae9604308c926cc7df6205b5207dbf63c6e55314.tar.bz2 | |
HistogramTester::GetHistogramSamplesSinceCreation never returns null
Currently, GetHistogramSamplesSinceCreation can return null if no histogram was generated. But that depends also on tests run prior to the current test. This CL changes this to returning empty samples instead, so that independently of previously run tests, the current test always gets the same response even if it does not generate any histograms.
BUG=473689
Review URL: https://codereview.chromium.org/1264123002
Cr-Commit-Position: refs/heads/master@{#341498}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/connection_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/connection_unittest.cc b/sql/connection_unittest.cc index c7d9080..df35dd1 100644 --- a/sql/connection_unittest.cc +++ b/sql/connection_unittest.cc @@ -1194,13 +1194,13 @@ TEST_F(SQLConnectionTest, TimeQuery) { EXPECT_EQ(11, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kUpdateTime); - EXPECT_TRUE(!samples || samples->sum() == 0); + EXPECT_EQ(0, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kCommitTime); - EXPECT_TRUE(!samples || samples->sum() == 0); + EXPECT_EQ(0, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime); - EXPECT_TRUE(!samples || samples->sum() == 0); + EXPECT_EQ(0, samples->sum()); } // Autocommit update allocates time to QueryTime, UpdateTime, and @@ -1237,7 +1237,7 @@ TEST_F(SQLConnectionTest, TimeUpdateAutocommit) { EXPECT_EQ(11, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kCommitTime); - EXPECT_TRUE(!samples || samples->sum() == 0); + EXPECT_EQ(0, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime); ASSERT_TRUE(samples); @@ -1296,7 +1296,7 @@ TEST_F(SQLConnectionTest, TimeUpdateTransaction) { EXPECT_EQ(101, samples->sum()); samples = tester.GetHistogramSamplesSinceCreation(kAutoCommitTime); - EXPECT_TRUE(!samples || samples->sum() == 0); + EXPECT_EQ(0, samples->sum()); } } // namespace |