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

Side by Side Diff: chrome/browser/chromeos/drive/drive_file_system_unittest.cc

Issue 12465012: chromeos: Change DriveResourceMetadata's method arguemnts from DriveEntryProto* to resource ID when… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 7 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_resource_metadata.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/drive/drive_file_system.h" 5 #include "chrome/browser/chromeos/drive/drive_file_system.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 PlatformFileInfoProto* platform_info = dir_base->mutable_file_info(); 415 PlatformFileInfoProto* platform_info = dir_base->mutable_file_info();
416 dir_base->set_title("drive"); 416 dir_base->set_title("drive");
417 dir_base->set_resource_id(fake_drive_service_->GetRootResourceId()); 417 dir_base->set_resource_id(fake_drive_service_->GetRootResourceId());
418 dir_base->set_upload_url("http://resumable-create-media/1"); 418 dir_base->set_upload_url("http://resumable-create-media/1");
419 platform_info->set_is_directory(true); 419 platform_info->set_is_directory(true);
420 420
421 // drive/File1 421 // drive/File1
422 DriveEntryProto* file = root_dir->add_child_files(); 422 DriveEntryProto* file = root_dir->add_child_files();
423 file->set_title("File1"); 423 file->set_title("File1");
424 file->set_resource_id("resource_id:File1"); 424 file->set_resource_id("resource_id:File1");
425 file->set_parent_resource_id(root_dir->drive_entry().resource_id());
425 file->set_upload_url("http://resumable-edit-media/1"); 426 file->set_upload_url("http://resumable-edit-media/1");
426 file->mutable_file_specific_info()->set_file_md5("md5"); 427 file->mutable_file_specific_info()->set_file_md5("md5");
427 platform_info = file->mutable_file_info(); 428 platform_info = file->mutable_file_info();
428 platform_info->set_is_directory(false); 429 platform_info->set_is_directory(false);
429 platform_info->set_size(1048576); 430 platform_info->set_size(1048576);
430 431
431 // drive/Dir1 432 // drive/Dir1
432 DriveDirectoryProto* dir1 = root_dir->add_child_directories(); 433 DriveDirectoryProto* dir1 = root_dir->add_child_directories();
433 dir_base = dir1->mutable_drive_entry(); 434 dir_base = dir1->mutable_drive_entry();
434 dir_base->set_title("Dir1"); 435 dir_base->set_title("Dir1");
435 dir_base->set_resource_id("resource_id:Dir1"); 436 dir_base->set_resource_id("resource_id:Dir1");
437 dir_base->set_parent_resource_id(root_dir->drive_entry().resource_id());
436 dir_base->set_upload_url("http://resumable-create-media/2"); 438 dir_base->set_upload_url("http://resumable-create-media/2");
437 platform_info = dir_base->mutable_file_info(); 439 platform_info = dir_base->mutable_file_info();
438 platform_info->set_is_directory(true); 440 platform_info->set_is_directory(true);
439 441
440 // drive/Dir1/File2 442 // drive/Dir1/File2
441 file = dir1->add_child_files(); 443 file = dir1->add_child_files();
442 file->set_title("File2"); 444 file->set_title("File2");
443 file->set_resource_id("resource_id:File2"); 445 file->set_resource_id("resource_id:File2");
446 file->set_parent_resource_id(dir1->drive_entry().resource_id());
444 file->set_upload_url("http://resumable-edit-media/2"); 447 file->set_upload_url("http://resumable-edit-media/2");
445 file->mutable_file_specific_info()->set_file_md5("md5"); 448 file->mutable_file_specific_info()->set_file_md5("md5");
446 platform_info = file->mutable_file_info(); 449 platform_info = file->mutable_file_info();
447 platform_info->set_is_directory(false); 450 platform_info->set_is_directory(false);
448 platform_info->set_size(555); 451 platform_info->set_size(555);
449 452
450 // drive/Dir1/SubDir2 453 // drive/Dir1/SubDir2
451 DriveDirectoryProto* dir2 = dir1->add_child_directories(); 454 DriveDirectoryProto* dir2 = dir1->add_child_directories();
452 dir_base = dir2->mutable_drive_entry(); 455 dir_base = dir2->mutable_drive_entry();
453 dir_base->set_title("SubDir2"); 456 dir_base->set_title("SubDir2");
454 dir_base->set_resource_id("resource_id:SubDir2"); 457 dir_base->set_resource_id("resource_id:SubDir2");
458 dir_base->set_parent_resource_id(dir1->drive_entry().resource_id());
455 dir_base->set_upload_url("http://resumable-create-media/3"); 459 dir_base->set_upload_url("http://resumable-create-media/3");
456 platform_info = dir_base->mutable_file_info(); 460 platform_info = dir_base->mutable_file_info();
457 platform_info->set_is_directory(true); 461 platform_info->set_is_directory(true);
458 462
459 // drive/Dir1/SubDir2/File3 463 // drive/Dir1/SubDir2/File3
460 file = dir2->add_child_files(); 464 file = dir2->add_child_files();
461 file->set_title("File3"); 465 file->set_title("File3");
462 file->set_resource_id("resource_id:File3"); 466 file->set_resource_id("resource_id:File3");
467 file->set_parent_resource_id(dir2->drive_entry().resource_id());
463 file->set_upload_url("http://resumable-edit-media/3"); 468 file->set_upload_url("http://resumable-edit-media/3");
464 file->mutable_file_specific_info()->set_file_md5("md5"); 469 file->mutable_file_specific_info()->set_file_md5("md5");
465 platform_info = file->mutable_file_info(); 470 platform_info = file->mutable_file_info();
466 platform_info->set_is_directory(false); 471 platform_info->set_is_directory(false);
467 platform_info->set_size(12345); 472 platform_info->set_size(12345);
468 473
469 // Write this proto out to GCache/vi/meta/file_system.pb 474 // Write this proto out to GCache/vi/meta/file_system.pb
470 std::string serialized_proto; 475 std::string serialized_proto;
471 ASSERT_TRUE(root.SerializeToString(&serialized_proto)); 476 ASSERT_TRUE(root.SerializeToString(&serialized_proto));
472 ASSERT_TRUE(!serialized_proto.empty()); 477 ASSERT_TRUE(!serialized_proto.empty());
(...skipping 1702 matching lines...) Expand 10 before | Expand all | Expand 10 after
2175 2180
2176 // An app for foo.exe should now be found, as the registry was loaded. 2181 // An app for foo.exe should now be found, as the registry was loaded.
2177 drive_webapps_registry_->GetWebAppsForFile( 2182 drive_webapps_registry_->GetWebAppsForFile(
2178 base::FilePath(FILE_PATH_LITERAL("foo.exe")), 2183 base::FilePath(FILE_PATH_LITERAL("foo.exe")),
2179 "" /* mime_type */, 2184 "" /* mime_type */,
2180 &apps); 2185 &apps);
2181 EXPECT_EQ(1U, apps.size()); 2186 EXPECT_EQ(1U, apps.size());
2182 } 2187 }
2183 2188
2184 } // namespace drive 2189 } // namespace drive
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_resource_metadata.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698