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

Side by Side Diff: base/strings/string_util_unittest.cc

Issue 1493503002: base: get rid of deprecated TrimWhitespace() function (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: REBASE 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/strings/string_util.cc ('k') | chrome/browser/chromeos/power/cpu_data_collector.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/strings/string_util.h" 5 #include "base/strings/string_util.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <stdarg.h> 8 #include <stdarg.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 // Once more, but with a string of whitespace 244 // Once more, but with a string of whitespace
245 output = ASCIIToUTF16(" \r\n"); 245 output = ASCIIToUTF16(" \r\n");
246 EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output)); 246 EXPECT_EQ(TRIM_ALL, TrimWhitespace(output, TRIM_ALL, &output));
247 EXPECT_EQ(string16(), output); 247 EXPECT_EQ(string16(), output);
248 248
249 std::string output_ascii; 249 std::string output_ascii;
250 for (size_t i = 0; i < arraysize(trim_cases_ascii); ++i) { 250 for (size_t i = 0; i < arraysize(trim_cases_ascii); ++i) {
251 const trim_case_ascii& value = trim_cases_ascii[i]; 251 const trim_case_ascii& value = trim_cases_ascii[i];
252 EXPECT_EQ(value.return_value, 252 EXPECT_EQ(value.return_value,
253 TrimWhitespace(value.input, value.positions, &output_ascii)); 253 TrimWhitespaceASCII(value.input, value.positions, &output_ascii));
254 EXPECT_EQ(value.output, output_ascii); 254 EXPECT_EQ(value.output, output_ascii);
255 } 255 }
256 } 256 }
257 257
258 static const struct collapse_case { 258 static const struct collapse_case {
259 const wchar_t* input; 259 const wchar_t* input;
260 const bool trim; 260 const bool trim;
261 const wchar_t* output; 261 const wchar_t* output;
262 } collapse_cases[] = { 262 } collapse_cases[] = {
263 {L" Google Video ", false, L"Google Video"}, 263 {L" Google Video ", false, L"Google Video"},
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 const std::string live = kLive; 1129 const std::string live = kLive;
1130 std::string dead = live; 1130 std::string dead = live;
1131 strncpy(WriteInto(&dead, 5), kDead, 4); 1131 strncpy(WriteInto(&dead, 5), kDead, 4);
1132 EXPECT_EQ(kDead, dead); 1132 EXPECT_EQ(kDead, dead);
1133 EXPECT_EQ(4u, dead.size()); 1133 EXPECT_EQ(4u, dead.size());
1134 EXPECT_EQ(kLive, live); 1134 EXPECT_EQ(kLive, live);
1135 EXPECT_EQ(4u, live.size()); 1135 EXPECT_EQ(4u, live.size());
1136 } 1136 }
1137 1137
1138 } // namespace base 1138 } // namespace base
OLDNEW
« no previous file with comments | « base/strings/string_util.cc ('k') | chrome/browser/chromeos/power/cpu_data_collector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698