| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <string> |
| 6 |
| 5 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 6 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 7 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 8 #include "base/version.h" | 10 #include "base/version.h" |
| 9 #include "components/component_updater/component_updater_ping_manager.h" | 11 #include "components/component_updater/component_updater_ping_manager.h" |
| 10 #include "components/component_updater/crx_update_item.h" | 12 #include "components/component_updater/crx_update_item.h" |
| 11 #include "components/component_updater/test/test_configurator.h" | 13 #include "components/component_updater/test/test_configurator.h" |
| 12 #include "components/component_updater/test/url_request_post_interceptor.h" | 14 #include "components/component_updater/test/url_request_post_interceptor.h" |
| 13 #include "net/url_request/url_request_test_util.h" | 15 #include "net/url_request/url_request_test_util.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 16 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 CrxUpdateItem item; | 66 CrxUpdateItem item; |
| 65 item.id = "abc"; | 67 item.id = "abc"; |
| 66 item.status = CrxUpdateItem::kUpdated; | 68 item.status = CrxUpdateItem::kUpdated; |
| 67 item.previous_version = base::Version("1.0"); | 69 item.previous_version = base::Version("1.0"); |
| 68 item.next_version = base::Version("2.0"); | 70 item.next_version = base::Version("2.0"); |
| 69 | 71 |
| 70 ping_manager_->OnUpdateComplete(&item); | 72 ping_manager_->OnUpdateComplete(&item); |
| 71 base::RunLoop().RunUntilIdle(); | 73 base::RunLoop().RunUntilIdle(); |
| 72 | 74 |
| 73 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); | 75 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
| 74 EXPECT_NE(string::npos, | 76 EXPECT_NE(std::string::npos, |
| 75 interceptor->GetRequests()[0].find( | 77 interceptor->GetRequests()[0].find( |
| 76 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" | 78 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" |
| 77 "<event eventtype=\"3\" eventresult=\"1\"/></app>")) | 79 "<event eventtype=\"3\" eventresult=\"1\"/></app>")) |
| 78 << interceptor->GetRequestsAsString(); | 80 << interceptor->GetRequestsAsString(); |
| 79 interceptor->Reset(); | 81 interceptor->Reset(); |
| 80 | 82 |
| 81 // Test eventresult="0" is sent for failed updates. | 83 // Test eventresult="0" is sent for failed updates. |
| 82 item = CrxUpdateItem(); | 84 item = CrxUpdateItem(); |
| 83 item.id = "abc"; | 85 item.id = "abc"; |
| 84 item.status = CrxUpdateItem::kNoUpdate; | 86 item.status = CrxUpdateItem::kNoUpdate; |
| 85 item.previous_version = base::Version("1.0"); | 87 item.previous_version = base::Version("1.0"); |
| 86 item.next_version = base::Version("2.0"); | 88 item.next_version = base::Version("2.0"); |
| 87 | 89 |
| 88 ping_manager_->OnUpdateComplete(&item); | 90 ping_manager_->OnUpdateComplete(&item); |
| 89 base::RunLoop().RunUntilIdle(); | 91 base::RunLoop().RunUntilIdle(); |
| 90 | 92 |
| 91 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); | 93 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
| 92 EXPECT_NE(string::npos, | 94 EXPECT_NE(std::string::npos, |
| 93 interceptor->GetRequests()[0].find( | 95 interceptor->GetRequests()[0].find( |
| 94 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" | 96 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" |
| 95 "<event eventtype=\"3\" eventresult=\"0\"/></app>")) | 97 "<event eventtype=\"3\" eventresult=\"0\"/></app>")) |
| 96 << interceptor->GetRequestsAsString(); | 98 << interceptor->GetRequestsAsString(); |
| 97 interceptor->Reset(); | 99 interceptor->Reset(); |
| 98 | 100 |
| 99 // Test the error values and the fingerprints. | 101 // Test the error values and the fingerprints. |
| 100 item = CrxUpdateItem(); | 102 item = CrxUpdateItem(); |
| 101 item.id = "abc"; | 103 item.id = "abc"; |
| 102 item.status = CrxUpdateItem::kNoUpdate; | 104 item.status = CrxUpdateItem::kNoUpdate; |
| 103 item.previous_version = base::Version("1.0"); | 105 item.previous_version = base::Version("1.0"); |
| 104 item.next_version = base::Version("2.0"); | 106 item.next_version = base::Version("2.0"); |
| 105 item.previous_fp = "prev fp"; | 107 item.previous_fp = "prev fp"; |
| 106 item.next_fp = "next fp"; | 108 item.next_fp = "next fp"; |
| 107 item.error_category = 1; | 109 item.error_category = 1; |
| 108 item.error_code = 2; | 110 item.error_code = 2; |
| 109 item.extra_code1 = -1; | 111 item.extra_code1 = -1; |
| 110 item.diff_error_category = 10; | 112 item.diff_error_category = 10; |
| 111 item.diff_error_code = 20; | 113 item.diff_error_code = 20; |
| 112 item.diff_extra_code1 = -10; | 114 item.diff_extra_code1 = -10; |
| 113 item.diff_update_failed = true; | 115 item.diff_update_failed = true; |
| 114 item.crx_diffurls.push_back(GURL("http://host/path")); | 116 item.crx_diffurls.push_back(GURL("http://host/path")); |
| 115 | 117 |
| 116 ping_manager_->OnUpdateComplete(&item); | 118 ping_manager_->OnUpdateComplete(&item); |
| 117 base::RunLoop().RunUntilIdle(); | 119 base::RunLoop().RunUntilIdle(); |
| 118 | 120 |
| 119 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); | 121 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
| 120 EXPECT_NE(string::npos, | 122 EXPECT_NE(std::string::npos, |
| 121 interceptor->GetRequests()[0].find( | 123 interceptor->GetRequests()[0].find( |
| 122 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" | 124 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" |
| 123 "<event eventtype=\"3\" eventresult=\"0\" errorcat=\"1\" " | 125 "<event eventtype=\"3\" eventresult=\"0\" errorcat=\"1\" " |
| 124 "errorcode=\"2\" extracode1=\"-1\" diffresult=\"0\" " | 126 "errorcode=\"2\" extracode1=\"-1\" diffresult=\"0\" " |
| 125 "differrorcat=\"10\" " | 127 "differrorcat=\"10\" " |
| 126 "differrorcode=\"20\" diffextracode1=\"-10\" " | 128 "differrorcode=\"20\" diffextracode1=\"-10\" " |
| 127 "previousfp=\"prev fp\" nextfp=\"next fp\"/></app>")) | 129 "previousfp=\"prev fp\" nextfp=\"next fp\"/></app>")) |
| 128 << interceptor->GetRequestsAsString(); | 130 << interceptor->GetRequestsAsString(); |
| 129 interceptor->Reset(); | 131 interceptor->Reset(); |
| 130 | 132 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 151 download_metrics.downloaded_bytes = 1230; | 153 download_metrics.downloaded_bytes = 1230; |
| 152 download_metrics.total_bytes = 4560; | 154 download_metrics.total_bytes = 4560; |
| 153 download_metrics.download_time_ms = 9870; | 155 download_metrics.download_time_ms = 9870; |
| 154 item.download_metrics.push_back(download_metrics); | 156 item.download_metrics.push_back(download_metrics); |
| 155 | 157 |
| 156 ping_manager_->OnUpdateComplete(&item); | 158 ping_manager_->OnUpdateComplete(&item); |
| 157 base::RunLoop().RunUntilIdle(); | 159 base::RunLoop().RunUntilIdle(); |
| 158 | 160 |
| 159 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); | 161 EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
| 160 EXPECT_NE( | 162 EXPECT_NE( |
| 161 string::npos, | 163 std::string::npos, |
| 162 interceptor->GetRequests()[0].find( | 164 interceptor->GetRequests()[0].find( |
| 163 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" | 165 "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">" |
| 164 "<event eventtype=\"3\" eventresult=\"1\"/>" | 166 "<event eventtype=\"3\" eventresult=\"1\"/>" |
| 165 "<event eventtype=\"14\" eventresult=\"0\" downloader=\"direct\" " | 167 "<event eventtype=\"14\" eventresult=\"0\" downloader=\"direct\" " |
| 166 "errorcode=\"-1\" url=\"http://host1/path1\" downloaded=\"123\" " | 168 "errorcode=\"-1\" url=\"http://host1/path1\" downloaded=\"123\" " |
| 167 "total=\"456\" download_time_ms=\"987\"/>" | 169 "total=\"456\" download_time_ms=\"987\"/>" |
| 168 "<event eventtype=\"14\" eventresult=\"1\" downloader=\"bits\" " | 170 "<event eventtype=\"14\" eventresult=\"1\" downloader=\"bits\" " |
| 169 "url=\"http://host2/path2\" downloaded=\"1230\" total=\"4560\" " | 171 "url=\"http://host2/path2\" downloaded=\"1230\" total=\"4560\" " |
| 170 "download_time_ms=\"9870\"/></app>")) | 172 "download_time_ms=\"9870\"/></app>")) |
| 171 << interceptor->GetRequestsAsString(); | 173 << interceptor->GetRequestsAsString(); |
| 172 interceptor->Reset(); | 174 interceptor->Reset(); |
| 173 } | 175 } |
| 174 | 176 |
| 175 } // namespace component_updater | 177 } // namespace component_updater |
| OLD | NEW |