Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: ui/base/cocoa/three_part_image_unittest.mm

Issue 2577913004: Update a unit test so it doesn't rely on obsolete resources. (Closed)
Patch Set: compile Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ui/resources/default_100_percent/common/browser_action_badge_center.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/three_part_image_unittest.mm
diff --git a/ui/base/cocoa/three_part_image_unittest.mm b/ui/base/cocoa/three_part_image_unittest.mm
index a8a664c5f9da077e5010b1075c2403f73497fbc1..963249023e729e03849eb8be1680623b00de632e 100644
--- a/ui/base/cocoa/three_part_image_unittest.mm
+++ b/ui/base/cocoa/three_part_image_unittest.mm
@@ -9,37 +9,42 @@
#include "testing/gtest_mac.h"
#include "ui/base/resource/resource_bundle.h"
#import "ui/gfx/test/ui_cocoa_test_helper.h"
+#include "ui/gfx/image/image_unittest_util.h"
#include "ui/resources/grit/ui_resources.h"
namespace ui {
namespace test {
TEST(ThreePartImageTest, GetRects) {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ const int kHeight = 11;
+ const int kLeftWidth = 3;
+ const int kMiddleWidth = 5;
+ const int kRightWidth = 7;
base::scoped_nsobject<NSImage> leftImage(
- rb.GetNativeImageNamed(IDR_BROWSER_ACTION_BADGE_LEFT).CopyNSImage());
+ gfx::test::CreateImage(kLeftWidth, kHeight).CopyNSImage());
base::scoped_nsobject<NSImage> middleImage(
- rb.GetNativeImageNamed(IDR_BROWSER_ACTION_BADGE_CENTER).CopyNSImage());
+ gfx::test::CreateImage(kMiddleWidth, kHeight).CopyNSImage());
base::scoped_nsobject<NSImage> rightImage(
- rb.GetNativeImageNamed(IDR_BROWSER_ACTION_BADGE_RIGHT).CopyNSImage());
+ gfx::test::CreateImage(kRightWidth, kHeight).CopyNSImage());
ThreePartImage image(leftImage, middleImage, rightImage);
- NSRect bounds = NSMakeRect(0, 0, 20, 11);
- EXPECT_NSRECT_EQ(NSMakeRect(0, 0, 4, 11), image.GetLeftRect(bounds));
- EXPECT_NSRECT_EQ(NSMakeRect(4, 0, 12, 11), image.GetMiddleRect(bounds));
- EXPECT_NSRECT_EQ(NSMakeRect(16, 0, 4, 11), image.GetRightRect(bounds));
-}
+ NSRect bounds =
+ NSMakeRect(0, 0, kLeftWidth + kMiddleWidth + kRightWidth, kHeight);
+ EXPECT_NSRECT_EQ(NSMakeRect(0, 0, kLeftWidth, kHeight),
+ image.GetLeftRect(bounds));
+ EXPECT_NSRECT_EQ(NSMakeRect(kLeftWidth, 0, kMiddleWidth, kHeight),
+ image.GetMiddleRect(bounds));
+ EXPECT_NSRECT_EQ(
+ NSMakeRect(kLeftWidth + kMiddleWidth, 0, kRightWidth, kHeight),
+ image.GetRightRect(bounds));
-TEST(ThreePartImageTest, GetRectsWithoutMiddle) {
- ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
- base::scoped_nsobject<NSImage> leftImage(
- rb.GetNativeImageNamed(IDR_BROWSER_ACTION_BADGE_LEFT).CopyNSImage());
- base::scoped_nsobject<NSImage> rightImage(
- rb.GetNativeImageNamed(IDR_BROWSER_ACTION_BADGE_RIGHT).CopyNSImage());
- ThreePartImage image(leftImage, nullptr, rightImage);
- NSRect bounds = NSMakeRect(0, 0, 20, 11);
- EXPECT_NSRECT_EQ(NSMakeRect(0, 0, 4, 11), image.GetLeftRect(bounds));
- EXPECT_NSRECT_EQ(NSMakeRect(4, 0, 12, 11), image.GetMiddleRect(bounds));
- EXPECT_NSRECT_EQ(NSMakeRect(16, 0, 4, 11), image.GetRightRect(bounds));
+ ThreePartImage image2(leftImage, nullptr, rightImage);
+ EXPECT_NSRECT_EQ(NSMakeRect(0, 0, kLeftWidth, kHeight),
+ image.GetLeftRect(bounds));
+ EXPECT_NSRECT_EQ(NSMakeRect(kLeftWidth, 0, kMiddleWidth, kHeight),
+ image.GetMiddleRect(bounds));
+ EXPECT_NSRECT_EQ(
+ NSMakeRect(kLeftWidth + kMiddleWidth, 0, kRightWidth, kHeight),
+ image.GetRightRect(bounds));
}
TEST(ThreePartImageTest, HitTest) {
« no previous file with comments | « no previous file | ui/resources/default_100_percent/common/browser_action_badge_center.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698