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

Side by Side Diff: chrome/browser/chromeos/file_system_provider/operations/read_directory_unittest.cc

Issue 304533003: [fsp] Rename has_next to has_more. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 6 years, 6 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 | Annotate | Revision Log
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 <string> 5 #include <string>
6 6
7 #include "base/files/file.h" 7 #include "base/files/file.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 " [\n" 196 " [\n"
197 " {\n" 197 " {\n"
198 " \"isDirectory\": false,\n" 198 " \"isDirectory\": false,\n"
199 " \"name\": \"blueberries.txt\",\n" 199 " \"name\": \"blueberries.txt\",\n"
200 " \"size\": 4096,\n" 200 " \"size\": 4096,\n"
201 " \"modificationTime\": {\n" 201 " \"modificationTime\": {\n"
202 " \"value\": \"Thu Apr 24 00:46:52 UTC 2014\"\n" 202 " \"value\": \"Thu Apr 24 00:46:52 UTC 2014\"\n"
203 " }\n" 203 " }\n"
204 " }\n" 204 " }\n"
205 " ],\n" 205 " ],\n"
206 " false\n" // has_next 206 " false\n" // has_more
207 "]\n"; 207 "]\n";
208 208
209 int json_error_code; 209 int json_error_code;
210 std::string json_error_msg; 210 std::string json_error_msg;
211 scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError( 211 scoped_ptr<base::Value> value(base::JSONReader::ReadAndReturnError(
212 input, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg)); 212 input, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg));
213 ASSERT_TRUE(value.get()) << json_error_msg; 213 ASSERT_TRUE(value.get()) << json_error_msg;
214 214
215 base::ListValue* value_as_list; 215 base::ListValue* value_as_list;
216 ASSERT_TRUE(value->GetAsList(&value_as_list)); 216 ASSERT_TRUE(value->GetAsList(&value_as_list));
217 scoped_ptr<Params> params(Params::Create(*value_as_list)); 217 scoped_ptr<Params> params(Params::Create(*value_as_list));
218 ASSERT_TRUE(params.get()); 218 ASSERT_TRUE(params.get());
219 scoped_ptr<RequestValue> request_value( 219 scoped_ptr<RequestValue> request_value(
220 RequestValue::CreateForReadDirectorySuccess(params.Pass())); 220 RequestValue::CreateForReadDirectorySuccess(params.Pass()));
221 ASSERT_TRUE(request_value.get()); 221 ASSERT_TRUE(request_value.get());
222 222
223 const bool has_next = false; 223 const bool has_more = false;
224 read_directory.OnSuccess(kRequestId, request_value.Pass(), has_next); 224 read_directory.OnSuccess(kRequestId, request_value.Pass(), has_more);
225 225
226 ASSERT_EQ(1u, callback_logger.events().size()); 226 ASSERT_EQ(1u, callback_logger.events().size());
227 CallbackLogger::Event* event = callback_logger.events()[0]; 227 CallbackLogger::Event* event = callback_logger.events()[0];
228 EXPECT_EQ(base::File::FILE_OK, event->result()); 228 EXPECT_EQ(base::File::FILE_OK, event->result());
229 229
230 ASSERT_EQ(1u, event->entry_list().size()); 230 ASSERT_EQ(1u, event->entry_list().size());
231 const fileapi::DirectoryEntry entry = event->entry_list()[0]; 231 const fileapi::DirectoryEntry entry = event->entry_list()[0];
232 EXPECT_FALSE(entry.is_directory); 232 EXPECT_FALSE(entry.is_directory);
233 EXPECT_EQ("blueberries.txt", entry.name); 233 EXPECT_EQ("blueberries.txt", entry.name);
234 EXPECT_EQ(4096, entry.size); 234 EXPECT_EQ(4096, entry.size);
(...skipping 26 matching lines...) Expand all
261 261
262 ASSERT_EQ(1u, callback_logger.events().size()); 262 ASSERT_EQ(1u, callback_logger.events().size());
263 CallbackLogger::Event* event = callback_logger.events()[0]; 263 CallbackLogger::Event* event = callback_logger.events()[0];
264 EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result()); 264 EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result());
265 ASSERT_EQ(0u, event->entry_list().size()); 265 ASSERT_EQ(0u, event->entry_list().size());
266 } 266 }
267 267
268 } // namespace operations 268 } // namespace operations
269 } // namespace file_system_provider 269 } // namespace file_system_provider
270 } // namespace chromeos 270 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698