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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ui/gfx/size_unittest.cc

Issue 11410024: ui: Remove gfx::Size::ClampToNonNegative, prevent negative sizes always. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: no negative sizes Created 8 years, 1 month 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 unified diff | Download patch | Annotate | Revision Log
« ui/gfx/size_base_impl.h ('K') | « ui/gfx/size_f.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/gfx/size_base.h" 5 #include "ui/gfx/size_base.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/gfx/size.h" 8 #include "ui/gfx/size.h"
9 #include "ui/gfx/size_conversions.h" 9 #include "ui/gfx/size_conversions.h"
10 #include "ui/gfx/size_f.h" 10 #include "ui/gfx/size_f.h"
(...skipping 25 matching lines...) Expand all
36 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.0001f, 0.0001f))); 36 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.0001f, 0.0001f)));
37 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.4999f, 0.4999f))); 37 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.4999f, 0.4999f)));
38 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.5f, 0.5f))); 38 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.5f, 0.5f)));
39 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.9999f, 0.9999f))); 39 EXPECT_EQ(Size(0, 0), ToFlooredSize(SizeF(0.9999f, 0.9999f)));
40 40
41 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10, 10))); 41 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10, 10)));
42 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.0001f, 10.0001f))); 42 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.0001f, 10.0001f)));
43 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.4999f, 10.4999f))); 43 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.4999f, 10.4999f)));
44 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.5f, 10.5f))); 44 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.5f, 10.5f)));
45 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.9999f, 10.9999f))); 45 EXPECT_EQ(Size(10, 10), ToFlooredSize(SizeF(10.9999f, 10.9999f)));
46
47 EXPECT_EQ(Size(-10, -10), ToFlooredSize(SizeF(-10, -10)));
48 EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.0001f, -10.0001f)));
49 EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.4999f, -10.4999f)));
50 EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.5f, -10.5f)));
51 EXPECT_EQ(Size(-11, -11), ToFlooredSize(SizeF(-10.9999f, -10.9999f)));
52 } 46 }
53 47
54 TEST(SizeTest, ToCeiledSize) { 48 TEST(SizeTest, ToCeiledSize) {
55 EXPECT_EQ(Size(0, 0), ToCeiledSize(SizeF(0, 0))); 49 EXPECT_EQ(Size(0, 0), ToCeiledSize(SizeF(0, 0)));
56 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.0001f, 0.0001f))); 50 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.0001f, 0.0001f)));
57 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.4999f, 0.4999f))); 51 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.4999f, 0.4999f)));
58 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.5f, 0.5f))); 52 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.5f, 0.5f)));
59 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.9999f, 0.9999f))); 53 EXPECT_EQ(Size(1, 1), ToCeiledSize(SizeF(0.9999f, 0.9999f)));
60 54
61 EXPECT_EQ(Size(10, 10), ToCeiledSize(SizeF(10, 10))); 55 EXPECT_EQ(Size(10, 10), ToCeiledSize(SizeF(10, 10)));
62 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.0001f, 10.0001f))); 56 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.0001f, 10.0001f)));
63 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.4999f, 10.4999f))); 57 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.4999f, 10.4999f)));
64 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.5f, 10.5f))); 58 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.5f, 10.5f)));
65 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.9999f, 10.9999f))); 59 EXPECT_EQ(Size(11, 11), ToCeiledSize(SizeF(10.9999f, 10.9999f)));
66
67 EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10, -10)));
68 EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.0001f, -10.0001f)));
69 EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.4999f, -10.4999f)));
70 EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.5f, -10.5f)));
71 EXPECT_EQ(Size(-10, -10), ToCeiledSize(SizeF(-10.9999f, -10.9999f)));
72 } 60 }
73 61
74 TEST(SizeTest, ToRoundedSize) { 62 TEST(SizeTest, ToRoundedSize) {
75 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0, 0))); 63 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0, 0)));
76 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.0001f, 0.0001f))); 64 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.0001f, 0.0001f)));
77 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.4999f, 0.4999f))); 65 EXPECT_EQ(Size(0, 0), ToRoundedSize(SizeF(0.4999f, 0.4999f)));
78 EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.5f, 0.5f))); 66 EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.5f, 0.5f)));
79 EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.9999f, 0.9999f))); 67 EXPECT_EQ(Size(1, 1), ToRoundedSize(SizeF(0.9999f, 0.9999f)));
80 68
81 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10, 10))); 69 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10, 10)));
82 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.0001f, 10.0001f))); 70 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.0001f, 10.0001f)));
83 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f))); 71 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f)));
84 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f))); 72 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f)));
85 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f))); 73 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f)));
86
87 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10, -10)));
88 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.0001f, -10.0001f)));
89 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.4999f, -10.4999f)));
90 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.5f, -10.5f)));
91 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.9999f, -10.9999f)));
92 } 74 }
93 75
94 TEST(SizeTest, ClampSize) { 76 TEST(SizeTest, ClampSize) {
95 Size a; 77 Size a;
96 78
97 a = Size(3, 5); 79 a = Size(3, 5);
98 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 80 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
99 a.ClampToMin(Size(2, 4)); 81 a.ClampToMin(Size(2, 4));
100 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 82 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
101 a.ClampToMin(Size(3, 5)); 83 a.ClampToMin(Size(3, 5));
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); 119 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
138 a.ClampToMax(SizeF(11.5f, 9.5f)); 120 a.ClampToMax(SizeF(11.5f, 9.5f));
139 EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString()); 121 EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString());
140 a.ClampToMax(SizeF(7.5f, 11.5f)); 122 a.ClampToMax(SizeF(7.5f, 11.5f));
141 EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString()); 123 EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString());
142 a.ClampToMax(SizeF(3.5f, 5.5f)); 124 a.ClampToMax(SizeF(3.5f, 5.5f));
143 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); 125 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
144 } 126 }
145 127
146 } // namespace gfx 128 } // namespace gfx
OLDNEW
« ui/gfx/size_base_impl.h ('K') | « ui/gfx/size_f.cc ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698