diff options
| author | Hidehiko Abe <hidehiko@google.com> | 2018-02-21 01:04:53 +0900 |
|---|---|---|
| committer | Hidehiko Abe <hidehiko@google.com> | 2018-02-21 01:15:15 +0900 |
| commit | f810b5921dde57180956b9eadf39a3a2b8cb5855 (patch) | |
| tree | b5545667cc754e2b0745fb59dd891d65d30afaeb /base/metrics/histogram_macros_unittest.cc | |
| parent | 4e42e67fa291bd27b2ffb00be57a4ca9a5000526 (diff) | |
| download | libchrome-f810b5921dde57180956b9eadf39a3a2b8cb5855.tar.gz | |
Re-uprev to r462023.
Previous uprevs didn't include several CLs. This re-uprev's to the
r462023.
cf) Missing CLs I found.
https://codereview.chromium.org/2556563002
https://codereview.chromium.org/2754483002
https://codereview.chromium.org/2171833002
https://codereview.chromium.org/2778183003
https://codereview.chromium.org/2500473002
https://codereview.chromium.org/2173523002
https://codereview.chromium.org/2666423002
https://codereview.chromium.org/2723423002
https://codereview.chromium.org/2789463002
https://codereview.chromium.org/2723083004
https://codereview.chromium.org/2637843002
https://codereview.chromium.org/2785943004
https://codereview.chromium.org/2657603004
https://codereview.chromium.org/2774363003
https://codereview.chromium.org/2776853002
https://codereview.chromium.org/2736053003
https://codereview.chromium.org/2779413002
https://codereview.chromium.org/2782503002
https://codereview.chromium.org/2782083003
https://codereview.chromium.org/2399213005
https://codereview.chromium.org/2787383002
https://codereview.chromium.org/2790523004
https://codereview.chromium.org/2787533002
https://codereview.chromium.org/2780983003
https://codereview.chromium.org/2790403003
https://codereview.chromium.org/2747673002
https://codereview.chromium.org/2778173003
https://codereview.chromium.org/2788613004
https://codereview.chromium.org/2781983003
https://codereview.chromium.org/2774223003
Bug: 73270448
Test: Built and ran libchrome_test locally. Run treehugger.
Change-Id: I5e76096d4fcf660571275cce5f4a980a8bb574fe
Diffstat (limited to 'base/metrics/histogram_macros_unittest.cc')
| -rw-r--r-- | base/metrics/histogram_macros_unittest.cc | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/base/metrics/histogram_macros_unittest.cc b/base/metrics/histogram_macros_unittest.cc index c5991619a0..33a9c6e5b2 100644 --- a/base/metrics/histogram_macros_unittest.cc +++ b/base/metrics/histogram_macros_unittest.cc @@ -15,4 +15,35 @@ TEST(ScopedHistogramTimer, TwoTimersOneScope) { SCOPED_UMA_HISTOGRAM_LONG_TIMER("TestLongTimer1"); } +// Compile tests for UMA_HISTOGRAM_ENUMERATION with the three different types it +// accepts: +// - integral types +// - unscoped enums +// - scoped enums +TEST(HistogramMacro, IntegralPsuedoEnumeration) { + UMA_HISTOGRAM_ENUMERATION("Test.FauxEnumeration", 1, 10000); +} + +TEST(HistogramMacro, UnscopedEnumeration) { + enum TestEnum : char { + FIRST_VALUE, + SECOND_VALUE, + THIRD_VALUE, + MAX_ENTRIES, + }; + UMA_HISTOGRAM_ENUMERATION("Test.UnscopedEnumeration", SECOND_VALUE, + MAX_ENTRIES); +} + +TEST(HistogramMacro, ScopedEnumeration) { + enum class TestEnum { + FIRST_VALUE, + SECOND_VALUE, + THIRD_VALUE, + MAX_ENTRIES, + }; + UMA_HISTOGRAM_ENUMERATION("Test.ScopedEnumeration", TestEnum::SECOND_VALUE, + TestEnum::MAX_ENTRIES); +} + } // namespace base |