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

Side by Side Diff: base/test/gtest_util.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/template_util_unittest.cc ('k') | base/test/gtest_xml_unittest_result_printer.h » ('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 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/gtest_util.h" 5 #include "base/test/gtest_util.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/googletest/include/gtest/gtest.h"
11 11
12 namespace base { 12 namespace base {
13 13
14 TestIdentifier::TestIdentifier() { 14 TestIdentifier::TestIdentifier() {
15 } 15 }
16 16
17 std::string FormatFullTestName(const std::string& test_case_name, 17 std::string FormatFullTestName(const std::string& test_case_name,
18 const std::string& test_name) { 18 const std::string& test_name) {
19 return test_case_name + "." + test_name; 19 return test_case_name + "." + test_name;
20 } 20 }
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 return false; 90 return false;
91 91
92 result.push_back(test_data); 92 result.push_back(test_data);
93 } 93 }
94 94
95 output->swap(result); 95 output->swap(result);
96 return true; 96 return true;
97 } 97 }
98 98
99 } // namespace base 99 } // namespace base
OLDNEW
« no previous file with comments | « base/template_util_unittest.cc ('k') | base/test/gtest_xml_unittest_result_printer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698