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

Side by Side Diff: chrome/browser/google_apis/fake_drive_service_unittest.cc

Issue 13927002: Add callback for upload progress in Drive service and operation layer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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
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/google_apis/fake_drive_service.h" 5 #include "chrome/browser/google_apis/fake_drive_service.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 1584 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 fake_service_.set_offline(true); 1595 fake_service_.set_offline(true);
1596 1596
1597 UploadRangeResponse response; 1597 UploadRangeResponse response;
1598 scoped_ptr<ResourceEntry> entry; 1598 scoped_ptr<ResourceEntry> entry;
1599 fake_service_.ResumeUpload( 1599 fake_service_.ResumeUpload(
1600 UPLOAD_NEW_FILE, 1600 UPLOAD_NEW_FILE,
1601 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")), 1601 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
1602 upload_location, 1602 upload_location,
1603 0, 13, 15, "test/foo", 1603 0, 13, 15, "test/foo",
1604 scoped_refptr<net::IOBuffer>(), 1604 scoped_refptr<net::IOBuffer>(),
1605 test_util::CreateCopyResultCallback(&response, &entry)); 1605 test_util::CreateCopyResultCallback(&response, &entry),
1606 ProgressCallback());
1606 message_loop_.RunUntilIdle(); 1607 message_loop_.RunUntilIdle();
1607 1608
1608 EXPECT_EQ(GDATA_NO_CONNECTION, response.code); 1609 EXPECT_EQ(GDATA_NO_CONNECTION, response.code);
1609 EXPECT_FALSE(entry.get()); 1610 EXPECT_FALSE(entry.get());
1610 } 1611 }
1611 1612
1612 TEST_F(FakeDriveServiceTest, ResumeUpload_NotFound) { 1613 TEST_F(FakeDriveServiceTest, ResumeUpload_NotFound) {
1613 ASSERT_TRUE(fake_service_.LoadResourceListForWapi( 1614 ASSERT_TRUE(fake_service_.LoadResourceListForWapi(
1614 "chromeos/gdata/root_feed.json")); 1615 "chromeos/gdata/root_feed.json"));
1615 1616
(...skipping 11 matching lines...) Expand all
1627 ASSERT_EQ(HTTP_SUCCESS, error); 1628 ASSERT_EQ(HTTP_SUCCESS, error);
1628 1629
1629 UploadRangeResponse response; 1630 UploadRangeResponse response;
1630 scoped_ptr<ResourceEntry> entry; 1631 scoped_ptr<ResourceEntry> entry;
1631 fake_service_.ResumeUpload( 1632 fake_service_.ResumeUpload(
1632 UPLOAD_NEW_FILE, 1633 UPLOAD_NEW_FILE,
1633 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")), 1634 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
1634 GURL("https://foo.com/"), 1635 GURL("https://foo.com/"),
1635 0, 13, 15, "test/foo", 1636 0, 13, 15, "test/foo",
1636 scoped_refptr<net::IOBuffer>(), 1637 scoped_refptr<net::IOBuffer>(),
1637 test_util::CreateCopyResultCallback(&response, &entry)); 1638 test_util::CreateCopyResultCallback(&response, &entry),
1639 ProgressCallback());
1638 message_loop_.RunUntilIdle(); 1640 message_loop_.RunUntilIdle();
1639 1641
1640 EXPECT_EQ(HTTP_NOT_FOUND, response.code); 1642 EXPECT_EQ(HTTP_NOT_FOUND, response.code);
1641 EXPECT_FALSE(entry.get()); 1643 EXPECT_FALSE(entry.get());
1642 } 1644 }
1643 1645
1644 TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) { 1646 TEST_F(FakeDriveServiceTest, ResumeUpload_ExistingFile) {
1645 ASSERT_TRUE(fake_service_.LoadResourceListForWapi( 1647 ASSERT_TRUE(fake_service_.LoadResourceListForWapi(
1646 "chromeos/gdata/root_feed.json")); 1648 "chromeos/gdata/root_feed.json"));
1647 1649
(...skipping 11 matching lines...) Expand all
1659 ASSERT_EQ(HTTP_SUCCESS, error); 1661 ASSERT_EQ(HTTP_SUCCESS, error);
1660 1662
1661 UploadRangeResponse response; 1663 UploadRangeResponse response;
1662 scoped_ptr<ResourceEntry> entry; 1664 scoped_ptr<ResourceEntry> entry;
1663 fake_service_.ResumeUpload( 1665 fake_service_.ResumeUpload(
1664 UPLOAD_EXISTING_FILE, 1666 UPLOAD_EXISTING_FILE,
1665 base::FilePath(FILE_PATH_LITERAL("drive/File 1.txt")), 1667 base::FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
1666 upload_location, 1668 upload_location,
1667 0, 13, 15, "text/plain", 1669 0, 13, 15, "text/plain",
1668 scoped_refptr<net::IOBuffer>(), 1670 scoped_refptr<net::IOBuffer>(),
1669 test_util::CreateCopyResultCallback(&response, &entry)); 1671 test_util::CreateCopyResultCallback(&response, &entry),
1672 ProgressCallback());
1670 message_loop_.RunUntilIdle(); 1673 message_loop_.RunUntilIdle();
1671 1674
1672 EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code); 1675 EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
1673 EXPECT_FALSE(entry.get()); 1676 EXPECT_FALSE(entry.get());
1674 1677
1675 fake_service_.ResumeUpload( 1678 fake_service_.ResumeUpload(
1676 UPLOAD_EXISTING_FILE, 1679 UPLOAD_EXISTING_FILE,
1677 base::FilePath(FILE_PATH_LITERAL("drive/File 1.txt")), 1680 base::FilePath(FILE_PATH_LITERAL("drive/File 1.txt")),
1678 upload_location, 1681 upload_location,
1679 14, 15, 15, "text/plain", 1682 14, 15, 15, "text/plain",
1680 scoped_refptr<net::IOBuffer>(), 1683 scoped_refptr<net::IOBuffer>(),
1681 test_util::CreateCopyResultCallback(&response, &entry)); 1684 test_util::CreateCopyResultCallback(&response, &entry),
1685 ProgressCallback());
1682 message_loop_.RunUntilIdle(); 1686 message_loop_.RunUntilIdle();
1683 1687
1684 EXPECT_EQ(HTTP_SUCCESS, response.code); 1688 EXPECT_EQ(HTTP_SUCCESS, response.code);
1685 EXPECT_TRUE(entry.get()); 1689 EXPECT_TRUE(entry.get());
1686 EXPECT_EQ(15L, entry->file_size()); 1690 EXPECT_EQ(15L, entry->file_size());
1687 EXPECT_TRUE(Exists(entry->resource_id())); 1691 EXPECT_TRUE(Exists(entry->resource_id()));
1688 } 1692 }
1689 1693
1690 TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) { 1694 TEST_F(FakeDriveServiceTest, ResumeUpload_NewFile) {
1691 ASSERT_TRUE(fake_service_.LoadResourceListForWapi( 1695 ASSERT_TRUE(fake_service_.LoadResourceListForWapi(
(...skipping 16 matching lines...) Expand all
1708 upload_location); 1712 upload_location);
1709 1713
1710 UploadRangeResponse response; 1714 UploadRangeResponse response;
1711 scoped_ptr<ResourceEntry> entry; 1715 scoped_ptr<ResourceEntry> entry;
1712 fake_service_.ResumeUpload( 1716 fake_service_.ResumeUpload(
1713 UPLOAD_NEW_FILE, 1717 UPLOAD_NEW_FILE,
1714 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")), 1718 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
1715 upload_location, 1719 upload_location,
1716 0, 13, 15, "test/foo", 1720 0, 13, 15, "test/foo",
1717 scoped_refptr<net::IOBuffer>(), 1721 scoped_refptr<net::IOBuffer>(),
1718 test_util::CreateCopyResultCallback(&response, &entry)); 1722 test_util::CreateCopyResultCallback(&response, &entry),
1723 ProgressCallback());
1719 message_loop_.RunUntilIdle(); 1724 message_loop_.RunUntilIdle();
1720 1725
1721 EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code); 1726 EXPECT_EQ(HTTP_RESUME_INCOMPLETE, response.code);
1722 EXPECT_FALSE(entry.get()); 1727 EXPECT_FALSE(entry.get());
1723 1728
1724 fake_service_.ResumeUpload( 1729 fake_service_.ResumeUpload(
1725 UPLOAD_NEW_FILE, 1730 UPLOAD_NEW_FILE,
1726 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")), 1731 base::FilePath(FILE_PATH_LITERAL("drive/Directory 1/new file.foo")),
1727 upload_location, 1732 upload_location,
1728 14, 15, 15, "test/foo", 1733 14, 15, 15, "test/foo",
1729 scoped_refptr<net::IOBuffer>(), 1734 scoped_refptr<net::IOBuffer>(),
1730 test_util::CreateCopyResultCallback(&response, &entry)); 1735 test_util::CreateCopyResultCallback(&response, &entry),
1736 ProgressCallback());
1731 message_loop_.RunUntilIdle(); 1737 message_loop_.RunUntilIdle();
1732 1738
1733 EXPECT_EQ(HTTP_CREATED, response.code); 1739 EXPECT_EQ(HTTP_CREATED, response.code);
1734 EXPECT_TRUE(entry.get()); 1740 EXPECT_TRUE(entry.get());
1735 EXPECT_EQ(15L, entry->file_size()); 1741 EXPECT_EQ(15L, entry->file_size());
1736 EXPECT_TRUE(Exists(entry->resource_id())); 1742 EXPECT_TRUE(Exists(entry->resource_id()));
1737 } 1743 }
1738 1744
1739 TEST_F(FakeDriveServiceTest, AddNewFile_ToRootDirectory) { 1745 TEST_F(FakeDriveServiceTest, AddNewFile_ToRootDirectory) {
1740 ASSERT_TRUE(fake_service_.LoadResourceListForWapi( 1746 ASSERT_TRUE(fake_service_.LoadResourceListForWapi(
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1948 test_util::CreateCopyResultCallback(&error, &resource_entry)); 1954 test_util::CreateCopyResultCallback(&error, &resource_entry));
1949 message_loop_.RunUntilIdle(); 1955 message_loop_.RunUntilIdle();
1950 1956
1951 EXPECT_EQ(GDATA_NO_CONNECTION, error); 1957 EXPECT_EQ(GDATA_NO_CONNECTION, error);
1952 EXPECT_FALSE(resource_entry); 1958 EXPECT_FALSE(resource_entry);
1953 } 1959 }
1954 1960
1955 } // namespace 1961 } // namespace
1956 1962
1957 } // namespace google_apis 1963 } // namespace google_apis
OLDNEW
« no previous file with comments | « chrome/browser/google_apis/fake_drive_service.cc ('k') | chrome/browser/google_apis/gdata_wapi_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698