Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: base/test/histogram_tester_unittest.cc

Issue 1265403003: Fix HistogramTester::GetAllSamples when empty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« base/test/histogram_tester.cc ('K') | « base/test/histogram_tester.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/test/histogram_tester.h" 5 #include "base/test/histogram_tester.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/metrics/histogram_macros.h" 8 #include "base/metrics/histogram_macros.h"
9 #include "base/metrics/histogram_samples.h" 9 #include "base/metrics/histogram_samples.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace base { 13 namespace base {
14 14
15 using ::testing::ElementsAre; 15 using ::testing::ElementsAre;
16 using ::testing::IsEmpty;
16 17
17 static const char kHistogram1[] = "Test1"; 18 static const char kHistogram1[] = "Test1";
18 static const char kHistogram2[] = "Test2"; 19 static const char kHistogram2[] = "Test2";
19 static const char kHistogram3[] = "Test3"; 20 static const char kHistogram3[] = "Test3";
20 static const char kHistogram4[] = "Test4"; 21 static const char kHistogram4[] = "Test4";
21 static const char kHistogram5[] = "Test5"; 22 static const char kHistogram5[] = "Test5";
22 23
23 typedef testing::Test HistogramTesterTest; 24 typedef testing::Test HistogramTesterTest;
24 25
25 TEST_F(HistogramTesterTest, Scope) { 26 TEST_F(HistogramTesterTest, Scope) {
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 HistogramTester tester; 100 HistogramTester tester;
100 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 2, 5); 101 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 2, 5);
101 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 3, 5); 102 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 3, 5);
102 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 3, 5); 103 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 3, 5);
103 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 5, 5); 104 UMA_HISTOGRAM_ENUMERATION(kHistogram5, 5, 5);
104 105
105 EXPECT_THAT(tester.GetAllSamples(kHistogram5), 106 EXPECT_THAT(tester.GetAllSamples(kHistogram5),
106 ElementsAre(Bucket(2, 1), Bucket(3, 2), Bucket(5, 1))); 107 ElementsAre(Bucket(2, 1), Bucket(3, 2), Bucket(5, 1)));
107 } 108 }
108 109
110 TEST_F(HistogramTesterTest, TestGetAllSamples_NoSamples) {
111 HistogramTester tester;
112 EXPECT_THAT(tester.GetAllSamples(kHistogram5), IsEmpty());
113 }
114
109 } // namespace base 115 } // namespace base
OLDNEW
« base/test/histogram_tester.cc ('K') | « base/test/histogram_tester.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698