Move tests from Chrome's unit_tests to extensions_unittests
Part of extensions module componentization. * Add a NotificationService for EventRouterTest * Move the test data for ValueStoreFrontendTest * The rest can move unchanged BUG=397164 TEST=unit_tests, extensions_unittests Review URL: https://codereview.chromium.org/435703002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287159 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jamescook@chromium.org
@ -541,7 +541,6 @@
|
||||
# http://crbug.com/348066. They are duplicated here because we haven't
|
||||
# extensions_unittests running in the bots yet. Until that happens,
|
||||
# they should be kept here.
|
||||
'../extensions/browser/admin_policy_unittest.cc',
|
||||
'../extensions/browser/api/api_resource_manager_unittest.cc',
|
||||
'../extensions/browser/api/cast_channel/cast_channel_api_unittest.cc',
|
||||
'../extensions/browser/api/cast_channel/cast_socket_unittest.cc',
|
||||
@ -551,34 +550,14 @@
|
||||
'../extensions/browser/api/storage/settings_test_util.h',
|
||||
'../extensions/browser/api/storage/storage_api_unittest.cc',
|
||||
'../extensions/browser/api/storage/storage_frontend_unittest.cc',
|
||||
'../extensions/browser/computed_hashes_unittest.cc',
|
||||
'../extensions/browser/content_hash_tree_unittest.cc',
|
||||
'../extensions/browser/error_map_unittest.cc',
|
||||
'../extensions/browser/event_listener_map_unittest.cc',
|
||||
'../extensions/browser/event_router_unittest.cc',
|
||||
'../extensions/browser/extension_error_test_util.cc',
|
||||
'../extensions/browser/extension_error_test_util.h',
|
||||
'../extensions/browser/extension_icon_image_unittest.cc',
|
||||
'../extensions/browser/extension_pref_value_map_unittest.cc',
|
||||
'../extensions/browser/extension_protocols_unittest.cc',
|
||||
'../extensions/browser/extension_registry_unittest.cc',
|
||||
'../extensions/browser/file_highlighter_unittest.cc',
|
||||
'../extensions/browser/file_reader_unittest.cc',
|
||||
'../extensions/browser/image_loader_unittest.cc',
|
||||
'../extensions/browser/image_util_unittest.cc',
|
||||
'../extensions/browser/info_map_unittest.cc',
|
||||
'../extensions/browser/lazy_background_task_queue_unittest.cc',
|
||||
'../extensions/browser/management_policy_unittest.cc',
|
||||
'../extensions/browser/process_map_unittest.cc',
|
||||
'../extensions/browser/quota_service_unittest.cc',
|
||||
'../extensions/browser/runtime_data_unittest.cc',
|
||||
'../extensions/browser/value_store/leveldb_value_store_unittest.cc',
|
||||
'../extensions/browser/value_store/testing_value_store_unittest.cc',
|
||||
'../extensions/browser/value_store/value_store_change_unittest.cc',
|
||||
'../extensions/browser/value_store/value_store_frontend_unittest.cc',
|
||||
'../extensions/browser/value_store/value_store_unittest.cc',
|
||||
'../extensions/browser/value_store/value_store_unittest.h',
|
||||
'../extensions/browser/verified_contents_unittest.cc',
|
||||
'../extensions/common/extension_l10n_util_unittest.cc',
|
||||
'../extensions/common/extension_resource_unittest.cc',
|
||||
'../extensions/common/extension_set_unittest.cc',
|
||||
@ -912,7 +891,7 @@
|
||||
'browser/extensions/api/dial/dial_registry_unittest.cc',
|
||||
'browser/extensions/api/dial/dial_service_unittest.cc',
|
||||
'browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api_unittest.cc',
|
||||
'browser/extensions/api/experience_sampling_private/experience_sampling_private_api_unittest.cc',
|
||||
'browser/extensions/api/experience_sampling_private/experience_sampling_private_api_unittest.cc',
|
||||
'browser/extensions/api/extension_action/extension_action_prefs_unittest.cc',
|
||||
'browser/extensions/api/file_handlers/mime_util_unittest.cc',
|
||||
'browser/extensions/api/file_system/file_system_api_unittest.cc',
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/values.h"
|
||||
#include "content/public/browser/notification_service.h"
|
||||
#include "extensions/browser/event_listener_map.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
@ -81,9 +82,18 @@ scoped_ptr<EventListener> CreateEventListenerForURL(
|
||||
} // namespace
|
||||
|
||||
class EventRouterTest : public testing::Test {
|
||||
public:
|
||||
EventRouterTest()
|
||||
: notification_service_(content::NotificationService::Create()) {}
|
||||
|
||||
protected:
|
||||
// Tests adding and removing observers from EventRouter.
|
||||
void RunEventRouterObserverTest(const EventListenerConstructor& constructor);
|
||||
|
||||
private:
|
||||
scoped_ptr<content::NotificationService> notification_service_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(EventRouterTest);
|
||||
};
|
||||
|
||||
TEST_F(EventRouterTest, GetBaseEventName) {
|
||||
|
||||
@ -7,9 +7,9 @@
|
||||
#include "base/memory/scoped_ptr.h"
|
||||
#include "base/message_loop/message_loop.h"
|
||||
#include "base/path_service.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "content/public/test/test_browser_thread.h"
|
||||
#include "extensions/browser/value_store/value_store_frontend.h"
|
||||
#include "extensions/common/extension_paths.h"
|
||||
#include "testing/gtest/include/gtest/gtest.h"
|
||||
|
||||
using content::BrowserThread;
|
||||
@ -25,7 +25,7 @@ class ValueStoreFrontendTest : public testing::Test {
|
||||
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
||||
|
||||
base::FilePath test_data_dir;
|
||||
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
|
||||
ASSERT_TRUE(PathService::Get(extensions::DIR_TEST_DATA, &test_data_dir));
|
||||
base::FilePath src_db(test_data_dir.AppendASCII("value_store_db"));
|
||||
db_path_ = temp_dir_.path().AppendASCII("temp_db");
|
||||
base::CopyDirectory(src_db, db_path_, true);
|
||||
|
||||
@ -806,6 +806,7 @@
|
||||
'../mojo/mojo_base.gyp:mojo_system_impl',
|
||||
'../testing/gmock.gyp:gmock',
|
||||
'../testing/gtest.gyp:gtest',
|
||||
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
|
||||
'extensions_common',
|
||||
'extensions_renderer',
|
||||
'extensions_resources.gyp:extensions_resources',
|
||||
@ -813,8 +814,33 @@
|
||||
'extensions_strings.gyp:extensions_strings',
|
||||
'extensions_test_support',
|
||||
],
|
||||
# Needed for third_party libraries like leveldb.
|
||||
'include_dirs': [
|
||||
'..',
|
||||
],
|
||||
'sources': [
|
||||
'browser/admin_policy_unittest.cc',
|
||||
'browser/computed_hashes_unittest.cc',
|
||||
'browser/content_hash_tree_unittest.cc',
|
||||
'browser/event_listener_map_unittest.cc',
|
||||
'browser/event_router_unittest.cc',
|
||||
'browser/extension_pref_value_map_unittest.cc',
|
||||
'browser/extension_registry_unittest.cc',
|
||||
'browser/file_highlighter_unittest.cc',
|
||||
'browser/file_reader_unittest.cc',
|
||||
'browser/image_util_unittest.cc',
|
||||
'browser/management_policy_unittest.cc',
|
||||
'browser/process_manager_unittest.cc',
|
||||
'browser/process_map_unittest.cc',
|
||||
'browser/quota_service_unittest.cc',
|
||||
'browser/runtime_data_unittest.cc',
|
||||
'browser/value_store/leveldb_value_store_unittest.cc',
|
||||
'browser/value_store/testing_value_store_unittest.cc',
|
||||
'browser/value_store/value_store_change_unittest.cc',
|
||||
'browser/value_store/value_store_frontend_unittest.cc',
|
||||
'browser/value_store/value_store_unittest.cc',
|
||||
'browser/value_store/value_store_unittest.h',
|
||||
'browser/verified_contents_unittest.cc',
|
||||
'common/api/sockets/sockets_manifest_permission_unittest.cc',
|
||||
'common/csp_validator_unittest.cc',
|
||||
'common/event_filter_unittest.cc',
|
||||
@ -842,6 +868,8 @@
|
||||
'test/test_permissions_provider.cc',
|
||||
'test/test_permissions_provider.h',
|
||||
],
|
||||
# Disable c4267 warnings until we fix size_t to int truncations.
|
||||
'msvs_disabled_warnings': [ 4267, ],
|
||||
'conditions': [
|
||||
['OS=="win" and win_use_allocator_shim==1', {
|
||||
'dependencies': [
|
||||
|
||||
Reference in New Issue
Block a user