| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "components/offline_pages/background/request_queue.h" | 5 #include "components/offline_pages/background/request_queue.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/test/test_simple_task_runner.h" | 11 #include "base/test/test_simple_task_runner.h" |
| 12 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
| 13 #include "components/offline_pages/background/device_conditions.h" |
| 14 #include "components/offline_pages/background/offliner_policy.h" |
| 15 #include "components/offline_pages/background/request_coordinator.h" |
| 16 #include "components/offline_pages/background/request_coordinator_event_logger.h
" |
| 17 #include "components/offline_pages/background/request_notifier.h" |
| 13 #include "components/offline_pages/background/request_queue_in_memory_store.h" | 18 #include "components/offline_pages/background/request_queue_in_memory_store.h" |
| 14 #include "components/offline_pages/background/save_page_request.h" | 19 #include "components/offline_pages/background/save_page_request.h" |
| 15 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
| 16 | 21 |
| 17 namespace offline_pages { | 22 namespace offline_pages { |
| 18 | 23 |
| 19 using AddRequestResult = RequestQueue::AddRequestResult; | 24 using AddRequestResult = AddRequestResult; |
| 20 using GetRequestsResult = RequestQueue::GetRequestsResult; | 25 using GetRequestsResult = GetRequestsResult; |
| 21 using UpdateRequestResult = RequestQueue::UpdateRequestResult; | 26 using UpdateRequestResult = UpdateRequestResult; |
| 22 | 27 |
| 23 namespace { | 28 namespace { |
| 24 // Data for request 1. | 29 // Data for request 1. |
| 25 const int64_t kRequestId = 42; | 30 const int64_t kRequestId = 42; |
| 26 const GURL kUrl("http://example.com"); | 31 const GURL kUrl("http://example.com"); |
| 27 const ClientId kClientId("bookmark", "1234"); | 32 const ClientId kClientId("bookmark", "1234"); |
| 28 // Data for request 2. | 33 // Data for request 2. |
| 29 const int64_t kRequestId2 = 77; | 34 const int64_t kRequestId2 = 77; |
| 30 const GURL kUrl2("http://test.com"); | 35 const GURL kUrl2("http://test.com"); |
| 31 const ClientId kClientId2("bookmark", "567"); | 36 const ClientId kClientId2("bookmark", "567"); |
| 32 const bool kUserRequested = true; | 37 const bool kUserRequested = true; |
| 33 const int64_t kRequestId3 = 99; | 38 const int64_t kRequestId3 = 99; |
| 39 const int kOneWeekInSeconds = 7 * 24 * 60 * 60; |
| 40 |
| 41 // Default request |
| 42 const SavePageRequest kEmptyRequest(0UL, |
| 43 GURL(""), |
| 44 ClientId("", ""), |
| 45 base::Time(), |
| 46 true); |
| 47 |
| 34 } // namespace | 48 } // namespace |
| 35 | 49 |
| 50 // Helper class needed by the PickRequestTask |
| 51 class RequestNotifierStub : public RequestNotifier { |
| 52 public: |
| 53 RequestNotifierStub() |
| 54 : last_expired_request_(kEmptyRequest), total_expired_requests_(0) {} |
| 55 |
| 56 void NotifyAdded(const SavePageRequest& request) override {} |
| 57 void NotifyChanged(const SavePageRequest& request) override {} |
| 58 |
| 59 void NotifyCompleted(const SavePageRequest& request, |
| 60 BackgroundSavePageResult status) override { |
| 61 last_expired_request_ = request; |
| 62 last_request_expiration_status_ = status; |
| 63 total_expired_requests_++; |
| 64 } |
| 65 |
| 66 const SavePageRequest& last_expired_request() { |
| 67 return last_expired_request_; |
| 68 } |
| 69 |
| 70 RequestCoordinator::BackgroundSavePageResult |
| 71 last_request_expiration_status() { |
| 72 return last_request_expiration_status_; |
| 73 } |
| 74 |
| 75 int32_t total_expired_requests() { return total_expired_requests_; } |
| 76 |
| 77 private: |
| 78 BackgroundSavePageResult last_request_expiration_status_; |
| 79 SavePageRequest last_expired_request_; |
| 80 int32_t total_expired_requests_; |
| 81 }; |
| 82 |
| 36 // TODO(fgorski): Add tests for store failures in add/remove/get. | 83 // TODO(fgorski): Add tests for store failures in add/remove/get. |
| 37 class RequestQueueTest : public testing::Test { | 84 class RequestQueueTest : public testing::Test { |
| 38 public: | 85 public: |
| 39 RequestQueueTest(); | 86 RequestQueueTest(); |
| 40 ~RequestQueueTest() override; | 87 ~RequestQueueTest() override; |
| 41 | 88 |
| 42 // Test overrides. | 89 // Test overrides. |
| 43 void SetUp() override; | 90 void SetUp() override; |
| 44 | 91 |
| 45 void PumpLoop(); | 92 void PumpLoop(); |
| (...skipping 23 matching lines...) Expand all Loading... |
| 69 } | 116 } |
| 70 | 117 |
| 71 const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const { | 118 const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const { |
| 72 return last_requests_; | 119 return last_requests_; |
| 73 } | 120 } |
| 74 | 121 |
| 75 UpdateRequestsResult* update_requests_result() const { | 122 UpdateRequestsResult* update_requests_result() const { |
| 76 return update_requests_result_.get(); | 123 return update_requests_result_.get(); |
| 77 } | 124 } |
| 78 | 125 |
| 126 void RequestPickedCallback(const SavePageRequest& request) {} |
| 127 void RequestNotPickedCallback(bool non_user_requested_tasks_remain) {} |
| 128 |
| 79 private: | 129 private: |
| 80 AddRequestResult last_add_result_; | 130 AddRequestResult last_add_result_; |
| 81 std::unique_ptr<SavePageRequest> last_added_request_; | 131 std::unique_ptr<SavePageRequest> last_added_request_; |
| 82 std::unique_ptr<UpdateRequestsResult> update_requests_result_; | 132 std::unique_ptr<UpdateRequestsResult> update_requests_result_; |
| 83 UpdateRequestResult last_update_result_; | 133 UpdateRequestResult last_update_result_; |
| 84 | 134 |
| 85 GetRequestsResult last_get_requests_result_; | 135 GetRequestsResult last_get_requests_result_; |
| 86 std::vector<std::unique_ptr<SavePageRequest>> last_requests_; | 136 std::vector<std::unique_ptr<SavePageRequest>> last_requests_; |
| 87 | 137 |
| 88 std::unique_ptr<RequestQueue> queue_; | 138 std::unique_ptr<RequestQueue> queue_; |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 477 ASSERT_TRUE(update_requests_result()); | 527 ASSERT_TRUE(update_requests_result()); |
| 478 EXPECT_EQ(1UL, update_requests_result()->item_statuses.size()); | 528 EXPECT_EQ(1UL, update_requests_result()->item_statuses.size()); |
| 479 EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first); | 529 EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first); |
| 480 EXPECT_EQ(ItemActionStatus::SUCCESS, | 530 EXPECT_EQ(ItemActionStatus::SUCCESS, |
| 481 update_requests_result()->item_statuses.at(0).second); | 531 update_requests_result()->item_statuses.at(0).second); |
| 482 EXPECT_EQ(1UL, update_requests_result()->updated_items.size()); | 532 EXPECT_EQ(1UL, update_requests_result()->updated_items.size()); |
| 483 EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, | 533 EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, |
| 484 update_requests_result()->updated_items.at(0).request_state()); | 534 update_requests_result()->updated_items.at(0).request_state()); |
| 485 } | 535 } |
| 486 | 536 |
| 537 // Request expiration is detected during the call to pick a request, which |
| 538 // is why this test calls PickNextRequest(). |
| 539 TEST_F(RequestQueueTest, CleanStaleRequests) { |
| 540 // Create a request that is already expired. |
| 541 base::Time creation_time = |
| 542 base::Time::Now() - base::TimeDelta::FromSeconds(2 * kOneWeekInSeconds); |
| 543 |
| 544 SavePageRequest original_request(kRequestId, kUrl, kClientId, creation_time, |
| 545 kUserRequested); |
| 546 queue()->AddRequest( |
| 547 original_request, |
| 548 base::Bind(&RequestQueueTest::AddRequestDone, base::Unretained(this))); |
| 549 this->PumpLoop(); |
| 550 this->ClearResults(); |
| 551 |
| 552 // Set up a picker factory pointing to our fake notifier. |
| 553 OfflinerPolicy policy; |
| 554 RequestNotifierStub notifier; |
| 555 RequestCoordinatorEventLogger event_logger; |
| 556 std::unique_ptr<PickRequestTaskFactory> picker_factory( |
| 557 new PickRequestTaskFactory(&policy, ¬ifier, &event_logger)); |
| 558 queue()->SetPickerFactory(std::move(picker_factory)); |
| 559 |
| 560 // Do a pick and clean operation, which will remove stale entries. |
| 561 DeviceConditions conditions; |
| 562 std::set<int64_t> disabled_list; |
| 563 queue()->PickNextRequest( |
| 564 base::Bind(&RequestQueueTest::RequestPickedCallback, |
| 565 base::Unretained(this)), |
| 566 base::Bind(&RequestQueueTest::RequestNotPickedCallback, |
| 567 base::Unretained(this)), |
| 568 conditions, disabled_list); |
| 569 |
| 570 this->PumpLoop(); |
| 571 |
| 572 // Notifier should have been notified that the request was removed. |
| 573 ASSERT_EQ(notifier.last_expired_request().request_id(), kRequestId); |
| 574 ASSERT_EQ(notifier.last_request_expiration_status(), |
| 575 RequestNotifier::BackgroundSavePageResult::EXPIRED); |
| 576 |
| 577 // Doing a get should show no entries left in the queue since the expired |
| 578 // request has been removed. |
| 579 queue()->GetRequests( |
| 580 base::Bind(&RequestQueueTest::GetRequestsDone, base::Unretained(this))); |
| 581 this->PumpLoop(); |
| 582 ASSERT_EQ(GetRequestsResult::SUCCESS, this->last_get_requests_result()); |
| 583 ASSERT_TRUE(this->last_requests().empty()); |
| 584 } |
| 585 |
| 487 } // namespace offline_pages | 586 } // namespace offline_pages |
| OLD | NEW |