Cleanup resource_bundle_unittest

Cleanup resource_bundle_unittest

BUG=None
Test=ResourceBundleTest.*

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=166134

[pkotwicz, 2012-10-31 17:42:20]

I finally got around to cleaning up the resource bundle unittests.
Tony can you please take a look?

[tony, 2012-10-31 17:47:35]

LGTM, thanks!

[commit-bot: I haz the power, 2012-10-31 17:48:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/6001

[commit-bot: I haz the power, 2012-10-31 17:48:14]

Failed to apply patch for ui/base/resource/resource_bundle_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ui/base/resource/resource_bundle_unittest.cc
  Hunk #5 FAILED at 217.
  Hunk #6 FAILED at 236.
  Hunk #8 FAILED at 268.
  3 out of 8 hunks FAILED -- saving rejects to file
ui/base/resource/resource_bundle_unittest.cc.rej

Patch:       ui/base/resource/resource_bundle_unittest.cc
Index: ui/base/resource/resource_bundle_unittest.cc
diff --git a/ui/base/resource/resource_bundle_unittest.cc
b/ui/base/resource/resource_bundle_unittest.cc
index
eadfd9e530032f9ffa506da688e0ef7d6b382948..7e1ee4defe9f481920f0ea18101fa3f31616ce86
100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -94,9 +94,39 @@ void CreateDataPackWithSingleBitmap(const FilePath& path,
 
 }  // namespace
 
-TEST(ResourceBundle, DelegateGetPathForResourcePack) {
+class ResourceBundleTest : public testing::Test {
+ public:
+  ResourceBundleTest() : resource_bundle_(NULL) {
+  }
+
+  virtual ~ResourceBundleTest() {
+  }
+
+  // Overridden from testing::Test:
+  virtual void TearDown() OVERRIDE {
+    delete resource_bundle_;
+  }
+
+  // Returns new ResoureBundle with the specified |delegate|. The
+  // ResourceBundleTest class manages the lifetime of the returned
+  // ResourceBundle.
+  ResourceBundle* CreateResourceBundle(ResourceBundle::Delegate* delegate) {
+    DCHECK(!resource_bundle_);
+
+    resource_bundle_ = new ResourceBundle(delegate);
+    return resource_bundle_;
+  }
+
+ protected:
+  ResourceBundle* resource_bundle_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ResourceBundleTest);
+};
+
+TEST_F(ResourceBundleTest, DelegateGetPathForResourcePack) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   FilePath pack_path(FILE_PATH_LITERAL("/path/to/test_path.pak"));
   ui::ScaleFactor pack_scale_factor = ui::SCALE_FACTOR_200P;
@@ -108,12 +138,12 @@ TEST(ResourceBundle, DelegateGetPathForResourcePack) {
       .Times(1)
       .WillOnce(Return(pack_path));
 
-  resource_bundle.AddDataPackFromPath(pack_path, pack_scale_factor);
+  resource_bundle->AddDataPackFromPath(pack_path, pack_scale_factor);
 }
 
-TEST(ResourceBundle, DelegateGetPathForLocalePack) {
+TEST_F(ResourceBundleTest, DelegateGetPathForLocalePack) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   std::string locale = "en-US";
 
@@ -123,38 +153,38 @@ TEST(ResourceBundle, DelegateGetPathForLocalePack) {
       .WillRepeatedly(Return(FilePath()))
       .RetiresOnSaturation();
 
-  EXPECT_FALSE(resource_bundle.LocaleDataPakExists(locale));
-  EXPECT_EQ("", resource_bundle.LoadLocaleResources(locale));
+  EXPECT_FALSE(resource_bundle->LocaleDataPakExists(locale));
+  EXPECT_EQ("", resource_bundle->LoadLocaleResources(locale));
 
   // Allow the load to proceed.
   EXPECT_CALL(delegate, GetPathForLocalePack(_, locale))
       .Times(2)
       .WillRepeatedly(ReturnArg<0>());
 
-  EXPECT_TRUE(resource_bundle.LocaleDataPakExists(locale));
-  EXPECT_EQ(locale, resource_bundle.LoadLocaleResources(locale));
+  EXPECT_TRUE(resource_bundle->LocaleDataPakExists(locale));
+  EXPECT_EQ(locale, resource_bundle->LoadLocaleResources(locale));
 }
 
-TEST(ResourceBundle, DelegateGetImageNamed) {
+TEST_F(ResourceBundleTest, DelegateGetImageNamed) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
-  gfx::Image empty_image = resource_bundle.GetEmptyImage();
+  gfx::Image empty_image = resource_bundle->GetEmptyImage();
   int resource_id = 5;
 
   EXPECT_CALL(delegate, GetImageNamed(resource_id))
       .Times(1)
       .WillOnce(Return(empty_image));
 
-  gfx::Image result = resource_bundle.GetImageNamed(resource_id);
+  gfx::Image result = resource_bundle->GetImageNamed(resource_id);
   EXPECT_EQ(empty_image.ToSkBitmap(), result.ToSkBitmap());
 }
 
-TEST(ResourceBundle, DelegateGetNativeImageNamed) {
+TEST_F(ResourceBundleTest, DelegateGetNativeImageNamed) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
-  gfx::Image empty_image = resource_bundle.GetEmptyImage();
+  gfx::Image empty_image = resource_bundle->GetEmptyImage();
   int resource_id = 5;
 
   // Some platforms delegate GetNativeImageNamed calls to GetImageNamed.
@@ -166,13 +196,13 @@ TEST(ResourceBundle, DelegateGetNativeImageNamed) {
       .Times(Between(0, 1))
       .WillOnce(Return(empty_image));
 
-  gfx::Image result = resource_bundle.GetNativeImageNamed(resource_id);
+  gfx::Image result = resource_bundle->GetNativeImageNamed(resource_id);
   EXPECT_EQ(empty_image.ToSkBitmap(), result.ToSkBitmap());
 }
 
-TEST(ResourceBundle, DelegateLoadDataResourceBytes) {
+TEST_F(ResourceBundleTest, DelegateLoadDataResourceBytes) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   // Create the data resource for testing purposes.
   unsigned char data[] = "My test data";
@@ -187,13 +217,13 @@ TEST(ResourceBundle, DelegateLoadDataResourceBytes) {
       .WillOnce(Return(static_memory));
 
   scoped_refptr<base::RefCountedStaticMemory> result =
-      resource_bundle.LoadDataResourceBytesForScale(resource_id, scale_factor);
+      resource_bundle->LoadDataResourceBytesForScale(resource_id,
scale_factor);
   EXPECT_EQ(static_memory, result);
 }
 
-TEST(ResourceBundle, DelegateGetRawDataResource) {
+TEST_F(ResourceBundleTest, DelegateGetRawDataResource) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   // Create the string piece for testing purposes.
   char data[] = "My test data";
@@ -206,14 +236,14 @@ TEST(ResourceBundle, DelegateGetRawDataResource) {
       .Times(1)
       .WillOnce(Return(string_piece));
 
-  base::StringPiece result = resource_bundle.GetRawDataResource(
+  base::StringPiece result = resource_bundle->GetRawDataResource(
       resource_id);
   EXPECT_EQ(string_piece.data(), result.data());
 }
 
-TEST(ResourceBundle, DelegateGetLocalizedString) {
+TEST_F(ResourceBundleTest, DelegateGetLocalizedString) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   string16 data = ASCIIToUTF16("My test data");
   int resource_id = 5;
@@ -222,13 +252,13 @@ TEST(ResourceBundle, DelegateGetLocalizedString) {
       .Times(1)
       .WillOnce(Return(data));
 
-  string16 result = resource_bundle.GetLocalizedString(resource_id);
+  string16 result = resource_bundle->GetLocalizedString(resource_id);
   EXPECT_EQ(data, result);
 }
 
-TEST(ResourceBundle, DelegateGetFont) {
+TEST_F(ResourceBundleTest, DelegateGetFont) {
   MockResourceBundleDelegate delegate;
-  ResourceBundle resource_bundle(&delegate);
+  ResourceBundle* resource_bundle = CreateResourceBundle(&delegate);
 
   // Should be called once for each font type. When we return NULL the default
   // font will be created.
@@ -238,134 +268,146 @@ TEST(ResourceBundle, DelegateGetFont) {
       .WillRepeatedly(Return(test_font));
 
   const gfx::Font* font =
-      &resource_bundle.GetFont(ui::ResourceBundle::BaseFont);
+      &resource_bundle->GetFont(ui::ResourceBundle::BaseFont);
   EXPECT_TRUE(font);
 }
 
-TEST(ResourceBundle, LoadDataResourceBytes) {
-  // On Windows, the default data is compiled into the binary so this does
-  // nothing.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
-
-  // Put the ResourceBundle in a different scope so that it's destroyed before
-  // the ScopedTempDir.
-  {
-    // Verify that we don't crash when trying to load a resource that is not
-    // found.  In some cases, we fail to mmap resources.pak, but try to keep
-    // going anyway.
-    ResourceBundle resource_bundle(NULL);
-
-    // Dump contents into the pak file.
-    ASSERT_EQ(file_util::WriteFile(data_path, kSamplePakContents,
-                                   kSamplePakSize),
-              static_cast<int>(kSamplePakSize));
-
-    // Create a resource bundle from the file.
-    resource_bundle.LoadTestResources(data_path, data_path);
-
-    const int kUnfoundResourceId = 10000;
-    EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId));
-
-    // Give a .pak file that doesn't exist so we will fail to load it.
-    resource_bundle.AddDataPackFromPath(
-        FilePath(FILE_PATH_LITERAL("non-existant-file.pak")),
-        ui::SCALE_FACTOR_NONE);
-    EXPECT_EQ(NULL, resource_bundle.LoadDataResourceBytes(
-        kUnfoundResourceId));
-  }
+TEST_F(ResourceBundleTest, LocaleDataPakExists) {
+  ResourceBundle* resource_bundle = CreateResourceBundle(NULL);
+
+  // Check that ResourceBundle::LocaleDataPakExists returns the correct
results.
+  EXPECT_TRUE(resource_bundle->LocaleDataPakExists("en-US"));
+  EXPECT_FALSE(resource_bundle->LocaleDataPakExists("not_a_real_locale"));
 }
 
-TEST(ResourceBundle, GetRawDataResource) {
-
-  // On Windows, the default data is compiled into the binary so this does
-  // nothing.
-  ScopedTempDir dir;
-  ASSERT_TRUE(dir.CreateUniqueTempDir());
-  FilePath locale_path = dir.path().Append(FILE_PATH_LITERAL("empty.pak"));
-  FilePath data_path = dir.path().Append(FILE_PATH_LITERAL("sample.pak"));
-  FilePath data_2x_path =
dir.path().Append(FILE_PATH_LITERAL("sample_2x.pak"));
-
-  {
-    ResourceBundle resource_bundle(NULL);
-    // Dump contents…
(message too large)

[commit-bot: I haz the power, 2012-10-31 18:02:48]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/7004

[commit-bot: I haz the power, 2012-10-31 18:39:43]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-31 20:10:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/6007

[commit-bot: I haz the power, 2012-10-31 20:45:27]

Sorry for I got bad news for ya.
Compile failed with a clobber build on win.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win&number...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-10-31 21:00:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/2008

[commit-bot: I haz the power, 2012-10-31 22:54:08]

Step "update" is always a major failure.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-11-01 00:51:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/2008

[commit-bot: I haz the power, 2012-11-01 01:05:44]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/13006

[commit-bot: I haz the power, 2012-11-01 04:00:28]

The commit queue went berserk retrying too often for a
seemingly flaky test. Builder is android_dbg, revision is HEAD

[commit-bot: I haz the power, 2012-11-06 00:43:49]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/pkotwicz@chromium.org/11358014/9009

[commit-bot: I haz the power, 2012-11-06 03:53:20]

Change committed as 166134