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

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

Issue 2091663002: Make callers of FromUTC(Local)Exploded in google_apis/ use new time API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased and set dependent patch Created 4 years, 1 month 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 | « no previous file | google_apis/drive/time_util.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_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 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
560 // Create "new directory" in the root directory. 560 // Create "new directory" in the root directory.
561 { 561 {
562 base::RunLoop run_loop; 562 base::RunLoop run_loop;
563 std::unique_ptr<drive::FilesInsertRequest> request = 563 std::unique_ptr<drive::FilesInsertRequest> request =
564 base::MakeUnique<drive::FilesInsertRequest>( 564 base::MakeUnique<drive::FilesInsertRequest>(
565 request_sender_.get(), *url_generator_, 565 request_sender_.get(), *url_generator_,
566 test_util::CreateQuitCallback( 566 test_util::CreateQuitCallback(
567 &run_loop, 567 &run_loop,
568 test_util::CreateCopyResultCallback(&error, &file_resource))); 568 test_util::CreateCopyResultCallback(&error, &file_resource)));
569 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); 569 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE);
570 request->set_last_viewed_by_me_date( 570
571 base::Time::FromUTCExploded(kLastViewedByMeDate)); 571 base::Time LastViewedByMeDateUTC;
572 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
573 &LastViewedByMeDateUTC));
574
575 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC);
572 request->set_mime_type("application/vnd.google-apps.folder"); 576 request->set_mime_type("application/vnd.google-apps.folder");
573 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 577
578 base::Time ModifiedDateUTC;
579 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC));
580
581 request->set_modified_date(ModifiedDateUTC);
574 request->add_parent("root"); 582 request->add_parent("root");
575 request->set_title("new directory"); 583 request->set_title("new directory");
576 request->set_properties(testing_properties_); 584 request->set_properties(testing_properties_);
577 request_sender_->StartRequestWithAuthRetry(std::move(request)); 585 request_sender_->StartRequestWithAuthRetry(std::move(request));
578 run_loop.Run(); 586 run_loop.Run();
579 } 587 }
580 588
581 EXPECT_EQ(HTTP_SUCCESS, error); 589 EXPECT_EQ(HTTP_SUCCESS, error);
582 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); 590 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
583 EXPECT_EQ("/drive/v2/files?visibility=PRIVATE", http_request_.relative_url); 591 EXPECT_EQ("/drive/v2/files?visibility=PRIVATE", http_request_.relative_url);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 base::MakeUnique<drive::FilesPatchRequest>( 633 base::MakeUnique<drive::FilesPatchRequest>(
626 request_sender_.get(), *url_generator_, 634 request_sender_.get(), *url_generator_,
627 test_util::CreateQuitCallback( 635 test_util::CreateQuitCallback(
628 &run_loop, 636 &run_loop,
629 test_util::CreateCopyResultCallback(&error, &file_resource))); 637 test_util::CreateCopyResultCallback(&error, &file_resource)));
630 request->set_file_id("resource_id"); 638 request->set_file_id("resource_id");
631 request->set_set_modified_date(true); 639 request->set_set_modified_date(true);
632 request->set_update_viewed_date(false); 640 request->set_update_viewed_date(false);
633 641
634 request->set_title("new title"); 642 request->set_title("new title");
635 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 643 base::Time ModifiedDateUTC;
636 request->set_last_viewed_by_me_date( 644 base::Time::FromUTCExploded(kLastViewedByMeDate);
hidehiko 2016/10/25 16:37:05 Please fix the indent.
maksims (do not use this acc) 2016/10/26 11:55:27 Done.
637 base::Time::FromUTCExploded(kLastViewedByMeDate)); 645 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC));
638 request->add_parent("parent_resource_id");
639 646
640 request->set_properties(testing_properties_); 647 request->set_modified_date(ModifiedDateUTC);
641 request_sender_->StartRequestWithAuthRetry(std::move(request)); 648
642 run_loop.Run(); 649 base::Time LastViewedByMeDateUTC;
650 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
651 &LastViewedByMeDateUTC));
652
653 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC);
654 request->add_parent("parent_resource_id");
655
656 request->set_properties(testing_properties_);
657 request_sender_->StartRequestWithAuthRetry(std::move(request));
658 run_loop.Run();
643 } 659 }
644 660
645 EXPECT_EQ(HTTP_SUCCESS, error); 661 EXPECT_EQ(HTTP_SUCCESS, error);
646 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method); 662 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method);
647 EXPECT_EQ("/drive/v2/files/resource_id" 663 EXPECT_EQ("/drive/v2/files/resource_id"
648 "?setModifiedDate=true&updateViewedDate=false", 664 "?setModifiedDate=true&updateViewedDate=false",
649 http_request_.relative_url); 665 http_request_.relative_url);
650 666
651 EXPECT_EQ("application/json", http_request_.headers["Content-Type"]); 667 EXPECT_EQ("application/json", http_request_.headers["Content-Type"]);
652 EXPECT_TRUE(http_request_.has_content); 668 EXPECT_TRUE(http_request_.has_content);
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 { 838 {
823 base::RunLoop run_loop; 839 base::RunLoop run_loop;
824 std::unique_ptr<drive::FilesCopyRequest> request = 840 std::unique_ptr<drive::FilesCopyRequest> request =
825 base::MakeUnique<drive::FilesCopyRequest>( 841 base::MakeUnique<drive::FilesCopyRequest>(
826 request_sender_.get(), *url_generator_, 842 request_sender_.get(), *url_generator_,
827 test_util::CreateQuitCallback( 843 test_util::CreateQuitCallback(
828 &run_loop, 844 &run_loop,
829 test_util::CreateCopyResultCallback(&error, &file_resource))); 845 test_util::CreateCopyResultCallback(&error, &file_resource)));
830 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); 846 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE);
831 request->set_file_id("resource_id"); 847 request->set_file_id("resource_id");
832 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 848
849 base::Time ModifiedDateUTC;
850 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC));
851
852 request->set_modified_date(ModifiedDateUTC);
833 request->add_parent("parent_resource_id"); 853 request->add_parent("parent_resource_id");
834 request->set_title("new title"); 854 request->set_title("new title");
835 request_sender_->StartRequestWithAuthRetry(std::move(request)); 855 request_sender_->StartRequestWithAuthRetry(std::move(request));
836 run_loop.Run(); 856 run_loop.Run();
837 } 857 }
838 858
839 EXPECT_EQ(HTTP_SUCCESS, error); 859 EXPECT_EQ(HTTP_SUCCESS, error);
840 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); 860 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
841 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE", 861 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE",
842 http_request_.relative_url); 862 http_request_.relative_url);
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 base::RunLoop run_loop; 1437 base::RunLoop run_loop;
1418 std::unique_ptr<drive::InitiateUploadNewFileRequest> request = 1438 std::unique_ptr<drive::InitiateUploadNewFileRequest> request =
1419 base::MakeUnique<drive::InitiateUploadNewFileRequest>( 1439 base::MakeUnique<drive::InitiateUploadNewFileRequest>(
1420 request_sender_.get(), *url_generator_, kTestContentType, 1440 request_sender_.get(), *url_generator_, kTestContentType,
1421 kTestContent.size(), 1441 kTestContent.size(),
1422 "parent_resource_id", // The resource id of the parent directory. 1442 "parent_resource_id", // The resource id of the parent directory.
1423 "new file title", // The title of the file being uploaded. 1443 "new file title", // The title of the file being uploaded.
1424 test_util::CreateQuitCallback( 1444 test_util::CreateQuitCallback(
1425 &run_loop, 1445 &run_loop,
1426 test_util::CreateCopyResultCallback(&error, &upload_url))); 1446 test_util::CreateCopyResultCallback(&error, &upload_url)));
1427 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 1447 base::Time ModifiedDateUTC;
1428 request->set_last_viewed_by_me_date( 1448 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC));
1429 base::Time::FromUTCExploded(kLastViewedByMeDate)); 1449
1450 request->set_modified_date(ModifiedDateUTC);
1451
1452 base::Time LastViewedByMeDateUTC;
1453 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
1454 &LastViewedByMeDateUTC));
1455
1456 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC);
1430 request_sender_->StartRequestWithAuthRetry(std::move(request)); 1457 request_sender_->StartRequestWithAuthRetry(std::move(request));
1431 run_loop.Run(); 1458 run_loop.Run();
1432 } 1459 }
1433 1460
1434 EXPECT_EQ(HTTP_SUCCESS, error); 1461 EXPECT_EQ(HTTP_SUCCESS, error);
1435 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path()); 1462 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
1436 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); 1463 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
1437 EXPECT_EQ(base::SizeTToString(kTestContent.size()), 1464 EXPECT_EQ(base::SizeTToString(kTestContent.size()),
1438 http_request_.headers["X-Upload-Content-Length"]); 1465 http_request_.headers["X-Upload-Content-Length"]);
1439 1466
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 std::unique_ptr<drive::InitiateUploadExistingFileRequest> request = 1802 std::unique_ptr<drive::InitiateUploadExistingFileRequest> request =
1776 base::MakeUnique<drive::InitiateUploadExistingFileRequest>( 1803 base::MakeUnique<drive::InitiateUploadExistingFileRequest>(
1777 request_sender_.get(), *url_generator_, kTestContentType, 1804 request_sender_.get(), *url_generator_, kTestContentType,
1778 kTestContent.size(), 1805 kTestContent.size(),
1779 "resource_id", // The resource id of the file to be overwritten. 1806 "resource_id", // The resource id of the file to be overwritten.
1780 kTestETag, test_util::CreateQuitCallback( 1807 kTestETag, test_util::CreateQuitCallback(
1781 &run_loop, test_util::CreateCopyResultCallback( 1808 &run_loop, test_util::CreateCopyResultCallback(
1782 &error, &upload_url))); 1809 &error, &upload_url)));
1783 request->set_parent_resource_id("new_parent_resource_id"); 1810 request->set_parent_resource_id("new_parent_resource_id");
1784 request->set_title("new file title"); 1811 request->set_title("new file title");
1785 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 1812 base::Time ModifiedDateUTC;
1786 request->set_last_viewed_by_me_date( 1813 EXPECT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &ModifiedDateUTC));
1787 base::Time::FromUTCExploded(kLastViewedByMeDate)); 1814
1815 request->set_modified_date(ModifiedDateUTC);
1816
1817 base::Time LastViewedByMeDateUTC;
1818 EXPECT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
1819 &LastViewedByMeDateUTC));
1820
1821 request->set_last_viewed_by_me_date(LastViewedByMeDateUTC);
1788 1822
1789 request_sender_->StartRequestWithAuthRetry(std::move(request)); 1823 request_sender_->StartRequestWithAuthRetry(std::move(request));
1790 run_loop.Run(); 1824 run_loop.Run();
1791 } 1825 }
1792 1826
1793 EXPECT_EQ(HTTP_SUCCESS, error); 1827 EXPECT_EQ(HTTP_SUCCESS, error);
1794 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path()); 1828 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path());
1795 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); 1829 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
1796 EXPECT_EQ(base::SizeTToString(kTestContent.size()), 1830 EXPECT_EQ(base::SizeTToString(kTestContent.size()),
1797 http_request_.headers["X-Upload-Content-Length"]); 1831 http_request_.headers["X-Upload-Content-Length"]);
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
2241 "Header: value\r\n" 2275 "Header: value\r\n"
2242 "\r\n" 2276 "\r\n"
2243 "BODY\r\n" 2277 "BODY\r\n"
2244 "--BOUNDARY-- \t", 2278 "--BOUNDARY-- \t",
2245 &parts)); 2279 &parts));
2246 ASSERT_EQ(1u, parts.size()); 2280 ASSERT_EQ(1u, parts.size());
2247 EXPECT_EQ(HTTP_SUCCESS, parts[0].code); 2281 EXPECT_EQ(HTTP_SUCCESS, parts[0].code);
2248 EXPECT_EQ("BODY", parts[0].body); 2282 EXPECT_EQ("BODY", parts[0].body);
2249 } 2283 }
2250 } // namespace google_apis 2284 } // namespace google_apis
OLDNEW
« no previous file with comments | « no previous file | google_apis/drive/time_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698