base/test/histogram_tester_unittest.cc - Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

« no previous file with comments | « base/test/histogram_tester.cc ('k') | base/test/launcher/test_launcher.cc » ('j') | no next file with comments »

OLD	NEW
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/gtest/googlemock/include/gmock/gmock.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/googletest/include/gtest/gtest.h"

12	12

13 using ::testing::ElementsAre;	13 using ::testing::ElementsAre;

14 using ::testing::IsEmpty;	14 using ::testing::IsEmpty;

15	15

16 namespace {	16 namespace {

17	17

18 const char kHistogram1[] = "Test1";	18 const char kHistogram1[] = "Test1";

19 const char kHistogram2[] = "Test2";	19 const char kHistogram2[] = "Test2";

20 const char kHistogram3[] = "Test3";	20 const char kHistogram3[] = "Test3";

21 const char kHistogram4[] = "Test4";	21 const char kHistogram4[] = "Test4";

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
110 EXPECT_THAT(tester.GetAllSamples(kHistogram5),	110 EXPECT_THAT(tester.GetAllSamples(kHistogram5),

111 ElementsAre(Bucket(2, 1), Bucket(3, 2), Bucket(5, 1)));	111 ElementsAre(Bucket(2, 1), Bucket(3, 2), Bucket(5, 1)));

112 }	112 }

113	113

114 TEST_F(HistogramTesterTest, TestGetAllSamples_NoSamples) {	114 TEST_F(HistogramTesterTest, TestGetAllSamples_NoSamples) {

115 HistogramTester tester;	115 HistogramTester tester;

116 EXPECT_THAT(tester.GetAllSamples(kHistogram5), IsEmpty());	116 EXPECT_THAT(tester.GetAllSamples(kHistogram5), IsEmpty());

117 }	117 }

118	118

119 } // namespace base	119 } // namespace base

OLD	NEW