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

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: comments 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 last_viewed_by_me_date_utc;
572 ASSERT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
573 &last_viewed_by_me_date_utc));
574 request->set_last_viewed_by_me_date(last_viewed_by_me_date_utc);
575
576 base::Time modified_date_utc;
577 ASSERT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
578 request->set_modified_date(modified_date_utc);
579
572 request->set_mime_type("application/vnd.google-apps.folder"); 580 request->set_mime_type("application/vnd.google-apps.folder");
573 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate));
574 request->add_parent("root"); 581 request->add_parent("root");
575 request->set_title("new directory"); 582 request->set_title("new directory");
576 request->set_properties(testing_properties_); 583 request->set_properties(testing_properties_);
577 request_sender_->StartRequestWithAuthRetry(std::move(request)); 584 request_sender_->StartRequestWithAuthRetry(std::move(request));
578 run_loop.Run(); 585 run_loop.Run();
579 } 586 }
580 587
581 EXPECT_EQ(HTTP_SUCCESS, error); 588 EXPECT_EQ(HTTP_SUCCESS, error);
582 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); 589 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
583 EXPECT_EQ("/drive/v2/files?visibility=PRIVATE", http_request_.relative_url); 590 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>( 632 base::MakeUnique<drive::FilesPatchRequest>(
626 request_sender_.get(), *url_generator_, 633 request_sender_.get(), *url_generator_,
627 test_util::CreateQuitCallback( 634 test_util::CreateQuitCallback(
628 &run_loop, 635 &run_loop,
629 test_util::CreateCopyResultCallback(&error, &file_resource))); 636 test_util::CreateCopyResultCallback(&error, &file_resource)));
630 request->set_file_id("resource_id"); 637 request->set_file_id("resource_id");
631 request->set_set_modified_date(true); 638 request->set_set_modified_date(true);
632 request->set_update_viewed_date(false); 639 request->set_update_viewed_date(false);
633 640
634 request->set_title("new title"); 641 request->set_title("new title");
635 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 642 base::Time modified_date_utc;
636 request->set_last_viewed_by_me_date( 643 base::Time::FromUTCExploded(kLastViewedByMeDate);
637 base::Time::FromUTCExploded(kLastViewedByMeDate)); 644 ASSERT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
645 request->set_modified_date(modified_date_utc);
646
647 base::Time last_viewed_by_me_date_utc;
648 ASSERT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
649 &last_viewed_by_me_date_utc));
650 request->set_last_viewed_by_me_date(last_viewed_by_me_date_utc);
638 request->add_parent("parent_resource_id"); 651 request->add_parent("parent_resource_id");
639
640 request->set_properties(testing_properties_); 652 request->set_properties(testing_properties_);
641 request_sender_->StartRequestWithAuthRetry(std::move(request)); 653 request_sender_->StartRequestWithAuthRetry(std::move(request));
642 run_loop.Run(); 654 run_loop.Run();
643 } 655 }
644 656
645 EXPECT_EQ(HTTP_SUCCESS, error); 657 EXPECT_EQ(HTTP_SUCCESS, error);
646 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method); 658 EXPECT_EQ(net::test_server::METHOD_PATCH, http_request_.method);
647 EXPECT_EQ("/drive/v2/files/resource_id" 659 EXPECT_EQ("/drive/v2/files/resource_id"
648 "?setModifiedDate=true&updateViewedDate=false", 660 "?setModifiedDate=true&updateViewedDate=false",
649 http_request_.relative_url); 661 http_request_.relative_url);
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
822 { 834 {
823 base::RunLoop run_loop; 835 base::RunLoop run_loop;
824 std::unique_ptr<drive::FilesCopyRequest> request = 836 std::unique_ptr<drive::FilesCopyRequest> request =
825 base::MakeUnique<drive::FilesCopyRequest>( 837 base::MakeUnique<drive::FilesCopyRequest>(
826 request_sender_.get(), *url_generator_, 838 request_sender_.get(), *url_generator_,
827 test_util::CreateQuitCallback( 839 test_util::CreateQuitCallback(
828 &run_loop, 840 &run_loop,
829 test_util::CreateCopyResultCallback(&error, &file_resource))); 841 test_util::CreateCopyResultCallback(&error, &file_resource)));
830 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE); 842 request->set_visibility(drive::FILE_VISIBILITY_PRIVATE);
831 request->set_file_id("resource_id"); 843 request->set_file_id("resource_id");
832 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 844
845 base::Time modified_date_utc;
846 ASSERT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
847
848 request->set_modified_date(modified_date_utc);
833 request->add_parent("parent_resource_id"); 849 request->add_parent("parent_resource_id");
834 request->set_title("new title"); 850 request->set_title("new title");
835 request_sender_->StartRequestWithAuthRetry(std::move(request)); 851 request_sender_->StartRequestWithAuthRetry(std::move(request));
836 run_loop.Run(); 852 run_loop.Run();
837 } 853 }
838 854
839 EXPECT_EQ(HTTP_SUCCESS, error); 855 EXPECT_EQ(HTTP_SUCCESS, error);
840 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method); 856 EXPECT_EQ(net::test_server::METHOD_POST, http_request_.method);
841 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE", 857 EXPECT_EQ("/drive/v2/files/resource_id/copy?visibility=PRIVATE",
842 http_request_.relative_url); 858 http_request_.relative_url);
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 base::RunLoop run_loop; 1433 base::RunLoop run_loop;
1418 std::unique_ptr<drive::InitiateUploadNewFileRequest> request = 1434 std::unique_ptr<drive::InitiateUploadNewFileRequest> request =
1419 base::MakeUnique<drive::InitiateUploadNewFileRequest>( 1435 base::MakeUnique<drive::InitiateUploadNewFileRequest>(
1420 request_sender_.get(), *url_generator_, kTestContentType, 1436 request_sender_.get(), *url_generator_, kTestContentType,
1421 kTestContent.size(), 1437 kTestContent.size(),
1422 "parent_resource_id", // The resource id of the parent directory. 1438 "parent_resource_id", // The resource id of the parent directory.
1423 "new file title", // The title of the file being uploaded. 1439 "new file title", // The title of the file being uploaded.
1424 test_util::CreateQuitCallback( 1440 test_util::CreateQuitCallback(
1425 &run_loop, 1441 &run_loop,
1426 test_util::CreateCopyResultCallback(&error, &upload_url))); 1442 test_util::CreateCopyResultCallback(&error, &upload_url)));
1427 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 1443 base::Time modified_date_utc;
1428 request->set_last_viewed_by_me_date( 1444 ASSERT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
1429 base::Time::FromUTCExploded(kLastViewedByMeDate)); 1445
1446 request->set_modified_date(modified_date_utc);
1447
1448 base::Time last_viewed_by_me_date_utc;
1449 ASSERT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
1450 &last_viewed_by_me_date_utc));
1451 request->set_last_viewed_by_me_date(last_viewed_by_me_date_utc);
1430 request_sender_->StartRequestWithAuthRetry(std::move(request)); 1452 request_sender_->StartRequestWithAuthRetry(std::move(request));
1431 run_loop.Run(); 1453 run_loop.Run();
1432 } 1454 }
1433 1455
1434 EXPECT_EQ(HTTP_SUCCESS, error); 1456 EXPECT_EQ(HTTP_SUCCESS, error);
1435 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path()); 1457 EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
1436 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); 1458 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
1437 EXPECT_EQ(base::SizeTToString(kTestContent.size()), 1459 EXPECT_EQ(base::SizeTToString(kTestContent.size()),
1438 http_request_.headers["X-Upload-Content-Length"]); 1460 http_request_.headers["X-Upload-Content-Length"]);
1439 1461
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1775 std::unique_ptr<drive::InitiateUploadExistingFileRequest> request = 1797 std::unique_ptr<drive::InitiateUploadExistingFileRequest> request =
1776 base::MakeUnique<drive::InitiateUploadExistingFileRequest>( 1798 base::MakeUnique<drive::InitiateUploadExistingFileRequest>(
1777 request_sender_.get(), *url_generator_, kTestContentType, 1799 request_sender_.get(), *url_generator_, kTestContentType,
1778 kTestContent.size(), 1800 kTestContent.size(),
1779 "resource_id", // The resource id of the file to be overwritten. 1801 "resource_id", // The resource id of the file to be overwritten.
1780 kTestETag, test_util::CreateQuitCallback( 1802 kTestETag, test_util::CreateQuitCallback(
1781 &run_loop, test_util::CreateCopyResultCallback( 1803 &run_loop, test_util::CreateCopyResultCallback(
1782 &error, &upload_url))); 1804 &error, &upload_url)));
1783 request->set_parent_resource_id("new_parent_resource_id"); 1805 request->set_parent_resource_id("new_parent_resource_id");
1784 request->set_title("new file title"); 1806 request->set_title("new file title");
1785 request->set_modified_date(base::Time::FromUTCExploded(kModifiedDate)); 1807 base::Time modified_date_utc;
1786 request->set_last_viewed_by_me_date( 1808 ASSERT_TRUE(base::Time::FromUTCExploded(kModifiedDate, &modified_date_utc));
1787 base::Time::FromUTCExploded(kLastViewedByMeDate));
1788 1809
1810 request->set_modified_date(modified_date_utc);
1811
1812 base::Time last_viewed_by_me_date_utc;
1813 ASSERT_TRUE(base::Time::FromUTCExploded(kLastViewedByMeDate,
1814 &last_viewed_by_me_date_utc));
1815 request->set_last_viewed_by_me_date(last_viewed_by_me_date_utc);
1789 request_sender_->StartRequestWithAuthRetry(std::move(request)); 1816 request_sender_->StartRequestWithAuthRetry(std::move(request));
1790 run_loop.Run(); 1817 run_loop.Run();
1791 } 1818 }
1792 1819
1793 EXPECT_EQ(HTTP_SUCCESS, error); 1820 EXPECT_EQ(HTTP_SUCCESS, error);
1794 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path()); 1821 EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path());
1795 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]); 1822 EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
1796 EXPECT_EQ(base::SizeTToString(kTestContent.size()), 1823 EXPECT_EQ(base::SizeTToString(kTestContent.size()),
1797 http_request_.headers["X-Upload-Content-Length"]); 1824 http_request_.headers["X-Upload-Content-Length"]);
1798 EXPECT_EQ(kTestETag, http_request_.headers["If-Match"]); 1825 EXPECT_EQ(kTestETag, http_request_.headers["If-Match"]);
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
2241 "Header: value\r\n" 2268 "Header: value\r\n"
2242 "\r\n" 2269 "\r\n"
2243 "BODY\r\n" 2270 "BODY\r\n"
2244 "--BOUNDARY-- \t", 2271 "--BOUNDARY-- \t",
2245 &parts)); 2272 &parts));
2246 ASSERT_EQ(1u, parts.size()); 2273 ASSERT_EQ(1u, parts.size());
2247 EXPECT_EQ(HTTP_SUCCESS, parts[0].code); 2274 EXPECT_EQ(HTTP_SUCCESS, parts[0].code);
2248 EXPECT_EQ("BODY", parts[0].body); 2275 EXPECT_EQ("BODY", parts[0].body);
2249 } 2276 }
2250 } // namespace google_apis 2277 } // 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