bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NetworkService expectations for FrameTest.*Nav tests (see issue #2622).

This commit is contained in:
Marshall Greenblatt 2019-04-30 17:32:50 -04:00
parent 370cc028cb
commit fb0133cd4b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/ceftests/frame_unittest.cc
View File

@ -7,6 +7,7 @@
#include "include/wrapper/cef_closure_task.h" #include "include/wrapper/cef_closure_task.h"
#include "include/wrapper/cef_stream_resource_handler.h" #include "include/wrapper/cef_stream_resource_handler.h"
#include "tests/ceftests/test_handler.h" #include "tests/ceftests/test_handler.h"
#include "tests/ceftests/test_util.h"
#include "tests/gtest/include/gtest/gtest.h" #include "tests/gtest/include/gtest/gtest.h"
#include "tests/shared/browser/client_app_browser.h" #include "tests/shared/browser/client_app_browser.h"
#include "tests/shared/renderer/client_app_renderer.h" #include "tests/shared/renderer/client_app_renderer.h"
@ -864,10 +865,11 @@ bool VerifySingleBrowserFrame(CefRefPtr<CefBrowser> browser,
V_DECLARE(); V_DECLARE();
V_EXPECT_TRUE(frame.get()); V_EXPECT_TRUE(frame.get());
V_EXPECT_TRUE(frame->IsValid()); V_EXPECT_TRUE(frame->IsValid());
const int64 frame_id = frame->GetIdentifier();
if (frame_should_exist) { if (frame_should_exist) {
V_EXPECT_TRUE(frame->GetIdentifier() >= 0); V_EXPECT_TRUE(frame_id >= 0) << frame_id;
} else { } else {
V_EXPECT_TRUE(frame->GetIdentifier() == -4); // kInvalidFrameId V_EXPECT_TRUE(frame_id == -4) << frame_id; // kInvalidFrameId
} }
V_EXPECT_TRUE(frame->IsValid()); V_EXPECT_TRUE(frame->IsValid());
V_EXPECT_TRUE(frame->IsMain()); V_EXPECT_TRUE(frame->IsMain());
@ -1001,10 +1003,10 @@ class FrameNavExpectationsBrowserTestSingleNav
bool GetResourceHandler(CefRefPtr<CefBrowser> browser, bool GetResourceHandler(CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame) override { CefRefPtr<CefFrame> frame) override {
V_DECLARE(); V_DECLARE();
// When browser-side navigation is enabled this method will be called // When browser-side navigation is enabled, and NetworkService is disabled,
// before the frame is created. // this method will be called before the frame is created.
V_EXPECT_TRUE( V_EXPECT_TRUE(VerifySingleBrowserFrames(
VerifySingleBrowserFrames(browser, frame, false, std::string())); browser, frame, IsNetworkServiceEnabled(), std::string()));
V_EXPECT_TRUE(parent::GetResourceHandler(browser, frame)); V_EXPECT_TRUE(parent::GetResourceHandler(browser, frame));
V_RETURN(); V_RETURN();
} }
@ -1512,10 +1514,12 @@ class FrameNavExpectationsBrowserTestMultiNav
std::string expected_url; std::string expected_url;
if (nav() > 0) if (nav() > 0)
expected_url = GetPreviousMainURL(); expected_url = GetPreviousMainURL();
// When browser-side navigation is enabled this method will be called // When browser-side navigation is enabled, and NetworkService is disabled,
// before the frame is created for the first navigation. // this method will be called before the frame is created for the first
// navigation.
V_EXPECT_TRUE(VerifySingleBrowserFrames( V_EXPECT_TRUE(VerifySingleBrowserFrames(
browser, frame, nav() == 0 ? false : true, expected_url)); browser, frame, nav() == 0 ? IsNetworkServiceEnabled() : true,
expected_url));
V_EXPECT_TRUE(parent::GetResourceHandler(browser, frame)); V_EXPECT_TRUE(parent::GetResourceHandler(browser, frame));
V_RETURN(); V_RETURN();
} }