diff options
author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 05:36:04 +0000 |
---|---|---|
committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-08 05:36:04 +0000 |
commit | 812b3a3ee935e0398382eb5e112dd93f6df9510c (patch) | |
tree | 3d4df126a2c5d828b834bb5f78c5998f621a0148 /chrome | |
parent | b9289a192e590565ae012fd6f613fd1c1a7b244a (diff) | |
download | chromium_src-812b3a3ee935e0398382eb5e112dd93f6df9510c.zip chromium_src-812b3a3ee935e0398382eb5e112dd93f6df9510c.tar.gz chromium_src-812b3a3ee935e0398382eb5e112dd93f6df9510c.tar.bz2 |
Move code duplicated in two tests up into the TestingProfile.
Move TestURLRequestContextGetter and friends from CookieTreeModelTest and
CookiesWindowControllerTest into TestingProfile. In the TestingProfile, return
a valid CookieMonster and URLRequstContextGetter, if CreateRequestContext() is
called.
Original CL: http://codereview.chromium.org/525072/show
BUG=None
TEST=Covered by unit tests
Review URL: http://codereview.chromium.org/525106
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35776 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/cocoa/cookies_window_controller_unittest.mm | 74 | ||||
-rw-r--r-- | chrome/browser/cookies_tree_model_unittest.cc | 42 | ||||
-rw-r--r-- | chrome/test/testing_profile.cc | 40 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 30 |
4 files changed, 94 insertions, 92 deletions
diff --git a/chrome/browser/cocoa/cookies_window_controller_unittest.mm b/chrome/browser/cocoa/cookies_window_controller_unittest.mm index 0071ff1..38b278d 100644 --- a/chrome/browser/cocoa/cookies_window_controller_unittest.mm +++ b/chrome/browser/cocoa/cookies_window_controller_unittest.mm @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -7,6 +7,7 @@ #include "app/tree_model.h" #import "base/scoped_nsobject.h" #include "base/scoped_ptr.h" +#include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cookies_window_controller.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "chrome/browser/net/url_request_context_getter.h" @@ -53,50 +54,16 @@ } @end -// Copied from src/chrome/cookies_tree_model_unittest.cc. namespace { -class TestURLRequestContext : public URLRequestContext { - public: - TestURLRequestContext() { - cookie_store_ = new net::CookieMonster(); - } -}; - -class TestURLRequestContextGetter : public URLRequestContextGetter { - public: - virtual URLRequestContext* GetURLRequestContext() { - if (!context_) - context_ = new TestURLRequestContext(); - return context_.get(); - } - private: - scoped_refptr<URLRequestContext> context_; -}; - -class CookieTestingProfile : public TestingProfile { - public: - virtual URLRequestContextGetter* GetRequestContext() { - if (!url_request_context_getter_.get()) - url_request_context_getter_ = new TestURLRequestContextGetter(); - return url_request_context_getter_.get(); - } - virtual ~CookieTestingProfile() {} - - net::CookieMonster* GetCookieMonster() { - return GetRequestContext()->GetCookieStore()->GetCookieMonster(); - } - - private: - scoped_refptr<URLRequestContextGetter> url_request_context_getter_; -}; - class CookiesWindowControllerTest : public CocoaTest { public: virtual void SetUp() { CocoaTest::SetUp(); + TestingProfile* profile = browser_helper_.profile(); + profile->CreateRequestContext(); controller_.reset( - [[CookiesWindowController alloc] initWithProfile:&profile_]); + [[CookiesWindowController alloc] initWithProfile:profile]); } virtual void TearDown() { @@ -113,7 +80,8 @@ class CookiesWindowControllerTest : public CocoaTest { return [controller_ modelObserver]->FindCocoaNode(node, start); } - CookieTestingProfile profile_; + protected: + BrowserTestHelper browser_helper_; scoped_nsobject<CookiesWindowController> controller_; }; @@ -164,9 +132,9 @@ TEST_F(CookiesWindowControllerTest, FindCocoaNodeRecursive) { } TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeCookie) { - net::CookieMonster* cm = profile_.GetCookieMonster(); + net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster(); cm->SetCookie(GURL("http://foo.com"), "A=B"); - CookiesTreeModel model(&profile_); + CookiesTreeModel model(browser_helper_.profile()); // Root --> foo.com --> Cookies --> A. Create node for 'A'. TreeModelNode* node = model.GetRoot()->GetChild(0)->GetChild(0)->GetChild(0); @@ -185,9 +153,9 @@ TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeCookie) { } TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeRecursive) { - net::CookieMonster* cm = profile_.GetCookieMonster(); + net::CookieMonster* cm = browser_helper_.profile()->GetCookieMonster(); cm->SetCookie(GURL("http://foo.com"), "A=B"); - CookiesTreeModel model(&profile_); + CookiesTreeModel model(browser_helper_.profile()); // Root --> foo.com --> Cookies --> A. Create node for 'foo.com'. CookieTreeNode* node = model.GetRoot()->GetChild(0); @@ -224,11 +192,12 @@ TEST_F(CookiesWindowControllerTest, CocoaNodeFromTreeNodeRecursive) { TEST_F(CookiesWindowControllerTest, TreeNodesAdded) { const GURL url = GURL("http://foo.com"); - net::CookieMonster* cm = profile_.GetCookieMonster(); + TestingProfile* profile = browser_helper_.profile(); + net::CookieMonster* cm = profile->GetCookieMonster(); cm->SetCookie(url, "A=B"); controller_.reset( - [[CookiesWindowController alloc] initWithProfile:&profile_]); + [[CookiesWindowController alloc] initWithProfile:profile]); // Root --> foo.com --> Cookies. NSMutableArray* cocoa_children = @@ -262,13 +231,14 @@ TEST_F(CookiesWindowControllerTest, TreeNodesAdded) { TEST_F(CookiesWindowControllerTest, TreeNodesRemoved) { const GURL url = GURL("http://foo.com"); - net::CookieMonster* cm = profile_.GetCookieMonster(); + TestingProfile* profile = browser_helper_.profile(); + net::CookieMonster* cm = profile->GetCookieMonster(); cm->SetCookie(url, "A=B"); cm->SetCookie(url, "C=D"); cm->SetCookie(url, "E=F"); controller_.reset( - [[CookiesWindowController alloc] initWithProfile:&profile_]); + [[CookiesWindowController alloc] initWithProfile:profile]); // Root --> foo.com --> Cookies. NSMutableArray* cocoa_children = @@ -291,13 +261,14 @@ TEST_F(CookiesWindowControllerTest, TreeNodesRemoved) { TEST_F(CookiesWindowControllerTest, TreeNodeChildrenReordered) { const GURL url = GURL("http://foo.com"); - net::CookieMonster* cm = profile_.GetCookieMonster(); + TestingProfile* profile = browser_helper_.profile(); + net::CookieMonster* cm = profile->GetCookieMonster(); cm->SetCookie(url, "A=B"); cm->SetCookie(url, "C=D"); cm->SetCookie(url, "E=F"); controller_.reset( - [[CookiesWindowController alloc] initWithProfile:&profile_]); + [[CookiesWindowController alloc] initWithProfile:profile]); // Root --> foo.com --> Cookies. NSMutableArray* cocoa_children = @@ -337,11 +308,12 @@ TEST_F(CookiesWindowControllerTest, TreeNodeChildrenReordered) { TEST_F(CookiesWindowControllerTest, TreeNodeChanged) { const GURL url = GURL("http://foo.com"); - net::CookieMonster* cm = profile_.GetCookieMonster(); + TestingProfile* profile = browser_helper_.profile(); + net::CookieMonster* cm = profile->GetCookieMonster(); cm->SetCookie(url, "A=B"); controller_.reset( - [[CookiesWindowController alloc] initWithProfile:&profile_]); + [[CookiesWindowController alloc] initWithProfile:profile]); CookiesTreeModel* model = [controller_ treeModel]; // Root --> foo.com --> Cookies. diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc index 317c003..11c312f 100644 --- a/chrome/browser/cookies_tree_model_unittest.cc +++ b/chrome/browser/cookies_tree_model_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -15,41 +15,6 @@ namespace { -class TestURLRequestContext : public URLRequestContext { - public: - TestURLRequestContext() { - cookie_store_ = new net::CookieMonster(); - } -}; - -class TestURLRequestContextGetter : public URLRequestContextGetter { - public: - virtual URLRequestContext* GetURLRequestContext() { - if (!context_) - context_ = new TestURLRequestContext(); - return context_.get(); - } - private: - scoped_refptr<URLRequestContext> context_; -}; - -class CookieTestingProfile : public TestingProfile { - public: - virtual URLRequestContextGetter* GetRequestContext() { - if (!url_request_context_getter_.get()) - url_request_context_getter_ = new TestURLRequestContextGetter; - return url_request_context_getter_.get(); - } - virtual ~CookieTestingProfile() {} - - net::CookieMonster* GetCookieMonster() { - return GetRequestContext()->GetCookieStore()->GetCookieMonster(); - } - - private: - scoped_refptr<URLRequestContextGetter> url_request_context_getter_; -}; - class CookiesTreeModelTest : public testing::Test { public: CookiesTreeModelTest() : io_thread_(ChromeThread::IO, &message_loop_) { @@ -59,7 +24,8 @@ class CookiesTreeModelTest : public testing::Test { } virtual void SetUp() { - profile_.reset(new CookieTestingProfile()); + profile_.reset(new TestingProfile()); + profile_->CreateRequestContext(); } // Get the cookie names in the cookie list, as a comma seperated string. @@ -116,7 +82,7 @@ class CookiesTreeModelTest : public testing::Test { MessageLoop message_loop_; ChromeThread io_thread_; - scoped_ptr<CookieTestingProfile> profile_; + scoped_ptr<TestingProfile> profile_; }; TEST_F(CookiesTreeModelTest, RemoveAll) { diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 39e847a..e5d6740 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -9,8 +9,10 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/history/history_backend.h" +#include "chrome/browser/net/url_request_context_getter.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_constants.h" +#include "net/url_request/url_request_context.h" #include "webkit/database/database_tracker.h" #if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) @@ -76,6 +78,33 @@ class BookmarkLoadObserver : public BookmarkModelObserver { DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver); }; +// This context is used to assist testing the CookieMonster by providing a +// valid CookieStore. This can probably be expanded to test other aspects of +// the context as well. +class TestURLRequestContext : public URLRequestContext { + public: + TestURLRequestContext() { + cookie_store_ = new net::CookieMonster(); + } +}; + +// Used to return a dummy context (normally the context is on the IO thread). +// The one here can be run on the main test thread. Note that this can lead to +// a leak if your test does not have a ChromeThread::IO in it because +// URLRequestContextGetter is defined as a ReferenceCounted object with a +// DeleteOnIOThread trait. +class TestURLRequestContextGetter : public URLRequestContextGetter { + public: + virtual URLRequestContext* GetURLRequestContext() { + if (!context_) + context_ = new TestURLRequestContext(); + return context_.get(); + } + + private: + scoped_refptr<URLRequestContext> context_; +}; + } // namespace TestingProfile::TestingProfile() @@ -202,6 +231,15 @@ void TestingProfile::InitThemes() { } } +URLRequestContextGetter* TestingProfile::GetRequestContext() { + return request_context_.get(); +} + +void TestingProfile::CreateRequestContext() { + if (!request_context_) + request_context_ = new TestURLRequestContextGetter(); +} + NTPResourceCache* TestingProfile::GetNTPResourceCache() { if (!ntp_resource_cache_.get()) ntp_resource_cache_.reset(new NTPResourceCache(this)); diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index f59a18b..77fdd40 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -13,10 +13,12 @@ #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" +#include "chrome/browser/net/url_request_context_getter.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/common/pref_service.h" +#include "net/base/cookie_monster.h" class TestingProfile : public Profile { public: @@ -100,6 +102,14 @@ class TestingProfile : public Profile { void set_has_history_service(bool has_history_service) { has_history_service_ = has_history_service; } + // The CookieMonster will only be returned if a Context has been created. Do + // this by calling CreateRequestContext(). See the note at GetRequestContext + // for more information. + net::CookieMonster* GetCookieMonster() { + if (!GetRequestContext()) + return NULL; + return GetRequestContext()->GetCookieStore()->GetCookieMonster(); + } virtual SearchVersusNavigateClassifier* GetSearchVersusNavigateClassifier() { return NULL; } @@ -139,11 +149,23 @@ class TestingProfile : public Profile { InitThemes(); return theme_provider_.get(); } - virtual URLRequestContextGetter* GetRequestContext() { return NULL; } + + // Returns a testing ContextGetter (if one has been created via + // CreateRequestContext) or NULL. This is not done on-demand for two reasons: + // (1) Some tests depend on GetRequestContext() returning NULL. (2) Because + // of the special memory management considerations for the + // TestURLRequestContextGetter class, many tests would find themseleves + // leaking if they called this method without the necessary IO thread. This + // getter is currently only capable of returning a Context that helps test + // the CookieMonster. See implementation comments for more details. + virtual URLRequestContextGetter* GetRequestContext(); + void CreateRequestContext(); + virtual URLRequestContextGetter* GetRequestContextForMedia() { return NULL; } virtual URLRequestContextGetter* GetRequestContextForExtensions() { return NULL; } + virtual net::SSLConfigService* GetSSLConfigService() { return NULL; } virtual BlacklistManager* GetBlacklistManager() { return NULL; } virtual HostZoomMap* GetHostZoomMap() { return NULL; } @@ -230,6 +252,10 @@ class TestingProfile : public Profile { scoped_ptr<BrowserThemeProvider> theme_provider_; bool created_theme_provider_; + // Internally, this is a TestURLRequestContextGetter that creates a dummy + // request context. Currently, only the CookieMonster is hooked up. + scoped_refptr<URLRequestContextGetter> request_context_; + // Do we have a history service? This defaults to the value of // history_service, but can be explicitly set. bool has_history_service_; |