OLD | NEW |
---|---|
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_requests.h" | 5 #include "google_apis/drive/drive_api_requests.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
558 // Create "new directory" in the root directory. | 558 // Create "new directory" in the root directory. |
559 { | 559 { |
560 base::RunLoop run_loop; | 560 base::RunLoop run_loop; |
561 drive::FilesInsertRequest* request = new drive::FilesInsertRequest( | 561 drive::FilesInsertRequest* request = new drive::FilesInsertRequest( |
562 request_sender_.get(), | 562 request_sender_.get(), |
563 *url_generator_, | 563 *url_generator_, |
564 test_util::CreateQuitCallback( | 564 test_util::CreateQuitCallback( |
565 &run_loop, | 565 &run_loop, |
566 test_util::CreateCopyResultCallback(&error, &file_resource))); | 566 test_util::CreateCopyResultCallback(&error, &file_resource))); |
567 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); | 567 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); |
568 request->set_last_viewed_by_me_date( | 568 |
569 base::Time::FromUTCExploded(kLastViewedByMeDate)); | 569 base::Time LastViewedByMeDateUTC; |
hidehiko
2016/07/05 17:31:14
base::Time last_viewed_by_me_date_utc;
to follow
hidehiko
2016/10/25 16:37:05
ping.
maksims (do not use this acc)
2016/10/26 11:55:27
Done.
| |
570 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, | |
hidehiko
2016/07/05 17:31:14
Could you use ASSERT_TRUE? Ditto for below.
hidehiko
2016/10/25 16:37:05
ping.
maksims (do not use this acc)
2016/10/26 11:55:27
Done.
| |
571 &LastViewedByMeDateUTC)); | |
572 | |
hidehiko
2016/07/05 17:31:14
nit: could you remove this empty line? L573 looks
hidehiko
2016/10/25 16:37:05
ping.
| |
573 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); | |
570 request->set_mime_type("application/vnd.google-apps.folder"); | 574 request->set_mime_type("application/vnd.google-apps.folder"); |
571 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); | 575 |
576 base::Time ModifiedDateUTC; | |
577 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); | |
578 | |
579 request->set_modified_date(ModifiedDateUTC); | |
572 request->add_parent("root"); | 580 request->add_parent("root"); |
573 request->set_title("new directory"); | 581 request->set_title("new directory"); |
574 request->set_properties(testing_properties_); | 582 request->set_properties(testing_properties_); |
575 request_sender_->StartRequestWithAuthRetry(request); | 583 request_sender_->StartRequestWithAuthRetry(request); |
576 run_loop.Run(); | 584 run_loop.Run(); |
577 } | 585 } |
578 | 586 |
579 EXPECT_EQ(HTTP_SUCCESS, error); | 587 EXPECT_EQ(HTTP_SUCCESS, error); |
580 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); | 588 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); |
581 EXPECT_EQ("/drive/v2/files?visibility=PRIVATE", http_request_.relative_url); | 589 EXPECT_EQ("/drive/v2/files?visibility=PRIVATE", http_request_.relative_url); |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
623 request_sender_.get(), | 631 request_sender_.get(), |
624 *url_generator_, | 632 *url_generator_, |
625 test_util::CreateQuitCallback( | 633 test_util::CreateQuitCallback( |
626 &run_loop, | 634 &run_loop, |
627 test_util::CreateCopyResultCallback(&error, &file_resource))); | 635 test_util::CreateCopyResultCallback(&error, &file_resource))); |
628 request->set_file_id("resource_id"); | 636 request->set_file_id("resource_id"); |
629 request->set_set_modified_date(true); | 637 request->set_set_modified_date(true); |
630 request->set_update_viewed_date(false); | 638 request->set_update_viewed_date(false); |
631 | 639 |
632 request->set_title("new title"); | 640 request->set_title("new title"); |
633 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); | 641 |
634 request->set_last_viewed_by_me_date( | 642 base::Time ModifiedDateUTC; |
635 base::Time::FromUTCExploded(kLastViewedByMeDate)); | 643 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
644 | |
645 request->set_modified_date(ModifiedDateUTC); | |
646 | |
647 base::Time LastViewedByMeDateUTC; | |
648 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, | |
649 &LastViewedByMeDateUTC)); | |
650 | |
651 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); | |
636 request->add_parent("parent_resource_id"); | 652 request->add_parent("parent_resource_id"); |
637 | 653 |
638 request->set_properties(testing_properties_); | 654 request->set_properties(testing_properties_); |
639 request_sender_->StartRequestWithAuthRetry(request); | 655 request_sender_->StartRequestWithAuthRetry(request); |
640 run_loop.Run(); | 656 run_loop.Run(); |
641 } | 657 } |
642 | 658 |
643 EXPECT_EQ(HTTP_SUCCESS, error); | 659 EXPECT_EQ(HTTP_SUCCESS, error); |
644 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method); | 660 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method); |
645 EXPECT_EQ("/drive/v2/files/resource_id" | 661 EXPECT_EQ("/drive/v2/files/resource_id" |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
819 { | 835 { |
820 base::RunLoop run_loop; | 836 base::RunLoop run_loop; |
821 drive::FilesCopyRequest* request = new drive::FilesCopyRequest( | 837 drive::FilesCopyRequest* request = new drive::FilesCopyRequest( |
822 request_sender_.get(), | 838 request_sender_.get(), |
823 *url_generator_, | 839 *url_generator_, |
824 test_util::CreateQuitCallback( | 840 test_util::CreateQuitCallback( |
825 &run_loop, | 841 &run_loop, |
826 test_util::CreateCopyResultCallback(&error, &file_resource))); | 842 test_util::CreateCopyResultCallback(&error, &file_resource))); |
827 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); | 843 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); |
828 request->set_file_id("resource_id"); | 844 request->set_file_id("resource_id"); |
829 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); | 845 |
846 base::Time ModifiedDateUTC; | |
847 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); | |
848 | |
849 request->set_modified_date(ModifiedDateUTC); | |
830 request->add_parent("parent_resource_id"); | 850 request->add_parent("parent_resource_id"); |
831 request->set_title("new title"); | 851 request->set_title("new title"); |
832 request_sender_->StartRequestWithAuthRetry(request); | 852 request_sender_->StartRequestWithAuthRetry(request); |
833 run_loop.Run(); | 853 run_loop.Run(); |
834 } | 854 } |
835 | 855 |
836 EXPECT_EQ(HTTP_SUCCESS, error); | 856 EXPECT_EQ(HTTP_SUCCESS, error); |
837 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); | 857 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); |
838 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE", | 858 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE", |
839 http_request_.relative_url); | 859 http_request_.relative_url); |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1436 new drive::InitiateUploadNewFileRequest( | 1456 new drive::InitiateUploadNewFileRequest( |
1437 request_sender_.get(), | 1457 request_sender_.get(), |
1438 *url_generator_, | 1458 *url_generator_, |
1439 kTestContentType, | 1459 kTestContentType, |
1440 kTestContent.size(), | 1460 kTestContent.size(), |
1441 "parent_resource_id", // The resource id of the parent directory. | 1461 "parent_resource_id", // The resource id of the parent directory. |
1442 "new file title", // The title of the file being uploaded. | 1462 "new file title", // The title of the file being uploaded. |
1443 test_util::CreateQuitCallback( | 1463 test_util::CreateQuitCallback( |
1444 &run_loop, | 1464 &run_loop, |
1445 test_util::CreateCopyResultCallback(&error, &upload_url))); | 1465 test_util::CreateCopyResultCallback(&error, &upload_url))); |
1446 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); | 1466 |
1447 request->set_last_viewed_by_me_date( | 1467 base::Time ModifiedDateUTC; |
1448 base::Time::FromUTCExploded(kLastViewedByMeDate)); | 1468 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
1469 | |
1470 request->set_modified_date(ModifiedDateUTC); | |
1471 | |
1472 base::Time LastViewedByMeDateUTC; | |
1473 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, | |
1474 &LastViewedByMeDateUTC)); | |
1475 | |
1476 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); | |
1449 request_sender_->StartRequestWithAuthRetry(request); | 1477 request_sender_->StartRequestWithAuthRetry(request); |
1450 run_loop.Run(); | 1478 run_loop.Run(); |
1451 } | 1479 } |
1452 | 1480 |
1453 EXPECT_EQ(HTTP_SUCCESS, error); | 1481 EXPECT_EQ(HTTP_SUCCESS, error); |
1454 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path()); | 1482 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path()); |
1455 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); | 1483 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); |
1456 EXPECT_EQ(base::SizeTToString(kTestContent.size()), | 1484 EXPECT_EQ(base::SizeTToString(kTestContent.size()), |
1457 http_request_.headers["X-Upload-Content-Length"]); | 1485 http_request_.headers["X-Upload-Content-Length"]); |
1458 | 1486 |
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1813 *url_generator_, | 1841 *url_generator_, |
1814 kTestContentType, | 1842 kTestContentType, |
1815 kTestContent.size(), | 1843 kTestContent.size(), |
1816 "resource_id", // The resource id of the file to be overwritten. | 1844 "resource_id", // The resource id of the file to be overwritten. |
1817 kTestETag, | 1845 kTestETag, |
1818 test_util::CreateQuitCallback( | 1846 test_util::CreateQuitCallback( |
1819 &run_loop, | 1847 &run_loop, |
1820 test_util::CreateCopyResultCallback(&error, &upload_url))); | 1848 test_util::CreateCopyResultCallback(&error, &upload_url))); |
1821 request->set_parent_resource_id("new_parent_resource_id"); | 1849 request->set_parent_resource_id("new_parent_resource_id"); |
1822 request->set_title("new file title"); | 1850 request->set_title("new file title"); |
1823 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); | 1851 |
1824 request->set_last_viewed_by_me_date( | 1852 base::Time ModifiedDateUTC; |
1825 base::Time::FromUTCExploded(kLastViewedByMeDate)); | 1853 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC)); |
1854 | |
1855 request->set_modified_date(ModifiedDateUTC); | |
1856 | |
1857 base::Time LastViewedByMeDateUTC; | |
1858 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate, | |
1859 &LastViewedByMeDateUTC)); | |
1860 | |
1861 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC); | |
1826 | 1862 |
1827 request_sender_->StartRequestWithAuthRetry(request); | 1863 request_sender_->StartRequestWithAuthRetry(request); |
1828 run_loop.Run(); | 1864 run_loop.Run(); |
1829 } | 1865 } |
1830 | 1866 |
1831 EXPECT_EQ(HTTP_SUCCESS, error); | 1867 EXPECT_EQ(HTTP_SUCCESS, error); |
1832 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path()); | 1868 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path()); |
1833 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); | 1869 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); |
1834 EXPECT_EQ(base::SizeTToString(kTestContent.size()), | 1870 EXPECT_EQ(base::SizeTToString(kTestContent.size()), |
1835 http_request_.headers["X-Upload-Content-Length"]); | 1871 http_request_.headers["X-Upload-Content-Length"]); |
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2291 "Header: value\r\n" | 2327 "Header: value\r\n" |
2292 "\r\n" | 2328 "\r\n" |
2293 "BODY\r\n" | 2329 "BODY\r\n" |
2294 "--BOUNDARY-- \t", | 2330 "--BOUNDARY-- \t", |
2295 &parts)); | 2331 &parts)); |
2296 ASSERT_EQ(1u, parts.size()); | 2332 ASSERT_EQ(1u, parts.size()); |
2297 EXPECT_EQ(HTTP_SUCCESS, parts[0].code); | 2333 EXPECT_EQ(HTTP_SUCCESS, parts[0].code); |
2298 EXPECT_EQ("BODY", parts[0].body); | 2334 EXPECT_EQ("BODY", parts[0].body); |
2299 } | 2335 } |
2300 } // namespace google_apis | 2336 } // namespace google_apis |
OLD | NEW |