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

Side by Side Diff: base/nix/xdg_util_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, 1 month 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/native_library_unittest.cc ('k') | base/numerics/safe_numerics_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/nix/xdg_util.h" 5 #include "base/nix/xdg_util.h"
6 6
7 #include "base/environment.h" 7 #include "base/environment.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gtest/googlemock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/googletest/include/gtest/gtest.h"
10 10
11 using ::testing::_; 11 using ::testing::_;
12 using ::testing::Return; 12 using ::testing::Return;
13 using ::testing::SetArgumentPointee; 13 using ::testing::SetArgumentPointee;
14 using ::testing::StrEq; 14 using ::testing::StrEq;
15 15
16 namespace base { 16 namespace base {
17 namespace nix { 17 namespace nix {
18 18
19 namespace { 19 namespace {
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 MockEnvironment getter; 133 MockEnvironment getter;
134 EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false)); 134 EXPECT_CALL(getter, GetVar(_, _)).WillRepeatedly(Return(false));
135 EXPECT_CALL(getter, GetVar(StrEq(kXdgDesktop), _)) 135 EXPECT_CALL(getter, GetVar(StrEq(kXdgDesktop), _))
136 .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity), Return(true))); 136 .WillOnce(DoAll(SetArgumentPointee<1>(kXdgDesktopUnity), Return(true)));
137 137
138 EXPECT_EQ(DESKTOP_ENVIRONMENT_UNITY, GetDesktopEnvironment(&getter)); 138 EXPECT_EQ(DESKTOP_ENVIRONMENT_UNITY, GetDesktopEnvironment(&getter));
139 } 139 }
140 140
141 } // namespace nix 141 } // namespace nix
142 } // namespace base 142 } // namespace base
OLDNEW
« no previous file with comments | « base/native_library_unittest.cc ('k') | base/numerics/safe_numerics_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698