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

Unified Diff: ui/gfx/size_unittest.cc

Issue 109433013: Move geometric types to a separate, more lightweight target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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
Index: ui/gfx/size_unittest.cc
diff --git a/ui/gfx/size_unittest.cc b/ui/gfx/size_unittest.cc
deleted file mode 100644
index 9f109b3f04b1f832eb1e68439244949b1e9facae..0000000000000000000000000000000000000000
--- a/ui/gfx/size_unittest.cc
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/gfx/size_base.h"
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/size.h"
-#include "ui/gfx/size_conversions.h"
-#include "ui/gfx/size_f.h"
-
-namespace gfx {
-
-namespace {
-
-int TestSizeF(const SizeF& s) {
- return s.width();
-}
-
-} // namespace
-
-TEST(SizeTest, ToSizeF) {
- // Check that implicit conversion from integer to float compiles.
- Size a(10, 20);
- float width = TestSizeF(a);
- EXPECT_EQ(width, a.width());
-
- SizeF b(10, 20);
-
- EXPECT_EQ(a, b);
- EXPECT_EQ(b, a);
-}
-
-TEST(SizeTest, ToFlooredSize) {
- EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0, 0)));
- EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.0001f, 0.0001f)));
- EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.4999f, 0.4999f)));
- EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.5f, 0.5f)));
- EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.9999f, 0.9999f)));
-
- EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10, 10)));
- EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.0001f, 10.0001f)));
- EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.4999f, 10.4999f)));
- EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.5f, 10.5f)));
- EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.9999f, 10.9999f)));
-}
-
-TEST(SizeTest, ToCeiledSize) {
- EXPECT_EQ(Size(0, 0), ToCeiledSize(SizeF(0, 0)));
- EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.0001f, 0.0001f)));
- EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.4999f, 0.4999f)));
- EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.5f, 0.5f)));
- EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.9999f, 0.9999f)));
-
- EXPECT_EQ(Size(10, 10), ToCeiledSize(SizeF(10, 10)));
- EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.0001f, 10.0001f)));
- EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.4999f, 10.4999f)));
- EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.5f, 10.5f)));
- EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.9999f, 10.9999f)));
-}
-
-TEST(SizeTest, ToRoundedSize) {
- EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0, 0)));
- EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.0001f, 0.0001f)));
- EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.4999f, 0.4999f)));
- EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.5f, 0.5f)));
- EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.9999f, 0.9999f)));
-
- EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10, 10)));
- EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.0001f, 10.0001f)));
- EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f)));
- EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f)));
- EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f)));
-}
-
-TEST(SizeTest, ClampSize) {
- Size a;
-
- a = Size(3, 5);
- EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
- a.SetToMax(Size(2, 4));
- EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
- a.SetToMax(Size(3, 5));
- EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
- a.SetToMax(Size(4, 2));
- EXPECT_EQ(Size(4, 5).ToString(), a.ToString());
- a.SetToMax(Size(8, 10));
- EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
-
- a.SetToMin(Size(9, 11));
- EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
- a.SetToMin(Size(8, 10));
- EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
- a.SetToMin(Size(11, 9));
- EXPECT_EQ(Size(8, 9).ToString(), a.ToString());
- a.SetToMin(Size(7, 11));
- EXPECT_EQ(Size(7, 9).ToString(), a.ToString());
- a.SetToMin(Size(3, 5));
- EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
-}
-
-TEST(SizeTest, ClampSizeF) {
- SizeF a;
-
- a = SizeF(3.5f, 5.5f);
- EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
- a.SetToMax(SizeF(2.5f, 4.5f));
- EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
- a.SetToMax(SizeF(3.5f, 5.5f));
- EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
- a.SetToMax(SizeF(4.5f, 2.5f));
- EXPECT_EQ(SizeF(4.5f, 5.5f).ToString(), a.ToString());
- a.SetToMax(SizeF(8.5f, 10.5f));
- EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
-
- a.SetToMin(SizeF(9.5f, 11.5f));
- EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
- a.SetToMin(SizeF(8.5f, 10.5f));
- EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
- a.SetToMin(SizeF(11.5f, 9.5f));
- EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString());
- a.SetToMin(SizeF(7.5f, 11.5f));
- EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString());
- a.SetToMin(SizeF(3.5f, 5.5f));
- EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
-}
-
-} // namespace gfx
« ui/aura/aura.gyp ('K') | « ui/gfx/size_f.cc ('k') | ui/gfx/skrect_conversion_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698