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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/touch/selection_bound_unittest.cc

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Excluded ui/touch_selection from Windows GN build Created 6 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 | « ui/base/touch/selection_bound.cc ('k') | ui/base/touch/touch_editing_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/touch/selection_bound_unittest.cc
diff --git a/ui/base/touch/touch_editing_controller_unittest.cc b/ui/base/touch/selection_bound_unittest.cc
similarity index 12%
rename from ui/base/touch/touch_editing_controller_unittest.cc
rename to ui/base/touch/selection_bound_unittest.cc
index d6b047e5cdf14cd9cc11b913a01efe6523ea9bed..363338d342425901ae6fff90858ff2fc71e09f5a 100644
--- a/ui/base/touch/touch_editing_controller_unittest.cc
+++ b/ui/base/touch/selection_bound_unittest.cc
@@ -2,98 +2,89 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/base/touch/touch_editing_controller.h"
+#include "ui/base/touch/selection_bound.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
namespace ui {
-namespace {
-
-}
-
-TEST(TouchEditingControllerTest, SelectionBound) {
+TEST(SelectionBoundTest, RectBetweenSelectionBounds) {
SelectionBound b1, b2;
// Simple case of aligned vertical bounds of equal height
- b1.edge_top = gfx::Point(0, 20);
- b1.edge_bottom = gfx::Point(0, 25);
- b2.edge_top = gfx::Point(110, 20);
- b2.edge_bottom = gfx::Point(110, 25);
- EXPECT_EQ(gfx::Rect(b1.edge_top,
- gfx::Size(b2.edge_top.x() - b1.edge_top.x(),
- b2.edge_bottom.y() - b2.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(0, 20), gfx::Point(0, 25));
+ b2.SetEdge(gfx::Point(110, 20), gfx::Point(110, 25));
+ gfx::Rect expected_rect(
+ b1.edge_top_rounded().x(),
+ b1.edge_top_rounded().y(),
+ b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+ b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Parallel vertical bounds of different heights
- b1.edge_top = gfx::Point(10, 20);
- b1.edge_bottom = gfx::Point(10, 25);
- b2.edge_top = gfx::Point(110, 0);
- b2.edge_bottom = gfx::Point(110, 35);
- EXPECT_EQ(gfx::Rect(gfx::Point(b1.edge_top.x(), b2.edge_top.y()),
- gfx::Size(b2.edge_top.x() - b1.edge_top.x(),
- b2.edge_bottom.y() - b2.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 25));
+ b2.SetEdge(gfx::Point(110, 0), gfx::Point(110, 35));
+ expected_rect = gfx::Rect(
+ b1.edge_top_rounded().x(),
+ b2.edge_top_rounded().y(),
+ b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+ b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
- b1.edge_top = gfx::Point(10, 20);
- b1.edge_bottom = gfx::Point(10, 30);
- b2.edge_top = gfx::Point(110, 25);
- b2.edge_bottom = gfx::Point(110, 45);
- EXPECT_EQ(gfx::Rect(b1.edge_top,
- gfx::Size(b2.edge_top.x() - b1.edge_top.x(),
- b2.edge_bottom.y() - b1.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
+ b2.SetEdge(gfx::Point(110, 25), gfx::Point(110, 45));
+ expected_rect = gfx::Rect(
+ b1.edge_top_rounded().x(),
+ b1.edge_top_rounded().y(),
+ b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+ b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
- b1.edge_top = gfx::Point(10, 20);
- b1.edge_bottom = gfx::Point(10, 30);
- b2.edge_top = gfx::Point(110, 40);
- b2.edge_bottom = gfx::Point(110, 60);
- EXPECT_EQ(gfx::Rect(b1.edge_top,
- gfx::Size(b2.edge_top.x() - b1.edge_top.x(),
- b2.edge_bottom.y() - b1.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
+ b2.SetEdge(gfx::Point(110, 40), gfx::Point(110, 60));
+ expected_rect = gfx::Rect(
+ b1.edge_top_rounded().x(),
+ b1.edge_top_rounded().y(),
+ b2.edge_top_rounded().x() - b1.edge_top_rounded().x(),
+ b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Overlapping vertical bounds
- b1.edge_top = gfx::Point(10, 20);
- b1.edge_bottom = gfx::Point(10, 30);
- b2.edge_top = gfx::Point(10, 25);
- b2.edge_bottom = gfx::Point(10, 40);
- EXPECT_EQ(gfx::Rect(b1.edge_top,
- gfx::Size(0, b2.edge_bottom.y() - b1.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(10, 20), gfx::Point(10, 30));
+ b2.SetEdge(gfx::Point(10, 25), gfx::Point(10, 40));
+ expected_rect = gfx::Rect(
+ b1.edge_top_rounded().x(),
+ b1.edge_top_rounded().y(),
+ 0,
+ b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Non-vertical bounds: "\ \"
- b1.edge_top = gfx::Point(10, 20);
- b1.edge_bottom = gfx::Point(20, 30);
- b2.edge_top = gfx::Point(110, 40);
- b2.edge_bottom = gfx::Point(120, 60);
- EXPECT_EQ(gfx::Rect(b1.edge_top,
- gfx::Size(b2.edge_bottom.x() - b1.edge_top.x(),
- b2.edge_bottom.y() - b1.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(10, 20), gfx::Point(20, 30));
+ b2.SetEdge(gfx::Point(110, 40), gfx::Point(120, 60));
+ expected_rect = gfx::Rect(
+ b1.edge_top_rounded().x(),
+ b1.edge_top_rounded().y(),
+ b2.edge_bottom_rounded().x() - b1.edge_top_rounded().x(),
+ b2.edge_bottom_rounded().y() - b1.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
// Non-vertical bounds: "/ \"
- b1.edge_top = gfx::Point(20, 30);
- b1.edge_bottom = gfx::Point(0, 40);
- b2.edge_top = gfx::Point(110, 30);
- b2.edge_bottom = gfx::Point(120, 40);
- EXPECT_EQ(gfx::Rect(gfx::Point(b1.edge_bottom.x(), b1.edge_top.y()),
- gfx::Size(b2.edge_bottom.x() - b1.edge_bottom.x(),
- b2.edge_bottom.y() - b2.edge_top.y())),
- RectBetweenSelectionBounds(b1, b2));
- EXPECT_EQ(RectBetweenSelectionBounds(b1, b2),
- RectBetweenSelectionBounds(b2, b1));
+ b1.SetEdge(gfx::Point(20, 30), gfx::Point(0, 40));
+ b2.SetEdge(gfx::Point(110, 30), gfx::Point(120, 40));
+ expected_rect = gfx::Rect(
+ b1.edge_bottom_rounded().x(),
+ b1.edge_top_rounded().y(),
+ b2.edge_bottom_rounded().x() - b1.edge_bottom_rounded().x(),
+ b2.edge_bottom_rounded().y() - b2.edge_top_rounded().y());
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b1, b2));
+ EXPECT_EQ(expected_rect, RectBetweenSelectionBounds(b2, b1));
}
} // namespace ui
« no previous file with comments | « ui/base/touch/selection_bound.cc ('k') | ui/base/touch/touch_editing_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698