From a9585718f3a0cbe83fe8deb5eb7dbc86956786e9 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 20 Jun 2011 14:50:51 +0000 Subject: ui: Move resource_bundle_unittest.cc from app.gyp to ui_unittests.gypi. This was the last remaining test to move. BUG=72317 TEST=ui_unittests R=rsesek@chromium.org Review URL: http://codereview.chromium.org/7201011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89665 0039d316-1c4b-4281-b951-d872f2087c98 --- app/app.gyp | 1 - ui/gfx/test_suite.cc | 16 ++++++++++++++++ ui/ui_unittests.gypi | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/app.gyp b/app/app.gyp index 1a0a88f..2ad47cb 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -22,7 +22,6 @@ '../ui/ui.gyp:ui_base', ], 'sources': [ - '../ui/base/resource/resource_bundle_unittest.cc', 'run_all_unittests.cc', 'sql/connection_unittest.cc', 'sql/sqlite_features_unittest.cc', diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc index 5d65ec4..cee5118 100644 --- a/ui/gfx/test_suite.cc +++ b/ui/gfx/test_suite.cc @@ -7,6 +7,8 @@ #include "base/file_path.h" #include "base/path_service.h" #include "build/build_config.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/base/ui_base_paths.h" #include "ui/gfx/gfx_paths.h" #if defined(OS_MACOSX) @@ -19,6 +21,7 @@ void GfxTestSuite::Initialize() { base::TestSuite::Initialize(); gfx::RegisterPathProvider(); + ui::RegisterPathProvider(); #if defined(OS_MACOSX) // Look in the framework bundle for resources. @@ -35,10 +38,23 @@ void GfxTestSuite::Initialize() { #error Unknown branding #endif base::mac::SetOverrideAppBundlePath(path); +#elif defined(OS_POSIX) + FilePath pak_dir; + PathService::Get(base::DIR_MODULE, &pak_dir); + pak_dir = pak_dir.AppendASCII("app_unittests_strings"); + PathService::Override(ui::DIR_LOCALES, pak_dir); + PathService::Override(ui::FILE_RESOURCES_PAK, + pak_dir.AppendASCII("app_resources.pak")); #endif // OS_MACOSX + + // Force unittests to run using en-US so if we test against string + // output, it'll pass regardless of the system language. + ui::ResourceBundle::InitSharedInstance("en-US"); } void GfxTestSuite::Shutdown() { + ui::ResourceBundle::CleanupSharedInstance(); + #if defined(OS_MACOSX) base::mac::SetOverrideAppBundle(NULL); #endif diff --git a/ui/ui_unittests.gypi b/ui/ui_unittests.gypi index 479af7c..f226b40 100644 --- a/ui/ui_unittests.gypi +++ b/ui/ui_unittests.gypi @@ -31,6 +31,7 @@ 'base/range/range_unittest.cc', 'base/range/range_unittest.mm', 'base/resource/data_pack_unittest.cc', + 'base/resource/resource_bundle_unittest.cc', 'base/test/data/resource.h', 'base/text/text_elider_unittest.cc', 'gfx/blit_unittest.cc', -- cgit v1.1