diff options
Diffstat (limited to 'base/metrics/sample_vector_unittest.cc')
| -rw-r--r-- | base/metrics/sample_vector_unittest.cc | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/base/metrics/sample_vector_unittest.cc b/base/metrics/sample_vector_unittest.cc index 897ceed520..2d77d2376b 100644 --- a/base/metrics/sample_vector_unittest.cc +++ b/base/metrics/sample_vector_unittest.cc @@ -116,7 +116,6 @@ TEST(SampleVectorTest, AddSubtractTest) { EXPECT_EQ(samples1.redundant_count(), samples1.TotalCount()); } -#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST TEST(SampleVectorDeathTest, BucketIndexTest) { // 8 buckets with exponential layout: // [0, 1) [1, 2) [2, 4) [4, 8) [8, 16) [16, 32) [32, 64) [64, INT_MAX) @@ -133,9 +132,9 @@ TEST(SampleVectorDeathTest, BucketIndexTest) { EXPECT_EQ(3, samples.GetCount(65)); // Extreme case. - EXPECT_DEATH(samples.Accumulate(INT_MIN, 100), ""); - EXPECT_DEATH(samples.Accumulate(-1, 100), ""); - EXPECT_DEATH(samples.Accumulate(INT_MAX, 100), ""); + EXPECT_DCHECK_DEATH(samples.Accumulate(INT_MIN, 100)); + EXPECT_DCHECK_DEATH(samples.Accumulate(-1, 100)); + EXPECT_DCHECK_DEATH(samples.Accumulate(INT_MAX, 100)); // Custom buckets: [1, 5) [5, 10) // Note, this is not a valid BucketRanges for Histogram because it does not @@ -155,8 +154,8 @@ TEST(SampleVectorDeathTest, BucketIndexTest) { EXPECT_EQ(4, samples2.GetCount(5)); // Extreme case. - EXPECT_DEATH(samples2.Accumulate(0, 100), ""); - EXPECT_DEATH(samples2.Accumulate(10, 100), ""); + EXPECT_DCHECK_DEATH(samples2.Accumulate(0, 100)); + EXPECT_DCHECK_DEATH(samples2.Accumulate(10, 100)); } TEST(SampleVectorDeathTest, AddSubtractBucketNotMatchTest) { @@ -182,25 +181,22 @@ TEST(SampleVectorDeathTest, AddSubtractBucketNotMatchTest) { // Extra bucket in the beginning. samples2.Accumulate(0, 100); - EXPECT_DEATH(samples1.Add(samples2), ""); - EXPECT_DEATH(samples1.Subtract(samples2), ""); + EXPECT_DCHECK_DEATH(samples1.Add(samples2)); + EXPECT_DCHECK_DEATH(samples1.Subtract(samples2)); // Extra bucket in the end. samples2.Accumulate(0, -100); samples2.Accumulate(6, 100); - EXPECT_DEATH(samples1.Add(samples2), ""); - EXPECT_DEATH(samples1.Subtract(samples2), ""); + EXPECT_DCHECK_DEATH(samples1.Add(samples2)); + EXPECT_DCHECK_DEATH(samples1.Subtract(samples2)); // Bucket not match: [3, 5) VS [3, 6) samples2.Accumulate(6, -100); samples2.Accumulate(3, 100); - EXPECT_DEATH(samples1.Add(samples2), ""); - EXPECT_DEATH(samples1.Subtract(samples2), ""); + EXPECT_DCHECK_DEATH(samples1.Add(samples2)); + EXPECT_DCHECK_DEATH(samples1.Subtract(samples2)); } -#endif -// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST - TEST(SampleVectorIteratorTest, IterateTest) { BucketRanges ranges(5); ranges.set_range(0, 0); @@ -261,8 +257,6 @@ TEST(SampleVectorIteratorTest, IterateTest) { EXPECT_EQ(4, i); } -#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST - TEST(SampleVectorIteratorDeathTest, IterateDoneTest) { BucketRanges ranges(5); ranges.set_range(0, 0); @@ -279,17 +273,14 @@ TEST(SampleVectorIteratorDeathTest, IterateDoneTest) { HistogramBase::Sample min; HistogramBase::Sample max; HistogramBase::Count count; - EXPECT_DEATH(it->Get(&min, &max, &count), ""); + EXPECT_DCHECK_DEATH(it->Get(&min, &max, &count)); - EXPECT_DEATH(it->Next(), ""); + EXPECT_DCHECK_DEATH(it->Next()); samples.Accumulate(2, 100); it = samples.Iterator(); EXPECT_FALSE(it->Done()); } -#endif -// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST - } // namespace } // namespace base |