Chromium Code Reviews| 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/save_page_request.h" | 5 #include "components/offline_pages/background/save_page_request.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 | 8 |
| 9 namespace offline_pages { | 9 namespace offline_pages { |
| 10 | 10 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 85 | 85 |
| 86 request.MarkAttemptCompleted(); | 86 request.MarkAttemptCompleted(); |
| 87 | 87 |
| 88 // Again, most things don't change about the request. | 88 // Again, most things don't change about the request. |
| 89 ASSERT_EQ(kRequestId, request.request_id()); | 89 ASSERT_EQ(kRequestId, request.request_id()); |
| 90 ASSERT_EQ(kUrl, request.url()); | 90 ASSERT_EQ(kUrl, request.url()); |
| 91 ASSERT_EQ(kClientId, request.client_id()); | 91 ASSERT_EQ(kClientId, request.client_id()); |
| 92 ASSERT_EQ(creation_time, request.creation_time()); | 92 ASSERT_EQ(creation_time, request.creation_time()); |
| 93 ASSERT_EQ(activation_time, request.activation_time()); | 93 ASSERT_EQ(activation_time, request.activation_time()); |
| 94 | 94 |
| 95 // Last attempt time, status and attempt count are updated. | 95 // Last attempt time and status are updated. |
|
Pete Williamson
2016/08/03 20:44:56
Should we have kept attempt count instead of statu
dougarnett
2016/08/03 23:33:51
Not sure what you mean. Also, my change here is on
Pete Williamson
2016/08/04 00:17:14
Right, the comment says "last attempt time and sta
dougarnett
2016/08/04 00:23:35
but the count is not updated here - still 1 as in
Pete Williamson
2016/08/04 00:27:16
Ah, nevermind, I saw the line checking the count,
| |
| 96 ASSERT_EQ(base::Time(), request.last_attempt_time()); | 96 ASSERT_EQ(base::Time(), request.last_attempt_time()); |
| 97 ASSERT_EQ(1, request.attempt_count()); | 97 ASSERT_EQ(1, request.attempt_count()); |
| 98 ASSERT_EQ(SavePageRequest::Status::PENDING, request.GetStatus(start_time)); | 98 ASSERT_EQ(SavePageRequest::Status::PENDING, request.GetStatus(start_time)); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // offline_pages | 101 TEST_F(SavePageRequestTest, StartAndAbortRequest) { |
| 102 base::Time creation_time = base::Time::Now(); | |
| 103 base::Time activation_time = creation_time + base::TimeDelta::FromHours(6); | |
|
Pete Williamson
2016/08/03 20:44:56
Why are we setting activation_time to anything oth
dougarnett
2016/08/03 23:33:51
Done.
| |
| 104 SavePageRequest request(kRequestId, kUrl, kClientId, creation_time, | |
| 105 activation_time, kUserRequested); | |
| 106 int start_attempt_count = 2; | |
| 107 request.set_attempt_count(start_attempt_count); | |
| 108 | |
| 109 base::Time start_time = activation_time + base::TimeDelta::FromHours(3); | |
| 110 request.MarkAttemptStarted(start_time); | |
| 111 | |
| 112 // Most things don't change about the request. | |
| 113 ASSERT_EQ(kRequestId, request.request_id()); | |
| 114 ASSERT_EQ(kUrl, request.url()); | |
| 115 ASSERT_EQ(kClientId, request.client_id()); | |
| 116 ASSERT_EQ(creation_time, request.creation_time()); | |
| 117 ASSERT_EQ(activation_time, request.activation_time()); | |
| 118 | |
| 119 // Attempt time and attempt count will though. | |
| 120 ASSERT_EQ(start_time, request.last_attempt_time()); | |
| 121 ASSERT_EQ(start_attempt_count + 1, request.attempt_count()); | |
| 122 | |
| 123 request.MarkAttemptAborted(); | |
| 124 | |
| 125 // Again, most things don't change about the request. | |
| 126 ASSERT_EQ(kRequestId, request.request_id()); | |
| 127 ASSERT_EQ(kUrl, request.url()); | |
| 128 ASSERT_EQ(kClientId, request.client_id()); | |
| 129 ASSERT_EQ(creation_time, request.creation_time()); | |
| 130 ASSERT_EQ(activation_time, request.activation_time()); | |
| 131 | |
| 132 // Last attempt time is updated and attempt count decremented. | |
| 133 ASSERT_EQ(base::Time(), request.last_attempt_time()); | |
| 134 ASSERT_EQ(start_attempt_count, request.attempt_count()); | |
| 135 } | |
| 136 | |
| 137 } // namespace offline_pages | |
| OLD | NEW |