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

Unified Diff: content/browser/download/download_job_unittest.cc

Issue 2689373003: Introduce ParallelDownloadJob. (Closed)
Patch Set: Make windows compiler happy. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/download/download_job_unittest.cc
diff --git a/content/browser/download/download_job_unittest.cc b/content/browser/download/download_job_unittest.cc
index acdc5f1460e40109ecbf0e3065abdc626bc53bff..bfceca7be3779f23c910e1fb07d8b2ae13c405ec 100644
--- a/content/browser/download/download_job_unittest.cc
+++ b/content/browser/download/download_job_unittest.cc
@@ -5,25 +5,16 @@
#include <memory>
#include "base/memory/ptr_util.h"
+#include "content/browser/download/download_item_impl_delegate.h"
#include "content/browser/download/download_job.h"
+#include "content/browser/download/mock_download_item_impl.h"
#include "content/browser/download/mock_download_job.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
-class MockDownloadJobManager : public DownloadJob::Manager {
- public:
- MockDownloadJobManager() = default;
- ~MockDownloadJobManager() = default;
-
- MOCK_METHOD1(OnSavingStarted, void(DownloadJob* download_job));
- MOCK_METHOD1(SetDangerType, void(DownloadDangerType));
- MOCK_METHOD2(OnDownloadInterrupted,
- void(DownloadJob* download_job, DownloadInterruptReason reason));
- MOCK_METHOD1(OnDownloadComplete, void(DownloadJob* download_job));
-};
-
// Test for DownloadJob base class functionalities.
class DownloadJobTest : public testing::Test {
public:
@@ -31,22 +22,21 @@ class DownloadJobTest : public testing::Test {
~DownloadJobTest() override = default;
void SetUp() override {
- download_job_manager_ = base::MakeUnique<MockDownloadJobManager>();
- EXPECT_TRUE(download_job_manager_.get());
+ item_delegate_ = base::MakeUnique<DownloadItemImplDelegate>();
+ download_item_ =
+ base::MakeUnique<MockDownloadItemImpl>(item_delegate_.get());
download_job_ = base::MakeUnique<MockDownloadJob>();
}
- std::unique_ptr<MockDownloadJobManager> download_job_manager_;
+ content::TestBrowserThreadBundle browser_threads_;
+ std::unique_ptr<DownloadItemImplDelegate> item_delegate_;
+ std::unique_ptr<MockDownloadItemImpl> download_item_;
std::unique_ptr<MockDownloadJob> download_job_;
};
-TEST_F(DownloadJobTest, AttachAndDetach) {
- // Ensure the manager should be valid only between attach and detach call.
- EXPECT_FALSE(download_job_->manager());
- download_job_->OnAttached(download_job_manager_.get());
- EXPECT_TRUE(download_job_->manager());
- download_job_->OnBeforeDetach();
- EXPECT_FALSE(download_job_->manager());
+TEST_F(DownloadJobTest, AttachDownloadItem) {
+ download_job_->Attach(download_item_.get());
+ DCHECK(download_job_->download_item());
}
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698