| OLD | NEW |
| 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/google_apis/drive_uploader.h" | 5 #include "chrome/browser/google_apis/drive_uploader.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cstdlib> | 8 #include <cstdlib> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 base::FilePath file_path; | 291 base::FilePath file_path; |
| 292 scoped_ptr<ResourceEntry> resource_entry; | 292 scoped_ptr<ResourceEntry> resource_entry; |
| 293 | 293 |
| 294 MockDriveServiceWithUploadExpectation mock_service(data); | 294 MockDriveServiceWithUploadExpectation mock_service(data); |
| 295 DriveUploader uploader(&mock_service); | 295 DriveUploader uploader(&mock_service); |
| 296 uploader.UploadExistingFile( | 296 uploader.UploadExistingFile( |
| 297 kTestInitiateUploadResourceId, | 297 kTestInitiateUploadResourceId, |
| 298 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 298 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 299 local_path, | 299 local_path, |
| 300 kTestMimeType, | 300 kTestMimeType, |
| 301 "", // etag | 301 std::string(), // etag |
| 302 test_util::CreateCopyResultCallback( | 302 test_util::CreateCopyResultCallback( |
| 303 &error, &drive_path, &file_path, &resource_entry)); | 303 &error, &drive_path, &file_path, &resource_entry)); |
| 304 test_util::RunBlockingPoolTask(); | 304 test_util::RunBlockingPoolTask(); |
| 305 | 305 |
| 306 EXPECT_EQ(1, mock_service.resume_upload_call_count()); | 306 EXPECT_EQ(1, mock_service.resume_upload_call_count()); |
| 307 EXPECT_EQ(0, mock_service.received_bytes()); | 307 EXPECT_EQ(0, mock_service.received_bytes()); |
| 308 EXPECT_EQ(DRIVE_UPLOAD_OK, error); | 308 EXPECT_EQ(DRIVE_UPLOAD_OK, error); |
| 309 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); | 309 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); |
| 310 EXPECT_EQ(local_path, file_path); | 310 EXPECT_EQ(local_path, file_path); |
| 311 ASSERT_TRUE(resource_entry); | 311 ASSERT_TRUE(resource_entry); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 323 base::FilePath file_path; | 323 base::FilePath file_path; |
| 324 scoped_ptr<ResourceEntry> resource_entry; | 324 scoped_ptr<ResourceEntry> resource_entry; |
| 325 | 325 |
| 326 MockDriveServiceWithUploadExpectation mock_service(data); | 326 MockDriveServiceWithUploadExpectation mock_service(data); |
| 327 DriveUploader uploader(&mock_service); | 327 DriveUploader uploader(&mock_service); |
| 328 uploader.UploadExistingFile( | 328 uploader.UploadExistingFile( |
| 329 kTestInitiateUploadResourceId, | 329 kTestInitiateUploadResourceId, |
| 330 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 330 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 331 local_path, | 331 local_path, |
| 332 kTestMimeType, | 332 kTestMimeType, |
| 333 "", // etag | 333 std::string(), // etag |
| 334 test_util::CreateCopyResultCallback( | 334 test_util::CreateCopyResultCallback( |
| 335 &error, &drive_path, &file_path, &resource_entry)); | 335 &error, &drive_path, &file_path, &resource_entry)); |
| 336 test_util::RunBlockingPoolTask(); | 336 test_util::RunBlockingPoolTask(); |
| 337 | 337 |
| 338 // 512KB upload should not be split into multiple chunks. | 338 // 512KB upload should not be split into multiple chunks. |
| 339 EXPECT_EQ(1, mock_service.resume_upload_call_count()); | 339 EXPECT_EQ(1, mock_service.resume_upload_call_count()); |
| 340 EXPECT_EQ(512 * 1024, mock_service.received_bytes()); | 340 EXPECT_EQ(512 * 1024, mock_service.received_bytes()); |
| 341 EXPECT_EQ(DRIVE_UPLOAD_OK, error); | 341 EXPECT_EQ(DRIVE_UPLOAD_OK, error); |
| 342 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); | 342 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); |
| 343 EXPECT_EQ(local_path, file_path); | 343 EXPECT_EQ(local_path, file_path); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 356 base::FilePath file_path; | 356 base::FilePath file_path; |
| 357 scoped_ptr<ResourceEntry> resource_entry; | 357 scoped_ptr<ResourceEntry> resource_entry; |
| 358 | 358 |
| 359 MockDriveServiceWithUploadExpectation mock_service(data); | 359 MockDriveServiceWithUploadExpectation mock_service(data); |
| 360 DriveUploader uploader(&mock_service); | 360 DriveUploader uploader(&mock_service); |
| 361 uploader.UploadExistingFile( | 361 uploader.UploadExistingFile( |
| 362 kTestInitiateUploadResourceId, | 362 kTestInitiateUploadResourceId, |
| 363 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 363 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 364 local_path, | 364 local_path, |
| 365 kTestMimeType, | 365 kTestMimeType, |
| 366 "", // etag | 366 std::string(), // etag |
| 367 test_util::CreateCopyResultCallback( | 367 test_util::CreateCopyResultCallback( |
| 368 &error, &drive_path, &file_path, &resource_entry)); | 368 &error, &drive_path, &file_path, &resource_entry)); |
| 369 test_util::RunBlockingPoolTask(); | 369 test_util::RunBlockingPoolTask(); |
| 370 | 370 |
| 371 // The file should be split into 3 chunks (1234 = 512 + 512 + 210). | 371 // The file should be split into 3 chunks (1234 = 512 + 512 + 210). |
| 372 EXPECT_EQ(3, mock_service.resume_upload_call_count()); | 372 EXPECT_EQ(3, mock_service.resume_upload_call_count()); |
| 373 EXPECT_EQ(1234 * 1024, mock_service.received_bytes()); | 373 EXPECT_EQ(1234 * 1024, mock_service.received_bytes()); |
| 374 EXPECT_EQ(DRIVE_UPLOAD_OK, error); | 374 EXPECT_EQ(DRIVE_UPLOAD_OK, error); |
| 375 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); | 375 EXPECT_EQ(base::FilePath::FromUTF8Unsafe(kTestDrivePath), drive_path); |
| 376 EXPECT_EQ(local_path, file_path); | 376 EXPECT_EQ(local_path, file_path); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 base::FilePath file_path; | 422 base::FilePath file_path; |
| 423 scoped_ptr<ResourceEntry> resource_entry; | 423 scoped_ptr<ResourceEntry> resource_entry; |
| 424 | 424 |
| 425 MockDriveServiceNoConnectionAtInitiate mock_service; | 425 MockDriveServiceNoConnectionAtInitiate mock_service; |
| 426 DriveUploader uploader(&mock_service); | 426 DriveUploader uploader(&mock_service); |
| 427 uploader.UploadExistingFile( | 427 uploader.UploadExistingFile( |
| 428 kTestInitiateUploadResourceId, | 428 kTestInitiateUploadResourceId, |
| 429 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 429 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 430 local_path, | 430 local_path, |
| 431 kTestMimeType, | 431 kTestMimeType, |
| 432 "", // etag | 432 std::string(), // etag |
| 433 test_util::CreateCopyResultCallback( | 433 test_util::CreateCopyResultCallback( |
| 434 &error, &drive_path, &file_path, &resource_entry)); | 434 &error, &drive_path, &file_path, &resource_entry)); |
| 435 test_util::RunBlockingPoolTask(); | 435 test_util::RunBlockingPoolTask(); |
| 436 | 436 |
| 437 EXPECT_EQ(DRIVE_UPLOAD_ERROR_ABORT, error); | 437 EXPECT_EQ(DRIVE_UPLOAD_ERROR_ABORT, error); |
| 438 } | 438 } |
| 439 | 439 |
| 440 TEST_F(DriveUploaderTest, InitiateUploadNoConflict) { | 440 TEST_F(DriveUploaderTest, InitiateUploadNoConflict) { |
| 441 base::FilePath local_path; | 441 base::FilePath local_path; |
| 442 std::string data; | 442 std::string data; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 base::FilePath file_path; | 501 base::FilePath file_path; |
| 502 scoped_ptr<ResourceEntry> resource_entry; | 502 scoped_ptr<ResourceEntry> resource_entry; |
| 503 | 503 |
| 504 MockDriveServiceNoConnectionAtResume mock_service; | 504 MockDriveServiceNoConnectionAtResume mock_service; |
| 505 DriveUploader uploader(&mock_service); | 505 DriveUploader uploader(&mock_service); |
| 506 uploader.UploadExistingFile( | 506 uploader.UploadExistingFile( |
| 507 kTestInitiateUploadResourceId, | 507 kTestInitiateUploadResourceId, |
| 508 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 508 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 509 local_path, | 509 local_path, |
| 510 kTestMimeType, | 510 kTestMimeType, |
| 511 "", // etag | 511 std::string(), // etag |
| 512 test_util::CreateCopyResultCallback( | 512 test_util::CreateCopyResultCallback( |
| 513 &error, &drive_path, &file_path, &resource_entry)); | 513 &error, &drive_path, &file_path, &resource_entry)); |
| 514 test_util::RunBlockingPoolTask(); | 514 test_util::RunBlockingPoolTask(); |
| 515 | 515 |
| 516 EXPECT_EQ(DRIVE_UPLOAD_ERROR_ABORT, error); | 516 EXPECT_EQ(DRIVE_UPLOAD_ERROR_ABORT, error); |
| 517 } | 517 } |
| 518 | 518 |
| 519 TEST_F(DriveUploaderTest, NonExistingSourceFile) { | 519 TEST_F(DriveUploaderTest, NonExistingSourceFile) { |
| 520 DriveUploadError error = DRIVE_UPLOAD_ERROR_ABORT; | 520 DriveUploadError error = DRIVE_UPLOAD_ERROR_ABORT; |
| 521 base::FilePath drive_path; | 521 base::FilePath drive_path; |
| 522 base::FilePath file_path; | 522 base::FilePath file_path; |
| 523 scoped_ptr<ResourceEntry> resource_entry; | 523 scoped_ptr<ResourceEntry> resource_entry; |
| 524 | 524 |
| 525 DriveUploader uploader(NULL); // NULL, the service won't be used. | 525 DriveUploader uploader(NULL); // NULL, the service won't be used. |
| 526 uploader.UploadExistingFile( | 526 uploader.UploadExistingFile( |
| 527 kTestInitiateUploadResourceId, | 527 kTestInitiateUploadResourceId, |
| 528 base::FilePath::FromUTF8Unsafe(kTestDrivePath), | 528 base::FilePath::FromUTF8Unsafe(kTestDrivePath), |
| 529 temp_dir_.path().AppendASCII("_this_path_should_not_exist_"), | 529 temp_dir_.path().AppendASCII("_this_path_should_not_exist_"), |
| 530 kTestMimeType, | 530 kTestMimeType, |
| 531 "", // etag | 531 std::string(), // etag |
| 532 test_util::CreateCopyResultCallback( | 532 test_util::CreateCopyResultCallback( |
| 533 &error, &drive_path, &file_path, &resource_entry)); | 533 &error, &drive_path, &file_path, &resource_entry)); |
| 534 test_util::RunBlockingPoolTask(); | 534 test_util::RunBlockingPoolTask(); |
| 535 | 535 |
| 536 // Should return failure without doing any attempt to connect to the server. | 536 // Should return failure without doing any attempt to connect to the server. |
| 537 EXPECT_EQ(DRIVE_UPLOAD_ERROR_NOT_FOUND, error); | 537 EXPECT_EQ(DRIVE_UPLOAD_ERROR_NOT_FOUND, error); |
| 538 } | 538 } |
| 539 | 539 |
| 540 } // namespace google_apis | 540 } // namespace google_apis |
| OLD | NEW |