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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc

Issue 602813003: Animate the accessibility focus ring and fix some minor visual issues. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@focus_ring_in_chromevox
Patch Set: Fix unit tests Created 6 years, 3 months 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 | « chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc ('k') | chrome/browser/chromeos/ui/accessibility_focus_ring_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc
diff --git a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc
index 20dbcd3e800742c5205038b4bcf0d2a7ff6edead..b1ecc4ad2a779e9708700581b5f3cc8192ff5394 100644
--- a/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc
+++ b/chrome/browser/chromeos/ui/accessibility_focus_ring_controller_unittest.cc
@@ -11,7 +11,10 @@ namespace chromeos {
class TestableAccessibilityFocusRingController
: public AccessibilityFocusRingController {
public:
- TestableAccessibilityFocusRingController() {}
+ TestableAccessibilityFocusRingController() {
+ // By default use an easy round number for testing.
+ margin_ = 10;
+ }
virtual ~TestableAccessibilityFocusRingController() {}
void RectsToRings(const std::vector<gfx::Rect>& rects,
@@ -19,10 +22,12 @@ class TestableAccessibilityFocusRingController
AccessibilityFocusRingController::RectsToRings(rects, rings);
}
- // Return an easy round number for testing.
virtual int GetMargin() const OVERRIDE {
- return 10;
+ return margin_;
}
+
+ private:
+ int margin_;
};
class AccessibilityFocusRingControllerTest : public testing::Test {
@@ -31,6 +36,11 @@ class AccessibilityFocusRingControllerTest : public testing::Test {
virtual ~AccessibilityFocusRingControllerTest() {}
protected:
+ gfx::Rect AddMargin(gfx::Rect r) {
+ r.Inset(-controller_.GetMargin(), -controller_.GetMargin());
+ return r;
+ }
+
TestableAccessibilityFocusRingController controller_;
};
@@ -42,7 +52,7 @@ TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsSimpleBoundsCheck) {
std::vector<AccessibilityFocusRing> rings;
controller_.RectsToRings(rects, &rings);
ASSERT_EQ(1U, rings.size());
- ASSERT_EQ(rects[0], rings[0].GetBounds());
+ ASSERT_EQ(AddMargin(rects[0]), rings[0].GetBounds());
}
TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsVerticalStack) {
@@ -54,7 +64,7 @@ TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsVerticalStack) {
std::vector<AccessibilityFocusRing> rings;
controller_.RectsToRings(rects, &rings);
ASSERT_EQ(1U, rings.size());
- ASSERT_EQ(gfx::Rect(10, 10, 60, 60), rings[0].GetBounds());
+ ASSERT_EQ(AddMargin(gfx::Rect(10, 10, 60, 60)), rings[0].GetBounds());
}
TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsHorizontalStack) {
@@ -66,58 +76,58 @@ TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsHorizontalStack) {
std::vector<AccessibilityFocusRing> rings;
controller_.RectsToRings(rects, &rings);
ASSERT_EQ(1U, rings.size());
- ASSERT_EQ(gfx::Rect(10, 10, 120, 30), rings[0].GetBounds());
+ ASSERT_EQ(AddMargin(gfx::Rect(10, 10, 120, 30)), rings[0].GetBounds());
}
TEST_F(AccessibilityFocusRingControllerTest, RectsToRingsParagraphShape) {
// Given a simple paragraph shape, make sure we get something that
// outlines it correctly.
std::vector<gfx::Rect> rects;
- rects.push_back(gfx::Rect(0, 0, 200, 100));
- rects.push_back(gfx::Rect(0, 100, 600, 300));
- rects.push_back(gfx::Rect(400, 400, 200, 100));
+ rects.push_back(gfx::Rect(10, 10, 180, 80));
+ rects.push_back(gfx::Rect(10, 110, 580, 280));
+ rects.push_back(gfx::Rect(410, 410, 180, 80));
std::vector<AccessibilityFocusRing> rings;
controller_.RectsToRings(rects, &rings);
ASSERT_EQ(1U, rings.size());
- ASSERT_EQ(gfx::Rect(0, 0, 600, 500), rings[0].GetBounds());
+ EXPECT_EQ(gfx::Rect(0, 0, 600, 500), rings[0].GetBounds());
const gfx::Point* points = rings[0].points;
- ASSERT_EQ(gfx::Point(0, 90), points[0]);
- ASSERT_EQ(gfx::Point(0, 10), points[1]);
- ASSERT_EQ(gfx::Point(0, 0), points[2]);
- ASSERT_EQ(gfx::Point(10, 0), points[3]);
- ASSERT_EQ(gfx::Point(190, 0), points[4]);
- ASSERT_EQ(gfx::Point(200, 0), points[5]);
- ASSERT_EQ(gfx::Point(200, 10), points[6]);
- ASSERT_EQ(gfx::Point(200, 90), points[7]);
- ASSERT_EQ(gfx::Point(200, 100), points[8]);
- ASSERT_EQ(gfx::Point(210, 100), points[9]);
- ASSERT_EQ(gfx::Point(590, 100), points[10]);
- ASSERT_EQ(gfx::Point(600, 100), points[11]);
- ASSERT_EQ(gfx::Point(600, 110), points[12]);
- ASSERT_EQ(gfx::Point(600, 390), points[13]);
- ASSERT_EQ(gfx::Point(600, 400), points[14]);
- ASSERT_EQ(gfx::Point(600, 400), points[15]);
- ASSERT_EQ(gfx::Point(600, 400), points[16]);
- ASSERT_EQ(gfx::Point(600, 400), points[17]);
- ASSERT_EQ(gfx::Point(600, 410), points[18]);
- ASSERT_EQ(gfx::Point(600, 490), points[19]);
- ASSERT_EQ(gfx::Point(600, 500), points[20]);
- ASSERT_EQ(gfx::Point(590, 500), points[21]);
- ASSERT_EQ(gfx::Point(410, 500), points[22]);
- ASSERT_EQ(gfx::Point(400, 500), points[23]);
- ASSERT_EQ(gfx::Point(400, 490), points[24]);
- ASSERT_EQ(gfx::Point(400, 410), points[25]);
- ASSERT_EQ(gfx::Point(400, 400), points[26]);
- ASSERT_EQ(gfx::Point(390, 400), points[27]);
- ASSERT_EQ(gfx::Point(10, 400), points[28]);
- ASSERT_EQ(gfx::Point(0, 400), points[29]);
- ASSERT_EQ(gfx::Point(0, 390), points[30]);
- ASSERT_EQ(gfx::Point(0, 110), points[31]);
- ASSERT_EQ(gfx::Point(0, 100), points[32]);
- ASSERT_EQ(gfx::Point(0, 100), points[33]);
- ASSERT_EQ(gfx::Point(0, 100), points[34]);
- ASSERT_EQ(gfx::Point(0, 100), points[35]);
+ EXPECT_EQ(gfx::Point(0, 90), points[0]);
+ EXPECT_EQ(gfx::Point(0, 10), points[1]);
+ EXPECT_EQ(gfx::Point(0, 0), points[2]);
+ EXPECT_EQ(gfx::Point(10, 0), points[3]);
+ EXPECT_EQ(gfx::Point(190, 0), points[4]);
+ EXPECT_EQ(gfx::Point(200, 0), points[5]);
+ EXPECT_EQ(gfx::Point(200, 10), points[6]);
+ EXPECT_EQ(gfx::Point(200, 90), points[7]);
+ EXPECT_EQ(gfx::Point(200, 100), points[8]);
+ EXPECT_EQ(gfx::Point(210, 100), points[9]);
+ EXPECT_EQ(gfx::Point(590, 100), points[10]);
+ EXPECT_EQ(gfx::Point(600, 100), points[11]);
+ EXPECT_EQ(gfx::Point(600, 110), points[12]);
+ EXPECT_EQ(gfx::Point(600, 390), points[13]);
+ EXPECT_EQ(gfx::Point(600, 400), points[14]);
+ EXPECT_EQ(gfx::Point(600, 400), points[15]);
+ EXPECT_EQ(gfx::Point(600, 400), points[16]);
+ EXPECT_EQ(gfx::Point(600, 400), points[17]);
+ EXPECT_EQ(gfx::Point(600, 410), points[18]);
+ EXPECT_EQ(gfx::Point(600, 490), points[19]);
+ EXPECT_EQ(gfx::Point(600, 500), points[20]);
+ EXPECT_EQ(gfx::Point(590, 500), points[21]);
+ EXPECT_EQ(gfx::Point(410, 500), points[22]);
+ EXPECT_EQ(gfx::Point(400, 500), points[23]);
+ EXPECT_EQ(gfx::Point(400, 490), points[24]);
+ EXPECT_EQ(gfx::Point(400, 410), points[25]);
+ EXPECT_EQ(gfx::Point(400, 400), points[26]);
+ EXPECT_EQ(gfx::Point(390, 400), points[27]);
+ EXPECT_EQ(gfx::Point(10, 400), points[28]);
+ EXPECT_EQ(gfx::Point(0, 400), points[29]);
+ EXPECT_EQ(gfx::Point(0, 390), points[30]);
+ EXPECT_EQ(gfx::Point(0, 110), points[31]);
+ EXPECT_EQ(gfx::Point(0, 100), points[32]);
+ EXPECT_EQ(gfx::Point(0, 100), points[33]);
+ EXPECT_EQ(gfx::Point(0, 100), points[34]);
+ EXPECT_EQ(gfx::Point(0, 100), points[35]);
}
} // namespace chromeos
« no previous file with comments | « chrome/browser/chromeos/ui/accessibility_focus_ring_controller.cc ('k') | chrome/browser/chromeos/ui/accessibility_focus_ring_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698