bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix NetworkService expectations for NavigationTest.Redirect* tests (see issue #2622).

Browse Source
This commit is contained in:
Marshall Greenblatt
2019-04-30 17:54:17 -04:00
parent fb0133cd4b
commit 0193a3fe54
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/ceftests/navigation_unittest.cc
View File

@@ -893,9 +893,16 @@ class RedirectTestHandler : public TestHandler {
// Called due to the nav3 redirect response. // Called due to the nav3 redirect response.
got_nav3_redirect_.yes(); got_nav3_redirect_.yes();
if (IsNetworkServiceEnabled()) {
EXPECT_EQ(307, response->GetStatus());
EXPECT_STREQ("Temporary Redirect",
response->GetStatusText().ToString().c_str());
EXPECT_STREQ("", response->GetMimeType().ToString().c_str());
} else {
EXPECT_EQ(303, response->GetStatus()); EXPECT_EQ(303, response->GetStatus());
EXPECT_STREQ("See Other", response->GetStatusText().ToString().c_str()); EXPECT_STREQ("See Other", response->GetStatusText().ToString().c_str());
EXPECT_STREQ("text/html", response->GetMimeType().ToString().c_str()); EXPECT_STREQ("text/html", response->GetMimeType().ToString().c_str());
}
} else { } else {
got_invalid_redirect_.yes(); got_invalid_redirect_.yes();
} }
@@ -1005,7 +1012,12 @@ TEST(NavigationTest, Redirect) {
ASSERT_TRUE(handler->got_nav4_load_end_); ASSERT_TRUE(handler->got_nav4_load_end_);
ASSERT_FALSE(handler->got_invalid_load_end_); ASSERT_FALSE(handler->got_invalid_load_end_);
ASSERT_TRUE(handler->got_nav1_redirect_); ASSERT_TRUE(handler->got_nav1_redirect_);
if (IsNetworkServiceEnabled()) {
ASSERT_FALSE(handler->got_nav2_redirect_);
} else {
// This seems like a bug in the old network implementation.
ASSERT_TRUE(handler->got_nav2_redirect_); ASSERT_TRUE(handler->got_nav2_redirect_);
}
ASSERT_TRUE(handler->got_nav3_redirect_); ASSERT_TRUE(handler->got_nav3_redirect_);
ASSERT_FALSE(handler->got_invalid_redirect_); ASSERT_FALSE(handler->got_invalid_redirect_);
ASSERT_TRUE(g_got_nav1_request); ASSERT_TRUE(g_got_nav1_request);