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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ios/web/web_state/favicon_callbacks_inttest.mm

Issue 2880723002: Favicon url is used only if it is valid (Closed)
Patch Set: Change the comment Created 3 years, 7 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
« no previous file with comments | « no previous file | ios/web/web_state/js/resources/common.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "base/memory/ptr_util.h" 5 #include "base/memory/ptr_util.h"
6 #include "ios/web/public/favicon_url.h" 6 #include "ios/web/public/favicon_url.h"
7 #import "ios/web/public/test/web_test_with_web_state.h" 7 #import "ios/web/public/test/web_test_with_web_state.h"
8 #include "ios/web/public/web_state/web_state_observer.h" 8 #include "ios/web/public/web_state/web_state_observer.h"
9 9
10 namespace web { 10 namespace web {
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, favicons[0].icon_type); 113 EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, favicons[0].icon_type);
114 ASSERT_TRUE(favicons[0].icon_sizes.empty()); 114 ASSERT_TRUE(favicons[0].icon_sizes.empty());
115 EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[1].icon_url); 115 EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[1].icon_url);
116 EXPECT_EQ(FaviconURL::FAVICON, favicons[1].icon_type); 116 EXPECT_EQ(FaviconURL::FAVICON, favicons[1].icon_type);
117 ASSERT_TRUE(favicons[1].icon_sizes.empty()); 117 ASSERT_TRUE(favicons[1].icon_sizes.empty());
118 }; 118 };
119 119
120 // Tests page without favicon link. 120 // Tests page without favicon link.
121 TEST_F(FaviconCallbackTest, NoFavicon) { 121 TEST_F(FaviconCallbackTest, NoFavicon) {
122 ASSERT_TRUE(observer_->favicon_url_candidates().empty()); 122 ASSERT_TRUE(observer_->favicon_url_candidates().empty());
123 LoadHtml(@"<html></html>", GURL("https://chromium.test")); 123 LoadHtml(@"<html></html>", GURL("https://chromium.test/test/test.html"));
124 124
125 WaitForCondition(^{ 125 WaitForCondition(^{
126 return observer_->favicon_url_updated(); 126 return observer_->favicon_url_updated();
127 }); 127 });
128 128
129 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates(); 129 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates();
130 ASSERT_EQ(1U, favicons.size()); 130 ASSERT_EQ(1U, favicons.size());
131 EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[0].icon_url); 131 EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[0].icon_url);
132 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type); 132 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type);
133 ASSERT_TRUE(favicons[0].icon_sizes.empty()); 133 ASSERT_TRUE(favicons[0].icon_sizes.empty());
(...skipping 23 matching lines...) Expand all
157 EXPECT_EQ(FaviconURL::TOUCH_ICON, favicons[2].icon_type); 157 EXPECT_EQ(FaviconURL::TOUCH_ICON, favicons[2].icon_type);
158 ASSERT_TRUE(favicons[2].icon_sizes.empty()); 158 ASSERT_TRUE(favicons[2].icon_sizes.empty());
159 EXPECT_EQ(GURL("http://fav3.ico"), favicons[3].icon_url); 159 EXPECT_EQ(GURL("http://fav3.ico"), favicons[3].icon_url);
160 EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, favicons[3].icon_type); 160 EXPECT_EQ(FaviconURL::TOUCH_PRECOMPOSED_ICON, favicons[3].icon_type);
161 ASSERT_TRUE(favicons[3].icon_sizes.empty()); 161 ASSERT_TRUE(favicons[3].icon_sizes.empty());
162 }; 162 };
163 163
164 // Tests page with invalid favicon url. 164 // Tests page with invalid favicon url.
165 TEST_F(FaviconCallbackTest, InvalidFaviconUrl) { 165 TEST_F(FaviconCallbackTest, InvalidFaviconUrl) {
166 ASSERT_TRUE(observer_->favicon_url_candidates().empty()); 166 ASSERT_TRUE(observer_->favicon_url_candidates().empty());
167 LoadHtml(@"<head><link rel='icon' href='http://'></head>"); 167 LoadHtml(@"<html><head><link rel='icon' href='http://'></head></html>",
168 GURL("https://chromium.test"));
168 169
169 WaitForCondition(^{ 170 WaitForCondition(^{
170 return observer_->favicon_url_updated(); 171 return observer_->favicon_url_updated();
171 }); 172 });
172 173
173 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates(); 174 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates();
174 ASSERT_EQ(1U, favicons.size()); 175 ASSERT_EQ(1U, favicons.size());
175 EXPECT_EQ("http:", favicons[0].icon_url.possibly_invalid_spec()); 176 EXPECT_EQ(GURL("https://chromium.test/favicon.ico"), favicons[0].icon_url);
176 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type); 177 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type);
177 ASSERT_TRUE(favicons[0].icon_sizes.empty()); 178 ASSERT_TRUE(favicons[0].icon_sizes.empty());
178 }; 179 };
179 180
180 // Tests page with empty favicon url. 181 // Tests page with empty favicon url.
181 TEST_F(FaviconCallbackTest, EmptyFaviconUrl) { 182 TEST_F(FaviconCallbackTest, EmptyFaviconUrl) {
182 ASSERT_TRUE(observer_->favicon_url_candidates().empty()); 183 ASSERT_TRUE(observer_->favicon_url_candidates().empty());
183 LoadHtml(@"<head><link rel='icon' href=''></head>"); 184 LoadHtml(@"<head><link rel='icon' href=''></head>");
184 185
185 WaitForCondition(^{ 186 WaitForCondition(^{
186 return observer_->favicon_url_updated(); 187 return observer_->favicon_url_updated();
187 }); 188 });
188 189
189 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates(); 190 const std::vector<FaviconURL>& favicons = observer_->favicon_url_candidates();
190 ASSERT_EQ(1U, favicons.size()); 191 ASSERT_EQ(1U, favicons.size());
191 // TODO(crbug.com/721852): This result is not correct. 192 // TODO(crbug.com/721852): This result is not correct.
192 EXPECT_EQ(GURL("https://chromium.test/"), favicons[0].icon_url); 193 EXPECT_EQ(GURL("https://chromium.test/"), favicons[0].icon_url);
193 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type); 194 EXPECT_EQ(FaviconURL::FAVICON, favicons[0].icon_type);
194 ASSERT_TRUE(favicons[0].icon_sizes.empty()); 195 ASSERT_TRUE(favicons[0].icon_sizes.empty());
195 }; 196 };
196 197
197 } // namespace web 198 } // namespace web
OLDNEW
« no previous file with comments | « no previous file | ios/web/web_state/js/resources/common.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698