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

Side by Side Diff: content/browser/download/download_manager_impl_unittest.cc

Issue 10861002: Revert 152213 - Replace the DownloadFileManager with direct ownership of DownloadFile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 <set> 5 #include <set>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/memory/weak_ptr.h" 11 #include "base/memory/weak_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/scoped_temp_dir.h" 13 #include "base/scoped_temp_dir.h"
14 #include "base/stl_util.h" 14 #include "base/stl_util.h"
15 #include "base/string16.h" 15 #include "base/string16.h"
16 #include "base/string_util.h" 16 #include "base/string_util.h"
17 #include "base/utf_string_conversions.h" 17 #include "base/utf_string_conversions.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "content/browser/download/byte_stream.h" 19 #include "content/browser/download/byte_stream.h"
20 #include "content/browser/download/download_create_info.h" 20 #include "content/browser/download/download_create_info.h"
21 #include "content/browser/download/download_file_manager.h"
21 #include "content/browser/download/download_item_factory.h" 22 #include "content/browser/download/download_item_factory.h"
22 #include "content/browser/download/download_item_impl.h" 23 #include "content/browser/download/download_item_impl.h"
23 #include "content/browser/download/download_item_impl_delegate.h" 24 #include "content/browser/download/download_item_impl_delegate.h"
24 #include "content/browser/download/download_manager_impl.h" 25 #include "content/browser/download/download_manager_impl.h"
25 #include "content/browser/download/download_request_handle.h" 26 #include "content/browser/download/download_request_handle.h"
26 #include "content/browser/download/mock_download_file.h" 27 #include "content/browser/download/mock_download_file.h"
27 #include "content/public/browser/browser_context.h" 28 #include "content/public/browser/browser_context.h"
28 #include "content/public/browser/download_interrupt_reasons.h" 29 #include "content/public/browser/download_interrupt_reasons.h"
29 #include "content/public/browser/download_item.h" 30 #include "content/public/browser/download_item.h"
30 #include "content/public/browser/download_manager_delegate.h" 31 #include "content/public/browser/download_manager_delegate.h"
31 #include "content/public/test/mock_download_item.h" 32 #include "content/public/test/mock_download_item.h"
32 #include "content/public/test/test_browser_context.h" 33 #include "content/public/test/test_browser_context.h"
33 #include "content/public/test/test_browser_thread.h" 34 #include "content/public/test/test_browser_thread.h"
34 #include "net/base/net_log.h"
35 #include "net/base/net_util.h" 35 #include "net/base/net_util.h"
36 #include "testing/gmock/include/gmock/gmock.h" 36 #include "testing/gmock/include/gmock/gmock.h"
37 #include "testing/gmock_mutant.h" 37 #include "testing/gmock_mutant.h"
38 #include "testing/gtest/include/gtest/gtest.h" 38 #include "testing/gtest/include/gtest/gtest.h"
39 39
40 using ::testing::DoAll; 40 using ::testing::DoAll;
41 using ::testing::Ref; 41 using ::testing::Ref;
42 using ::testing::Return; 42 using ::testing::Return;
43 using ::testing::ReturnRef; 43 using ::testing::ReturnRef;
44 using ::testing::SetArgPointee; 44 using ::testing::SetArgPointee;
(...skipping 28 matching lines...) Expand all
73 MOCK_METHOD0(CanShowInFolder, bool()); 73 MOCK_METHOD0(CanShowInFolder, bool());
74 MOCK_METHOD0(CanOpenDownload, bool()); 74 MOCK_METHOD0(CanOpenDownload, bool());
75 MOCK_METHOD0(ShouldOpenFileBasedOnExtension, bool()); 75 MOCK_METHOD0(ShouldOpenFileBasedOnExtension, bool());
76 MOCK_METHOD0(OpenDownload, void()); 76 MOCK_METHOD0(OpenDownload, void());
77 MOCK_METHOD0(ShowDownloadInShell, void()); 77 MOCK_METHOD0(ShowDownloadInShell, void());
78 MOCK_METHOD0(DangerousDownloadValidated, void()); 78 MOCK_METHOD0(DangerousDownloadValidated, void());
79 MOCK_METHOD3(UpdateProgress, void(int64, int64, const std::string&)); 79 MOCK_METHOD3(UpdateProgress, void(int64, int64, const std::string&));
80 MOCK_METHOD1(Cancel, void(bool)); 80 MOCK_METHOD1(Cancel, void(bool));
81 MOCK_METHOD0(MarkAsComplete, void()); 81 MOCK_METHOD0(MarkAsComplete, void());
82 MOCK_METHOD1(DelayedDownloadOpened, void(bool)); 82 MOCK_METHOD1(DelayedDownloadOpened, void(bool));
83 MOCK_METHOD1(OnAllDataSaved, void(const std::string&)); 83 MOCK_METHOD2(OnAllDataSaved, void(int64, const std::string&));
84 MOCK_METHOD0(OnDownloadedFileRemoved, void()); 84 MOCK_METHOD0(OnDownloadedFileRemoved, void());
85 MOCK_METHOD0(MaybeCompleteDownload, void()); 85 MOCK_METHOD0(MaybeCompleteDownload, void());
86 virtual void Start(
87 scoped_ptr<content::DownloadFile> download_file) OVERRIDE {
88 MockStart(download_file.get());
89 }
90
91 MOCK_METHOD1(MockStart, void(content::DownloadFile*));
92
93 MOCK_METHOD1(Interrupt, void(DownloadInterruptReason)); 86 MOCK_METHOD1(Interrupt, void(DownloadInterruptReason));
94 MOCK_METHOD1(Delete, void(DeleteReason)); 87 MOCK_METHOD1(Delete, void(DeleteReason));
95 MOCK_METHOD0(Remove, void()); 88 MOCK_METHOD0(Remove, void());
96 MOCK_CONST_METHOD1(TimeRemaining, bool(base::TimeDelta*)); 89 MOCK_CONST_METHOD1(TimeRemaining, bool(base::TimeDelta*));
97 MOCK_CONST_METHOD0(CurrentSpeed, int64()); 90 MOCK_CONST_METHOD0(CurrentSpeed, int64());
98 MOCK_CONST_METHOD0(PercentComplete, int()); 91 MOCK_CONST_METHOD0(PercentComplete, int());
99 MOCK_CONST_METHOD0(AllDataSaved, bool()); 92 MOCK_CONST_METHOD0(AllDataSaved, bool());
100 MOCK_METHOD0(TogglePause, void()); 93 MOCK_METHOD0(TogglePause, void());
101 MOCK_METHOD0(OnDownloadCompleting, void()); 94 MOCK_METHOD0(OnDownloadCompleting, void());
102 MOCK_CONST_METHOD1(MatchesQuery, bool(const string16& query)); 95 MOCK_CONST_METHOD1(MatchesQuery, bool(const string16& query));
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 MOCK_CONST_METHOD0(GetLastModifiedTime, const std::string&()); 146 MOCK_CONST_METHOD0(GetLastModifiedTime, const std::string&());
154 MOCK_CONST_METHOD0(GetETag, const std::string&()); 147 MOCK_CONST_METHOD0(GetETag, const std::string&());
155 MOCK_CONST_METHOD0(GetLastReason, DownloadInterruptReason()); 148 MOCK_CONST_METHOD0(GetLastReason, DownloadInterruptReason());
156 MOCK_CONST_METHOD0(GetPersistentStoreInfo, 149 MOCK_CONST_METHOD0(GetPersistentStoreInfo,
157 content::DownloadPersistentStoreInfo()); 150 content::DownloadPersistentStoreInfo());
158 MOCK_CONST_METHOD0(GetBrowserContext, content::BrowserContext*()); 151 MOCK_CONST_METHOD0(GetBrowserContext, content::BrowserContext*());
159 MOCK_CONST_METHOD0(GetWebContents, content::WebContents*()); 152 MOCK_CONST_METHOD0(GetWebContents, content::WebContents*());
160 MOCK_CONST_METHOD0(GetFileNameToReportUser, FilePath()); 153 MOCK_CONST_METHOD0(GetFileNameToReportUser, FilePath());
161 MOCK_METHOD1(SetDisplayName, void(const FilePath&)); 154 MOCK_METHOD1(SetDisplayName, void(const FilePath&));
162 MOCK_CONST_METHOD0(GetUserVerifiedFilePath, FilePath()); 155 MOCK_CONST_METHOD0(GetUserVerifiedFilePath, FilePath());
156 MOCK_METHOD0(OffThreadCancel, void());
163 MOCK_CONST_METHOD1(DebugString, std::string(bool)); 157 MOCK_CONST_METHOD1(DebugString, std::string(bool));
164 MOCK_METHOD0(MockDownloadOpenForTesting, void()); 158 MOCK_METHOD0(MockDownloadOpenForTesting, void());
165 }; 159 };
166 160
167 class MockDownloadManagerDelegate : public content::DownloadManagerDelegate { 161 class MockDownloadManagerDelegate : public content::DownloadManagerDelegate {
168 public: 162 public:
169 MockDownloadManagerDelegate(); 163 MockDownloadManagerDelegate();
170 virtual ~MockDownloadManagerDelegate(); 164 virtual ~MockDownloadManagerDelegate();
171 165
172 MOCK_METHOD0(Shutdown, void()); 166 MOCK_METHOD0(Shutdown, void());
(...skipping 17 matching lines...) Expand all
190 MOCK_METHOD4(GetSaveDir, void(WebContents*, FilePath*, FilePath*, bool*)); 184 MOCK_METHOD4(GetSaveDir, void(WebContents*, FilePath*, FilePath*, bool*));
191 MOCK_METHOD5(ChooseSavePath, void( 185 MOCK_METHOD5(ChooseSavePath, void(
192 WebContents*, const FilePath&, const FilePath::StringType&, 186 WebContents*, const FilePath&, const FilePath::StringType&,
193 bool, const content::SavePackagePathPickedCallback&)); 187 bool, const content::SavePackagePathPickedCallback&));
194 }; 188 };
195 189
196 MockDownloadManagerDelegate::MockDownloadManagerDelegate() {} 190 MockDownloadManagerDelegate::MockDownloadManagerDelegate() {}
197 191
198 MockDownloadManagerDelegate::~MockDownloadManagerDelegate() {} 192 MockDownloadManagerDelegate::~MockDownloadManagerDelegate() {}
199 193
200 class NullDownloadItemImplDelegate : public DownloadItemImplDelegate { 194 class MockDownloadFileManager : public DownloadFileManager {
201 public: 195 public:
202 // Safe to null this out even if it doesn't do anything because none 196 MockDownloadFileManager();
203 // of these functions will ever be called; this class just exists 197
204 // to have something to pass to the DownloadItemImpl base class 198 void CreateDownloadFile(
205 // of MockDownloadItemImpl. 199 scoped_ptr<DownloadCreateInfo> info,
206 virtual void DelegateStart(DownloadItemImpl* download) OVERRIDE { 200 scoped_ptr<content::ByteStreamReader> stream,
207 NOTREACHED(); 201 scoped_refptr<content::DownloadManager> download_manager,
202 bool hash_needed,
203 const net::BoundNetLog& bound_net_log,
204 const CreateDownloadFileCallback& callback) OVERRIDE {
205 // Note that scoped_refptr<> on download manager is also stripped
206 // to make mock comparisons easier. Comparing the scoped_refptr<>
207 // works, but holds a reference to the DownloadManager until
208 // MockDownloadFileManager destruction, which messes up destruction
209 // testing.
210 MockCreateDownloadFile(info.get(), stream.get(), download_manager.get(),
211 hash_needed, bound_net_log, callback);
208 } 212 }
213
214 MOCK_METHOD6(MockCreateDownloadFile, void(
215 DownloadCreateInfo* info,
216 content::ByteStreamReader* stream,
217 content::DownloadManager* download_manager,
218 bool hash_needed,
219 const net::BoundNetLog& bound_net_log,
220 const CreateDownloadFileCallback& callback));
221 MOCK_METHOD0(Shutdown, void());
222 MOCK_METHOD1(CancelDownload, void(content::DownloadId));
223 MOCK_METHOD2(CompleteDownload, void(content::DownloadId,
224 const base::Closure&));
225 MOCK_METHOD1(OnDownloadManagerShutdown, void(content::DownloadManager*));
226 MOCK_METHOD4(RenameDownloadFile, void(content::DownloadId,
227 const FilePath&,
228 bool,
229 const RenameCompletionCallback&));
230 MOCK_CONST_METHOD0(NumberOfActiveDownloads, int());
231 protected:
232 virtual ~MockDownloadFileManager();
209 }; 233 };
210 234
235 MockDownloadFileManager::MockDownloadFileManager()
236 : DownloadFileManager(NULL) {}
237
238 MockDownloadFileManager::~MockDownloadFileManager() {}
239
211 class MockDownloadItemFactory 240 class MockDownloadItemFactory
212 : public content::DownloadItemFactory, 241 : public content::DownloadItemFactory,
213 public base::SupportsWeakPtr<MockDownloadItemFactory> { 242 public base::SupportsWeakPtr<MockDownloadItemFactory> {
214 public: 243 public:
215 MockDownloadItemFactory(); 244 MockDownloadItemFactory();
216 virtual ~MockDownloadItemFactory(); 245 virtual ~MockDownloadItemFactory();
217 246
218 // Access to map of created items. 247 // Access to map of created items.
219 // TODO(rdsmith): Could add type (save page, persisted, etc.) 248 // TODO(rdsmith): Could add type (save page, persisted, etc.)
220 // functionality if it's ever needed by consumers. 249 // functionality if it's ever needed by consumers.
(...skipping 23 matching lines...) Expand all
244 virtual DownloadItemImpl* CreateSavePageItem( 273 virtual DownloadItemImpl* CreateSavePageItem(
245 DownloadItemImplDelegate* delegate, 274 DownloadItemImplDelegate* delegate,
246 const FilePath& path, 275 const FilePath& path,
247 const GURL& url, 276 const GURL& url,
248 content::DownloadId download_id, 277 content::DownloadId download_id,
249 const std::string& mime_type, 278 const std::string& mime_type,
250 const net::BoundNetLog& bound_net_log) OVERRIDE; 279 const net::BoundNetLog& bound_net_log) OVERRIDE;
251 280
252 private: 281 private:
253 std::map<int32, MockDownloadItemImpl*> items_; 282 std::map<int32, MockDownloadItemImpl*> items_;
254 NullDownloadItemImplDelegate item_delegate_; 283 DownloadItemImplDelegate item_delegate_;
255 284
256 DISALLOW_COPY_AND_ASSIGN(MockDownloadItemFactory); 285 DISALLOW_COPY_AND_ASSIGN(MockDownloadItemFactory);
257 }; 286 };
258 287
259 MockDownloadItemFactory::MockDownloadItemFactory() {} 288 MockDownloadItemFactory::MockDownloadItemFactory() {}
260 289
261 MockDownloadItemFactory::~MockDownloadItemFactory() {} 290 MockDownloadItemFactory::~MockDownloadItemFactory() {}
262 291
263 MockDownloadItemImpl* MockDownloadItemFactory::GetItem(int id) { 292 MockDownloadItemImpl* MockDownloadItemFactory::GetItem(int id) {
264 if (items_.find(id) == items_.end()) 293 if (items_.find(id) == items_.end())
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 const DownloadCreateInfo& info, 333 const DownloadCreateInfo& info,
305 scoped_ptr<DownloadRequestHandleInterface> request_handle, 334 scoped_ptr<DownloadRequestHandleInterface> request_handle,
306 const net::BoundNetLog& bound_net_log) { 335 const net::BoundNetLog& bound_net_log) {
307 int local_id = info.download_id.local(); 336 int local_id = info.download_id.local();
308 DCHECK(items_.find(local_id) == items_.end()); 337 DCHECK(items_.find(local_id) == items_.end());
309 338
310 MockDownloadItemImpl* result = 339 MockDownloadItemImpl* result =
311 new StrictMock<MockDownloadItemImpl>(&item_delegate_); 340 new StrictMock<MockDownloadItemImpl>(&item_delegate_);
312 EXPECT_CALL(*result, GetId()) 341 EXPECT_CALL(*result, GetId())
313 .WillRepeatedly(Return(local_id)); 342 .WillRepeatedly(Return(local_id));
314 EXPECT_CALL(*result, GetGlobalId())
315 .WillRepeatedly(Return(content::DownloadId(delegate, local_id)));
316 items_[local_id] = result; 343 items_[local_id] = result;
317 344
318 // Active items are created and then immediately are called to start
319 // the download.
320 EXPECT_CALL(*result, MockStart(_));
321
322 return result; 345 return result;
323 } 346 }
324 347
325 DownloadItemImpl* MockDownloadItemFactory::CreateSavePageItem( 348 DownloadItemImpl* MockDownloadItemFactory::CreateSavePageItem(
326 DownloadItemImplDelegate* delegate, 349 DownloadItemImplDelegate* delegate,
327 const FilePath& path, 350 const FilePath& path,
328 const GURL& url, 351 const GURL& url,
329 content::DownloadId download_id, 352 content::DownloadId download_id,
330 const std::string& mime_type, 353 const std::string& mime_type,
331 const net::BoundNetLog& bound_net_log) { 354 const net::BoundNetLog& bound_net_log) {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 406
384 DownloadManagerTest() 407 DownloadManagerTest()
385 : ui_thread_(content::BrowserThread::UI, &message_loop_), 408 : ui_thread_(content::BrowserThread::UI, &message_loop_),
386 file_thread_(content::BrowserThread::FILE, &message_loop_), 409 file_thread_(content::BrowserThread::FILE, &message_loop_),
387 next_download_id_(0) { 410 next_download_id_(0) {
388 } 411 }
389 412
390 // We tear down everything in TearDown(). 413 // We tear down everything in TearDown().
391 ~DownloadManagerTest() {} 414 ~DownloadManagerTest() {}
392 415
393 // Create a MockDownloadItemFactory and MockDownloadManagerDelegate, 416 // Create a MockDownloadItemFactory, MockDownloadManagerDelegate,
394 // then create a DownloadManager that points 417 // and MockDownloadFileManager, then create a DownloadManager that points
395 // at all of those. 418 // at all of those.
396 virtual void SetUp() { 419 virtual void SetUp() {
397 DCHECK(!download_manager_.get()); 420 DCHECK(!download_manager_.get());
398 421
399 mock_download_item_factory_ = (new MockDownloadItemFactory())->AsWeakPtr(); 422 mock_download_item_factory_ = (new MockDownloadItemFactory())->AsWeakPtr();
400 mock_download_manager_delegate_.reset( 423 mock_download_manager_delegate_.reset(
401 new StrictMock<MockDownloadManagerDelegate>); 424 new StrictMock<MockDownloadManagerDelegate>);
402 EXPECT_CALL(*mock_download_manager_delegate_.get(), Shutdown()) 425 EXPECT_CALL(*mock_download_manager_delegate_.get(), Shutdown())
403 .WillOnce(Return()); 426 .WillOnce(Return());
427 mock_download_file_manager_ = new StrictMock<MockDownloadFileManager>;
428 EXPECT_CALL(*mock_download_file_manager_.get(),
429 OnDownloadManagerShutdown(_));
404 mock_browser_context_.reset(new StrictMock<MockBrowserContext>); 430 mock_browser_context_.reset(new StrictMock<MockBrowserContext>);
405 EXPECT_CALL(*mock_browser_context_.get(), IsOffTheRecord()) 431 EXPECT_CALL(*mock_browser_context_.get(), IsOffTheRecord())
406 .WillRepeatedly(Return(false)); 432 .WillRepeatedly(Return(false));
407 433
408 download_manager_ = new DownloadManagerImpl( 434 download_manager_ = new DownloadManagerImpl(
435 mock_download_file_manager_.get(),
409 scoped_ptr<content::DownloadItemFactory>( 436 scoped_ptr<content::DownloadItemFactory>(
410 mock_download_item_factory_.get()).Pass(), NULL); 437 mock_download_item_factory_.get()).Pass(), NULL);
411 observer_.reset(new MockDownloadManagerObserver()); 438 observer_.reset(new MockDownloadManagerObserver());
412 EXPECT_CALL(GetMockObserver(), ModelChanged(download_manager_.get())) 439 EXPECT_CALL(GetMockObserver(), ModelChanged(download_manager_.get()))
413 .WillOnce(Return()); 440 .WillOnce(Return());
414 download_manager_->AddObserver(observer_.get()); 441 download_manager_->AddObserver(observer_.get());
415 download_manager_->SetDelegate(mock_download_manager_delegate_.get()); 442 download_manager_->SetDelegate(mock_download_manager_delegate_.get());
416 download_manager_->Init(mock_browser_context_.get()); 443 download_manager_->Init(mock_browser_context_.get());
417 } 444 }
418 445
419 virtual void TearDown() { 446 virtual void TearDown() {
420 while (MockDownloadItemImpl* 447 while (MockDownloadItemImpl*
421 item = mock_download_item_factory_->PopItem()) { 448 item = mock_download_item_factory_->PopItem()) {
422 EXPECT_CALL(*item, GetSafetyState()) 449 EXPECT_CALL(*item, GetSafetyState())
423 .WillOnce(Return(content::DownloadItem::SAFE)); 450 .WillOnce(Return(content::DownloadItem::SAFE));
424 EXPECT_CALL(*item, IsPartialDownload()) 451 EXPECT_CALL(*item, IsPartialDownload())
425 .WillOnce(Return(false)); 452 .WillOnce(Return(false));
426 } 453 }
427 EXPECT_CALL(GetMockObserver(), ManagerGoingDown(download_manager_.get())) 454 EXPECT_CALL(GetMockObserver(), ManagerGoingDown(download_manager_.get()))
428 .WillOnce(Return()); 455 .WillOnce(Return());
429 456
430 download_manager_->Shutdown(); 457 download_manager_->Shutdown();
431 download_manager_ = NULL; 458 download_manager_ = NULL;
432 message_loop_.RunAllPending(); 459 message_loop_.RunAllPending();
433 ASSERT_EQ(NULL, mock_download_item_factory_.get()); 460 ASSERT_EQ(NULL, mock_download_item_factory_.get());
434 message_loop_.RunAllPending(); 461 message_loop_.RunAllPending();
435 mock_download_manager_delegate_.reset(); 462 mock_download_manager_delegate_.reset();
463 mock_download_file_manager_ = NULL;
436 mock_browser_context_.reset(); 464 mock_browser_context_.reset();
437 } 465 }
438 466
439 // Returns download id. 467 // Returns download id.
440 MockDownloadItemImpl& AddItemToManager() { 468 MockDownloadItemImpl& AddItemToManager() {
441 DownloadCreateInfo info; 469 DownloadCreateInfo info;
442 470
443 static const char* kDownloadIdDomain = "Test download id domain"; 471 static const char* kDownloadIdDomain = "Test download id domain";
444 472
445 // Args are ignored except for download id, so everything else can be 473 // Args are ignored except for download id, so everything else can be
446 // null. 474 // null.
447 int id = next_download_id_; 475 int id = next_download_id_;
448 ++next_download_id_; 476 ++next_download_id_;
449 info.download_id = content::DownloadId(kDownloadIdDomain, id); 477 info.download_id = content::DownloadId(kDownloadIdDomain, id);
450 info.request_handle = DownloadRequestHandle(); 478 info.request_handle = DownloadRequestHandle();
451 EXPECT_CALL(GetMockObserver(), 479 download_manager_->CreateDownloadItem(&info);
452 OnDownloadCreated(download_manager_.get(), _));
453 download_manager_->CreateDownloadItem(&info, net::BoundNetLog());
454 480
455 DCHECK(mock_download_item_factory_->GetItem(id)); 481 DCHECK(mock_download_item_factory_->GetItem(id));
456 MockDownloadItemImpl& item(*mock_download_item_factory_->GetItem(id)); 482 MockDownloadItemImpl& item(*mock_download_item_factory_->GetItem(id));
457 // Satisfy expectation. If the item is created in StartDownload(), 483 ON_CALL(item, GetId())
458 // we call Start on it immediately, so we need to set that expectation 484 .WillByDefault(Return(id));
459 // in the factory.
460 item.Start(scoped_ptr<content::DownloadFile>());
461 485
462 return item; 486 return item;
463 } 487 }
464 488
465 MockDownloadItemImpl& GetMockDownloadItem(int id) { 489 MockDownloadItemImpl& GetMockDownloadItem(int id) {
466 MockDownloadItemImpl* itemp = mock_download_item_factory_->GetItem(id); 490 MockDownloadItemImpl* itemp = mock_download_item_factory_->GetItem(id);
467 491
468 DCHECK(itemp); 492 DCHECK(itemp);
469 return *itemp; 493 return *itemp;
470 } 494 }
471 495
472 void RemoveMockDownloadItem(int id) { 496 void RemoveMockDownloadItem(int id) {
473 // Owned by DownloadManager; should be deleted there. 497 // Owned by DownloadManager; should be deleted there.
474 mock_download_item_factory_->RemoveItem(id); 498 mock_download_item_factory_->RemoveItem(id);
475 } 499 }
476 500
477 MockDownloadManagerDelegate& GetMockDownloadManagerDelegate() { 501 MockDownloadManagerDelegate& GetMockDownloadManagerDelegate() {
478 return *mock_download_manager_delegate_; 502 return *mock_download_manager_delegate_;
479 } 503 }
480 504
505 MockDownloadFileManager& GetMockDownloadFileManager() {
506 return *mock_download_file_manager_;
507 }
508
481 MockDownloadManagerObserver& GetMockObserver() { 509 MockDownloadManagerObserver& GetMockObserver() {
482 return *observer_; 510 return *observer_;
483 } 511 }
484 512
485 // Probe at private internals. 513 // Probe at private internals.
486 void DownloadStopped(DownloadItemImpl* item) { 514 void DownloadStopped(DownloadItemImpl* item) {
487 download_manager_->DownloadStopped(item); 515 download_manager_->DownloadStopped(item);
488 } 516 }
489 517
490 void DelegateStart(DownloadItemImpl* item) {
491 download_manager_->DelegateStart(item);
492 }
493
494 void AddItemToHistory(MockDownloadItemImpl& item, int64 db_handle) { 518 void AddItemToHistory(MockDownloadItemImpl& item, int64 db_handle) {
495 // For DCHECK in AddDownloadItemToHistory. Don't want to use 519 // For DCHECK in AddDownloadItemToHistory. Don't want to use
496 // WillRepeatedly as it may have to return true after this. 520 // WillRepeatedly as it may have to return true after this.
497 if (DCHECK_IS_ON()) 521 if (DCHECK_IS_ON())
498 EXPECT_CALL(item, IsPersisted()) 522 EXPECT_CALL(item, IsPersisted())
499 .WillRepeatedly(Return(false)); 523 .WillRepeatedly(Return(false));
500 524
501 EXPECT_CALL(item, SetDbHandle(db_handle)); 525 EXPECT_CALL(item, SetDbHandle(db_handle));
502 EXPECT_CALL(item, SetIsPersisted()); 526 EXPECT_CALL(item, SetIsPersisted());
503 EXPECT_CALL(item, GetDbHandle()) 527 EXPECT_CALL(item, GetDbHandle())
(...skipping 19 matching lines...) Expand all
523 protected: 547 protected:
524 // Key test variable; we'll keep it available to sub-classes. 548 // Key test variable; we'll keep it available to sub-classes.
525 scoped_refptr<DownloadManagerImpl> download_manager_; 549 scoped_refptr<DownloadManagerImpl> download_manager_;
526 550
527 private: 551 private:
528 MessageLoopForUI message_loop_; 552 MessageLoopForUI message_loop_;
529 content::TestBrowserThread ui_thread_; 553 content::TestBrowserThread ui_thread_;
530 content::TestBrowserThread file_thread_; 554 content::TestBrowserThread file_thread_;
531 base::WeakPtr<MockDownloadItemFactory> mock_download_item_factory_; 555 base::WeakPtr<MockDownloadItemFactory> mock_download_item_factory_;
532 scoped_ptr<MockDownloadManagerDelegate> mock_download_manager_delegate_; 556 scoped_ptr<MockDownloadManagerDelegate> mock_download_manager_delegate_;
557 scoped_refptr<MockDownloadFileManager> mock_download_file_manager_;
533 scoped_ptr<MockBrowserContext> mock_browser_context_; 558 scoped_ptr<MockBrowserContext> mock_browser_context_;
534 scoped_ptr<MockDownloadManagerObserver> observer_; 559 scoped_ptr<MockDownloadManagerObserver> observer_;
535 int next_download_id_; 560 int next_download_id_;
536 561
537 DISALLOW_COPY_AND_ASSIGN(DownloadManagerTest); 562 DISALLOW_COPY_AND_ASSIGN(DownloadManagerTest);
538 }; 563 };
539 564
540 // Confirm the appropriate invocations occur when you start a download. 565 // Confirm the appropriate invocations occur when you start a download.
541 TEST_F(DownloadManagerTest, StartDownload) { 566 TEST_F(DownloadManagerTest, StartDownload) {
542 scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo); 567 scoped_ptr<DownloadCreateInfo> info(new DownloadCreateInfo);
543 scoped_ptr<content::ByteStreamReader> stream; 568 scoped_ptr<content::ByteStreamReader> stream;
544 int32 local_id(5); // Random value 569 int32 local_id(5); // Random value
545 570
546 EXPECT_FALSE(download_manager_->GetActiveDownloadItem(local_id)); 571 EXPECT_FALSE(download_manager_->GetActiveDownloadItem(local_id));
547 572
548 EXPECT_CALL(GetMockObserver(), OnDownloadCreated(download_manager_.get(), _)) 573 EXPECT_CALL(GetMockObserver(), OnDownloadCreated(download_manager_.get(), _))
549 .WillOnce(Return()); 574 .WillOnce(Return());
550 EXPECT_CALL(GetMockDownloadManagerDelegate(), GetNextId()) 575 EXPECT_CALL(GetMockDownloadManagerDelegate(), GetNextId())
551 .WillOnce(Return(content::DownloadId(this, local_id))); 576 .WillOnce(Return(content::DownloadId(this, local_id)));
552 EXPECT_CALL(GetMockDownloadManagerDelegate(), GenerateFileHash()) 577 EXPECT_CALL(GetMockDownloadManagerDelegate(), GenerateFileHash())
553 .WillOnce(Return(true)); 578 .WillOnce(Return(true));
579 EXPECT_CALL(GetMockDownloadFileManager(), MockCreateDownloadFile(
580 info.get(), static_cast<content::ByteStreamReader*>(NULL),
581 download_manager_.get(), true, _, _));
554 582
555 download_manager_->StartDownload(info.Pass(), stream.Pass()); 583 download_manager_->StartDownload(info.Pass(), stream.Pass());
556 EXPECT_TRUE(download_manager_->GetActiveDownloadItem(local_id)); 584 EXPECT_TRUE(download_manager_->GetActiveDownloadItem(local_id));
557 } 585 }
558 586
559 // Confirm that calling DelegateStart behaves properly if the delegate 587 // Do the results of an OnDownloadInterrupted get passed through properly
560 // blocks starting. 588 // to the DownloadItem?
561 TEST_F(DownloadManagerTest, DelegateStart_True) { 589 TEST_F(DownloadManagerTest, OnDownloadInterrupted) {
590 EXPECT_CALL(GetMockObserver(), OnDownloadCreated(download_manager_.get(), _))
591 .WillOnce(Return());
562 // Put a mock we have a handle to on the download manager. 592 // Put a mock we have a handle to on the download manager.
563 MockDownloadItemImpl& item(AddItemToManager()); 593 MockDownloadItemImpl& item(AddItemToManager());
594 int download_id = item.GetId();
564 595
565 EXPECT_CALL(GetMockDownloadManagerDelegate(), 596 content::DownloadInterruptReason reason(
566 DetermineDownloadTarget(&item, _)) 597 content::DOWNLOAD_INTERRUPT_REASON_FILE_FAILED);
567 .WillOnce(Return(true));
568 DelegateStart(&item);
569 }
570 598
571 // Confirm that calling DelegateStart behaves properly if the delegate 599 EXPECT_CALL(item, Interrupt(reason));
572 // allows starting. This also tests OnDownloadTargetDetermined. 600 download_manager_->OnDownloadInterrupted(download_id, reason);
573 TEST_F(DownloadManagerTest, DelegateStart_False) { 601 EXPECT_EQ(&item, download_manager_->GetActiveDownloadItem(download_id));
574 // Put a mock we have a handle to on the download manager.
575 MockDownloadItemImpl& item(AddItemToManager());
576
577 EXPECT_CALL(GetMockDownloadManagerDelegate(),
578 DetermineDownloadTarget(&item, _))
579 .WillOnce(Return(false));
580 EXPECT_CALL(item, OnDownloadTargetDetermined(
581 _, content::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
582 content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, _));
583 FilePath null_path;
584 EXPECT_CALL(item, GetForcedFilePath())
585 .WillOnce(ReturnRef(null_path));
586 DelegateStart(&item);
587 } 602 }
588 603
589 // Does DownloadStopped remove Download from appropriate queues? 604 // Does DownloadStopped remove Download from appropriate queues?
590 // This test tests non-persisted downloads. 605 // This test tests non-persisted downloads.
591 TEST_F(DownloadManagerTest, OnDownloadStopped_NonPersisted) { 606 TEST_F(DownloadManagerTest, OnDownloadStopped_NonPersisted) {
607 EXPECT_CALL(GetMockObserver(), OnDownloadCreated(download_manager_.get(), _))
608 .WillOnce(Return());
592 // Put a mock we have a handle to on the download manager. 609 // Put a mock we have a handle to on the download manager.
593 MockDownloadItemImpl& item(AddItemToManager()); 610 MockDownloadItemImpl& item(AddItemToManager());
594 611
595 EXPECT_CALL(item, IsPersisted()) 612 EXPECT_CALL(item, IsPersisted())
596 .WillRepeatedly(Return(false)); 613 .WillRepeatedly(Return(false));
597 EXPECT_CALL(item, GetState()) 614 EXPECT_CALL(item, GetState())
598 .WillRepeatedly(Return(DownloadItem::CANCELLED)); 615 .WillRepeatedly(Return(DownloadItem::CANCELLED));
599 EXPECT_CALL(item, GetDbHandle()) 616 EXPECT_CALL(item, GetDbHandle())
600 .WillRepeatedly(Return(DownloadItem::kUninitializedHandle)); 617 .WillRepeatedly(Return(DownloadItem::kUninitializedHandle));
601 618
619 EXPECT_CALL(item, OffThreadCancel());
602 DownloadStopped(&item); 620 DownloadStopped(&item);
603 // TODO(rdsmith): Confirm that the download item is no longer on the 621 // TODO(rdsmith): Confirm that the download item is no longer on the
604 // active list by calling download_manager_->GetActiveDownloadItem(id). 622 // active list by calling download_manager_->GetActiveDownloadItem(id).
605 // Currently, the item is left on the active list for rendez-vous with 623 // Currently, the item is left on the active list for rendez-vous with
606 // the history system :-{. 624 // the history system :-{.
607 } 625 }
608 626
609 // Does DownloadStopped remove Download from appropriate queues? 627 // Does DownloadStopped remove Download from appropriate queues?
610 // This test tests persisted downloads. 628 // This test tests persisted downloads.
611 TEST_F(DownloadManagerTest, OnDownloadStopped_Persisted) { 629 TEST_F(DownloadManagerTest, OnDownloadStopped_Persisted) {
630 EXPECT_CALL(GetMockObserver(), OnDownloadCreated(download_manager_.get(), _))
631 .WillOnce(Return());
612 // Put a mock we have a handle to on the download manager. 632 // Put a mock we have a handle to on the download manager.
613 MockDownloadItemImpl& item(AddItemToManager()); 633 MockDownloadItemImpl& item(AddItemToManager());
614 int download_id = item.GetId(); 634 int download_id = item.GetId();
615 int64 db_handle = 0x7; 635 int64 db_handle = 0x7;
616 EXPECT_CALL(GetMockObserver(), ModelChanged(download_manager_.get())) 636 EXPECT_CALL(GetMockObserver(), ModelChanged(download_manager_.get()))
617 .WillOnce(Return()); 637 .WillOnce(Return());
618 AddItemToHistory(item, db_handle); 638 AddItemToHistory(item, db_handle);
619 639
620 EXPECT_CALL(item, IsPersisted()) 640 EXPECT_CALL(item, IsPersisted())
621 .WillRepeatedly(Return(true)); 641 .WillRepeatedly(Return(true));
622 EXPECT_CALL(GetMockDownloadManagerDelegate(), 642 EXPECT_CALL(GetMockDownloadManagerDelegate(),
623 UpdateItemInPersistentStore(&item)); 643 UpdateItemInPersistentStore(&item));
624 EXPECT_CALL(item, GetState()) 644 EXPECT_CALL(item, GetState())
625 .WillRepeatedly(Return(DownloadItem::CANCELLED)); 645 .WillRepeatedly(Return(DownloadItem::CANCELLED));
626 EXPECT_CALL(item, GetDbHandle()) 646 EXPECT_CALL(item, GetDbHandle())
627 .WillRepeatedly(Return(db_handle)); 647 .WillRepeatedly(Return(db_handle));
628 648
649 EXPECT_CALL(item, OffThreadCancel());
629 DownloadStopped(&item); 650 DownloadStopped(&item);
630 EXPECT_EQ(NULL, download_manager_->GetActiveDownloadItem(download_id)); 651 EXPECT_EQ(NULL, download_manager_->GetActiveDownloadItem(download_id));
631 } 652 }
OLDNEW
« no previous file with comments | « content/browser/download/download_manager_impl.cc ('k') | content/browser/download/download_resource_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698