Skip to content

GitLab

T
tangled
Commit afe927cd authored by Eugene But's avatar Eugene But Committed by Commit Bot
Browse files
Options

Replace WaitForCondition with WaitUntilConditionOrTimeout. 

WaitForCondition is a wrapper around deprecated
base::test::ios::WaitUntilCondition, which uses DCHECK.

Bug: None
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I7a85ff395e2cb8edae9b56d4db7998d9c64ae475
Reviewed-on: https://chromium-review.googlesource.com/1053184
Commit-Queue: Kurt Horimoto <kkhorimoto@chromium.org>
Reviewed-by: default avatarKurt Horimoto <kkhorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557451}
parent 47df4b2c
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
ios/web/web_state/favicon_callbacks_inttest.mm
View file @ afe927cd
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/memory/ptr_util.h" #include "base/memory/ptr_util.h"
#import "ios/testing/wait_util.h"
#include "ios/web/public/favicon_url.h" #include "ios/web/public/favicon_url.h"
#import "ios/web/public/test/web_test_with_web_state.h" #import "ios/web/public/test/web_test_with_web_state.h"
#import "ios/web/public/web_state/web_state.h" #import "ios/web/public/web_state/web_state.h"
...@@ -13,6 +14,8 @@ ...@@ -13,6 +14,8 @@
#error "This file requires ARC support." #error "This file requires ARC support."
#endif #endif
using testing::WaitUntilConditionOrTimeout;
namespace web { namespace web {
namespace { namespace {
...@@ -73,9 +76,9 @@ TEST_F(FaviconCallbackTest, ShortcutIconFavicon) { ...@@ -73,9 +76,9 @@ TEST_F(FaviconCallbackTest, ShortcutIconFavicon) {
ASSERT_TRUE(observer()->favicon_url_candidates().empty()); ASSERT_TRUE(observer()->favicon_url_candidates().empty());
LoadHtml(@"<link rel='shortcut icon' href='http://fav.ico'>"); LoadHtml(@"<link rel='shortcut icon' href='http://fav.ico'>");
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -90,9 +93,9 @@ TEST_F(FaviconCallbackTest, IconFavicon) { ...@@ -90,9 +93,9 @@ TEST_F(FaviconCallbackTest, IconFavicon) {
ASSERT_TRUE(observer()->favicon_url_candidates().empty()); ASSERT_TRUE(observer()->favicon_url_candidates().empty());
LoadHtml(@"<link rel='icon' href='http://fav.ico'>"); LoadHtml(@"<link rel='icon' href='http://fav.ico'>");
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -108,9 +111,9 @@ TEST_F(FaviconCallbackTest, AppleTouchIconFavicon) { ...@@ -108,9 +111,9 @@ TEST_F(FaviconCallbackTest, AppleTouchIconFavicon) {
LoadHtml(@"<link rel='apple-touch-icon' href='http://fav.ico'>", LoadHtml(@"<link rel='apple-touch-icon' href='http://fav.ico'>",
GURL("https://chromium.test")); GURL("https://chromium.test"));
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -129,9 +132,9 @@ TEST_F(FaviconCallbackTest, AppleTouchIconPrecomposedFavicon) { ...@@ -129,9 +132,9 @@ TEST_F(FaviconCallbackTest, AppleTouchIconPrecomposedFavicon) {
LoadHtml(@"<link rel='apple-touch-icon-precomposed' href='http://fav.ico'>", LoadHtml(@"<link rel='apple-touch-icon-precomposed' href='http://fav.ico'>",
GURL("https://chromium.test")); GURL("https://chromium.test"));
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -149,9 +152,9 @@ TEST_F(FaviconCallbackTest, NoFavicon) { ...@@ -149,9 +152,9 @@ TEST_F(FaviconCallbackTest, NoFavicon) {
ASSERT_TRUE(observer()->favicon_url_candidates().empty()); ASSERT_TRUE(observer()->favicon_url_candidates().empty());
LoadHtml(@"<html></html>", GURL("https://chromium.test/test/test.html")); LoadHtml(@"<html></html>", GURL("https://chromium.test/test/test.html"));
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -167,9 +170,9 @@ TEST_F(FaviconCallbackTest, NoFaviconWithQuery) { ...@@ -167,9 +170,9 @@ TEST_F(FaviconCallbackTest, NoFaviconWithQuery) {
LoadHtml(@"<html></html>", LoadHtml(@"<html></html>",
GURL("https://chromium.test/test/test.html?q1#h1")); GURL("https://chromium.test/test/test.html?q1#h1"));
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -187,9 +190,9 @@ TEST_F(FaviconCallbackTest, MultipleFavicons) { ...@@ -187,9 +190,9 @@ TEST_F(FaviconCallbackTest, MultipleFavicons) {
"<link rel='apple-touch-icon' href='http://fav2.ico'>" "<link rel='apple-touch-icon' href='http://fav2.ico'>"
"<link rel='apple-touch-icon-precomposed' href='http://fav3.ico'>"); "<link rel='apple-touch-icon-precomposed' href='http://fav3.ico'>");
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -214,9 +217,9 @@ TEST_F(FaviconCallbackTest, InvalidFaviconUrl) { ...@@ -214,9 +217,9 @@ TEST_F(FaviconCallbackTest, InvalidFaviconUrl) {
LoadHtml(@"<html><head><link rel='icon' href='http://'></head></html>", LoadHtml(@"<html><head><link rel='icon' href='http://'></head></html>",
GURL("https://chromium.test")); GURL("https://chromium.test"));
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -231,9 +234,9 @@ TEST_F(FaviconCallbackTest, EmptyFaviconUrl) { ...@@ -231,9 +234,9 @@ TEST_F(FaviconCallbackTest, EmptyFaviconUrl) {
ASSERT_TRUE(observer()->favicon_url_candidates().empty()); ASSERT_TRUE(observer()->favicon_url_candidates().empty());
LoadHtml(@"<head><link rel='icon' href=''></head>"); LoadHtml(@"<head><link rel='icon' href=''></head>");
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
...@@ -251,9 +254,9 @@ TEST_F(FaviconCallbackTest, IconFaviconSizes) { ...@@ -251,9 +254,9 @@ TEST_F(FaviconCallbackTest, IconFaviconSizes) {
@"<link rel='icon' href='http://fav.ico' sizes='10x20 30x40'><link " @"<link rel='icon' href='http://fav.ico' sizes='10x20 30x40'><link "
@"rel='apple-touch-icon' href='http://fav2.ico' sizes='10x20 asdfx'>"); @"rel='apple-touch-icon' href='http://fav2.ico' sizes='10x20 asdfx'>");
WaitForCondition(^{ EXPECT_TRUE(WaitUntilConditionOrTimeout(testing::kWaitForActionTimeout, ^{
return observer()->favicon_url_updated(); return observer()->favicon_url_updated();
}); }));
const std::vector<FaviconURL>& favicons = const std::vector<FaviconURL>& favicons =
observer()->favicon_url_candidates(); observer()->favicon_url_candidates();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment