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

Side by Side Diff: components/offline_pages/background/request_queue_unittest.cc

Issue 2473553004: Request Picker task (Closed)
Patch Set: CR fixes per DougArnett 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
OLDNEW
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/request_queue_in_memory_store.h" 13 #include "components/offline_pages/background/request_queue_in_memory_store.h"
14 #include "components/offline_pages/background/save_page_request.h" 14 #include "components/offline_pages/background/save_page_request.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace offline_pages { 17 namespace offline_pages {
18 18
19 using AddRequestResult = RequestQueue::AddRequestResult; 19 using AddRequestResult = QueueResults::AddRequestResult;
20 using GetRequestsResult = RequestQueue::GetRequestsResult; 20 using GetRequestsResult = QueueResults::GetRequestsResult;
21 using UpdateRequestResult = RequestQueue::UpdateRequestResult; 21 using UpdateRequestResult = QueueResults::UpdateRequestResult;
22 22
23 namespace { 23 namespace {
24 // Data for request 1. 24 // Data for request 1.
25 const int64_t kRequestId = 42; 25 const int64_t kRequestId = 42;
26 const GURL kUrl("http://example.com"); 26 const GURL kUrl("http://example.com");
27 const ClientId kClientId("bookmark", "1234"); 27 const ClientId kClientId("bookmark", "1234");
28 // Data for request 2. 28 // Data for request 2.
29 const int64_t kRequestId2 = 77; 29 const int64_t kRequestId2 = 77;
30 const GURL kUrl2("http://test.com"); 30 const GURL kUrl2("http://test.com");
31 const ClientId kClientId2("bookmark", "567"); 31 const ClientId kClientId2("bookmark", "567");
(...skipping 12 matching lines...) Expand all
44 44
45 void PumpLoop(); 45 void PumpLoop();
46 46
47 // Callback for adding requests. 47 // Callback for adding requests.
48 void AddRequestDone(AddRequestResult result, const SavePageRequest& request); 48 void AddRequestDone(AddRequestResult result, const SavePageRequest& request);
49 // Callback for getting requests. 49 // Callback for getting requests.
50 void GetRequestsDone(GetRequestsResult result, 50 void GetRequestsDone(GetRequestsResult result,
51 std::vector<std::unique_ptr<SavePageRequest>> requests); 51 std::vector<std::unique_ptr<SavePageRequest>> requests);
52 52
53 void UpdateRequestDone(UpdateRequestResult result); 53 void UpdateRequestDone(UpdateRequestResult result);
54 void UpdateRequestsDone(std::unique_ptr<UpdateRequestsResult> result); 54 void UpdateRequestsDone(
55 std::unique_ptr<QueueResults::UpdateRequestsResult> result);
55 56
56 void ClearResults(); 57 void ClearResults();
57 58
58 RequestQueue* queue() { return queue_.get(); } 59 RequestQueue* queue() { return queue_.get(); }
59 60
60 AddRequestResult last_add_result() const { return last_add_result_; } 61 AddRequestResult last_add_result() const { return last_add_result_; }
61 SavePageRequest* last_added_request() { 62 SavePageRequest* last_added_request() {
62 return last_added_request_.get(); 63 return last_added_request_.get();
63 } 64 }
64 65
65 UpdateRequestResult last_update_result() const { return last_update_result_; } 66 UpdateRequestResult last_update_result() const { return last_update_result_; }
66 67
67 GetRequestsResult last_get_requests_result() const { 68 GetRequestsResult last_get_requests_result() const {
68 return last_get_requests_result_; 69 return last_get_requests_result_;
69 } 70 }
70 71
71 const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const { 72 const std::vector<std::unique_ptr<SavePageRequest>>& last_requests() const {
72 return last_requests_; 73 return last_requests_;
73 } 74 }
74 75
75 UpdateRequestsResult* update_requests_result() const { 76 QueueResults::UpdateRequestsResult* update_requests_result() const {
76 return update_requests_result_.get(); 77 return update_requests_result_.get();
77 } 78 }
78 79
79 private: 80 private:
80 AddRequestResult last_add_result_; 81 AddRequestResult last_add_result_;
81 std::unique_ptr<SavePageRequest> last_added_request_; 82 std::unique_ptr<SavePageRequest> last_added_request_;
82 std::unique_ptr<UpdateRequestsResult> update_requests_result_; 83 std::unique_ptr<QueueResults::UpdateRequestsResult> update_requests_result_;
83 UpdateRequestResult last_update_result_; 84 UpdateRequestResult last_update_result_;
84 85
85 GetRequestsResult last_get_requests_result_; 86 GetRequestsResult last_get_requests_result_;
86 std::vector<std::unique_ptr<SavePageRequest>> last_requests_; 87 std::vector<std::unique_ptr<SavePageRequest>> last_requests_;
87 88
88 std::unique_ptr<RequestQueue> queue_; 89 std::unique_ptr<RequestQueue> queue_;
89 scoped_refptr<base::TestSimpleTaskRunner> task_runner_; 90 scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
90 base::ThreadTaskRunnerHandle task_runner_handle_; 91 base::ThreadTaskRunnerHandle task_runner_handle_;
91 }; 92 };
92 93
(...skipping 27 matching lines...) Expand all
120 std::vector<std::unique_ptr<SavePageRequest>> requests) { 121 std::vector<std::unique_ptr<SavePageRequest>> requests) {
121 last_get_requests_result_ = result; 122 last_get_requests_result_ = result;
122 last_requests_ = std::move(requests); 123 last_requests_ = std::move(requests);
123 } 124 }
124 125
125 void RequestQueueTest::UpdateRequestDone(UpdateRequestResult result) { 126 void RequestQueueTest::UpdateRequestDone(UpdateRequestResult result) {
126 last_update_result_ = result; 127 last_update_result_ = result;
127 } 128 }
128 129
129 void RequestQueueTest::UpdateRequestsDone( 130 void RequestQueueTest::UpdateRequestsDone(
130 std::unique_ptr<UpdateRequestsResult> result) { 131 std::unique_ptr<QueueResults::UpdateRequestsResult> result) {
131 update_requests_result_ = std::move(result); 132 update_requests_result_ = std::move(result);
132 } 133 }
133 134
134 void RequestQueueTest::ClearResults() { 135 void RequestQueueTest::ClearResults() {
135 last_add_result_ = AddRequestResult::STORE_FAILURE; 136 last_add_result_ = AddRequestResult::STORE_FAILURE;
136 last_update_result_ = UpdateRequestResult::STORE_FAILURE; 137 last_update_result_ = UpdateRequestResult::STORE_FAILURE;
137 last_get_requests_result_ = GetRequestsResult::STORE_FAILURE; 138 last_get_requests_result_ = GetRequestsResult::STORE_FAILURE;
138 last_added_request_.reset(nullptr); 139 last_added_request_.reset(nullptr);
139 update_requests_result_.reset(nullptr); 140 update_requests_result_.reset(nullptr);
140 last_requests_.clear(); 141 last_requests_.clear();
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 EXPECT_EQ(1UL, update_requests_result()->item_statuses.size()); 479 EXPECT_EQ(1UL, update_requests_result()->item_statuses.size());
479 EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first); 480 EXPECT_EQ(kRequestId, update_requests_result()->item_statuses.at(0).first);
480 EXPECT_EQ(ItemActionStatus::SUCCESS, 481 EXPECT_EQ(ItemActionStatus::SUCCESS,
481 update_requests_result()->item_statuses.at(0).second); 482 update_requests_result()->item_statuses.at(0).second);
482 EXPECT_EQ(1UL, update_requests_result()->updated_items.size()); 483 EXPECT_EQ(1UL, update_requests_result()->updated_items.size());
483 EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE, 484 EXPECT_EQ(SavePageRequest::RequestState::AVAILABLE,
484 update_requests_result()->updated_items.at(0).request_state()); 485 update_requests_result()->updated_items.at(0).request_state());
485 } 486 }
486 487
487 } // namespace offline_pages 488 } // namespace offline_pages
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698