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

Side by Side Diff: google_apis/drive/drive_api_url_generator_unittest.cc

Issue 663673002: Convert the few remaining ARRAYSIZE_UNSAFE -> arraysize. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « gin/converter_unittest.cc ('k') | mojo/examples/window_manager/debug_panel.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "google_apis/drive/drive_api_url_generator.h" 5 #include "google_apis/drive/drive_api_url_generator.h"
6 6
7 #include "google_apis/drive/test_util.h" 7 #include "google_apis/drive/test_util.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "url/gurl.h" 9 #include "url/gurl.h"
10 10
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 bool update_viewed_date; 90 bool update_viewed_date;
91 const std::string expected_query; 91 const std::string expected_query;
92 }; 92 };
93 const TestPattern kTestPatterns[] = { 93 const TestPattern kTestPatterns[] = {
94 { false, true, "" }, 94 { false, true, "" },
95 { true, true, "?setModifiedDate=true" }, 95 { true, true, "?setModifiedDate=true" },
96 { false, false, "?updateViewedDate=false" }, 96 { false, false, "?updateViewedDate=false" },
97 { true, false, "?setModifiedDate=true&updateViewedDate=false" }, 97 { true, false, "?setModifiedDate=true&updateViewedDate=false" },
98 }; 98 };
99 99
100 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) { 100 for (size_t i = 0; i < arraysize(kTestPatterns); ++i) {
101 EXPECT_EQ( 101 EXPECT_EQ(
102 "https://www.googleapis.com/drive/v2/files/0ADK06pfg" + 102 "https://www.googleapis.com/drive/v2/files/0ADK06pfg" +
103 kTestPatterns[i].expected_query, 103 kTestPatterns[i].expected_query,
104 url_generator_.GetFilesPatchUrl( 104 url_generator_.GetFilesPatchUrl(
105 "0ADK06pfg", 105 "0ADK06pfg",
106 kTestPatterns[i].set_modified_date, 106 kTestPatterns[i].set_modified_date,
107 kTestPatterns[i].update_viewed_date).spec()); 107 kTestPatterns[i].update_viewed_date).spec());
108 108
109 EXPECT_EQ( 109 EXPECT_EQ(
110 "https://www.googleapis.com/drive/v2/files/0Bz0bd074" + 110 "https://www.googleapis.com/drive/v2/files/0Bz0bd074" +
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 { 150, "token", "", "?maxResults=150&pageToken=token" }, 181 { 150, "token", "", "?maxResults=150&pageToken=token" },
182 { 10, "token", "", "?maxResults=10&pageToken=token" }, 182 { 10, "token", "", "?maxResults=10&pageToken=token" },
183 { 100, "", "query", "?q=query" }, 183 { 100, "", "query", "?q=query" },
184 { 150, "", "query", "?maxResults=150&q=query" }, 184 { 150, "", "query", "?maxResults=150&q=query" },
185 { 10, "", "query", "?maxResults=10&q=query" }, 185 { 10, "", "query", "?maxResults=10&q=query" },
186 { 100, "token", "query", "?pageToken=token&q=query" }, 186 { 100, "token", "query", "?pageToken=token&q=query" },
187 { 150, "token", "query", "?maxResults=150&pageToken=token&q=query" }, 187 { 150, "token", "query", "?maxResults=150&pageToken=token&q=query" },
188 { 10, "token", "query", "?maxResults=10&pageToken=token&q=query" }, 188 { 10, "token", "query", "?maxResults=10&pageToken=token&q=query" },
189 }; 189 };
190 190
191 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) { 191 for (size_t i = 0; i < arraysize(kTestPatterns); ++i) {
192 EXPECT_EQ( 192 EXPECT_EQ(
193 "https://www.googleapis.com/drive/v2/files" + 193 "https://www.googleapis.com/drive/v2/files" +
194 kTestPatterns[i].expected_query, 194 kTestPatterns[i].expected_query,
195 url_generator_.GetFilesListUrl( 195 url_generator_.GetFilesListUrl(
196 kTestPatterns[i].max_results, kTestPatterns[i].page_token, 196 kTestPatterns[i].max_results, kTestPatterns[i].page_token,
197 kTestPatterns[i].q).spec()); 197 kTestPatterns[i].q).spec());
198 198
199 EXPECT_EQ( 199 EXPECT_EQ(
200 "http://127.0.0.1:12345/drive/v2/files" + 200 "http://127.0.0.1:12345/drive/v2/files" +
201 kTestPatterns[i].expected_query, 201 kTestPatterns[i].expected_query,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 { false, 150, "token", 12345, 281 { false, 150, "token", 12345,
282 "?includeDeleted=false&maxResults=150&pageToken=token" 282 "?includeDeleted=false&maxResults=150&pageToken=token"
283 "&startChangeId=12345" }, 283 "&startChangeId=12345" },
284 { true, 10, "token", 12345, 284 { true, 10, "token", 12345,
285 "?maxResults=10&pageToken=token&startChangeId=12345" }, 285 "?maxResults=10&pageToken=token&startChangeId=12345" },
286 { false, 10, "token", 12345, 286 { false, 10, "token", 12345,
287 "?includeDeleted=false&maxResults=10&pageToken=token" 287 "?includeDeleted=false&maxResults=10&pageToken=token"
288 "&startChangeId=12345" }, 288 "&startChangeId=12345" },
289 }; 289 };
290 290
291 for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestPatterns); ++i) { 291 for (size_t i = 0; i < arraysize(kTestPatterns); ++i) {
292 EXPECT_EQ( 292 EXPECT_EQ(
293 "https://www.googleapis.com/drive/v2/changes" + 293 "https://www.googleapis.com/drive/v2/changes" +
294 kTestPatterns[i].expected_query, 294 kTestPatterns[i].expected_query,
295 url_generator_.GetChangesListUrl( 295 url_generator_.GetChangesListUrl(
296 kTestPatterns[i].include_deleted, 296 kTestPatterns[i].include_deleted,
297 kTestPatterns[i].max_results, 297 kTestPatterns[i].max_results,
298 kTestPatterns[i].page_token, 298 kTestPatterns[i].page_token,
299 kTestPatterns[i].start_change_id).spec()); 299 kTestPatterns[i].start_change_id).spec());
300 300
301 EXPECT_EQ( 301 EXPECT_EQ(
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 } 435 }
436 436
437 TEST_F(DriveApiUrlGeneratorTest, GeneratePermissionsInsertUrl) { 437 TEST_F(DriveApiUrlGeneratorTest, GeneratePermissionsInsertUrl) {
438 EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0ADK06pfg/permissions", 438 EXPECT_EQ("https://www.googleapis.com/drive/v2/files/0ADK06pfg/permissions",
439 url_generator_.GetPermissionsInsertUrl("0ADK06pfg").spec()); 439 url_generator_.GetPermissionsInsertUrl("0ADK06pfg").spec());
440 EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/file%3Aabc/permissions", 440 EXPECT_EQ("http://127.0.0.1:12345/drive/v2/files/file%3Aabc/permissions",
441 test_url_generator_.GetPermissionsInsertUrl("file:abc").spec()); 441 test_url_generator_.GetPermissionsInsertUrl("file:abc").spec());
442 } 442 }
443 443
444 } // namespace google_apis 444 } // namespace google_apis
OLDNEW
« no previous file with comments | « gin/converter_unittest.cc ('k') | mojo/examples/window_manager/debug_panel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698