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

Don't leak the V8 unit test setup into other tests. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@960 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-12-22 16:55:25 +00:00
parent 991a513473
commit 0605b8e8fd
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/unittests/v8_unittest.cc
View File

@ -1662,6 +1662,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefV8Context> context) OVERRIDE { CefRefPtr<CefV8Context> context) OVERRIDE {
if (test_mode_ == V8TEST_NONE)
return;
if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) { if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
if (browser_.get() == NULL) { if (browser_.get() == NULL) {
app_ = app; app_ = app;
@ -1742,6 +1745,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
CefRefPtr<CefBrowser> browser, CefRefPtr<CefBrowser> browser,
CefRefPtr<CefFrame> frame, CefRefPtr<CefFrame> frame,
CefRefPtr<CefV8Context> context) OVERRIDE { CefRefPtr<CefV8Context> context) OVERRIDE {
if (test_mode_ == V8TEST_NONE)
return;
if (test_mode_ == V8TEST_CONTEXT_INVALID && if (test_mode_ == V8TEST_CONTEXT_INVALID &&
frame->GetURL().ToString() != kV8NavTestUrl) { frame->GetURL().ToString() != kV8NavTestUrl) {
test_context_ = test_context_ =
@ -1754,6 +1760,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
virtual void OnBrowserDestroyed(CefRefPtr<ClientApp> app, virtual void OnBrowserDestroyed(CefRefPtr<ClientApp> app,
CefRefPtr<CefBrowser> browser) OVERRIDE { CefRefPtr<CefBrowser> browser) OVERRIDE {
if (test_mode_ == V8TEST_NONE)
return;
if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) { if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
if (browser->IsPopup()) { if (browser->IsPopup()) {
// After window destruction there is still a call to // After window destruction there is still a call to
@ -1770,6 +1779,9 @@ class V8RendererTest : public ClientApp::RenderDelegate {
CefProcessId source_process, CefProcessId source_process,
CefRefPtr<CefProcessMessage> message) CefRefPtr<CefProcessMessage> message)
OVERRIDE { OVERRIDE {
if (test_mode_ == V8TEST_NONE)
return false;
if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) { if (test_mode_ == V8TEST_ON_UNCAUGHT_EXCEPTION_DEV_TOOLS) {
EXPECT_TRUE(browser.get()); EXPECT_TRUE(browser.get());
EXPECT_EQ(PID_BROWSER, source_process); EXPECT_EQ(PID_BROWSER, source_process);