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

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

Issue 11361186: ui: Add methods to clamp Sizes, Points, and Vectors from above or below. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
« no previous file with comments | « ui/gfx/size_base.h ('k') | ui/gfx/vector2d.h » ('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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f))); 84 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f)));
85 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f))); 85 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f)));
86 86
87 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10, -10))); 87 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10, -10)));
88 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.0001f, -10.0001f))); 88 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.0001f, -10.0001f)));
89 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.4999f, -10.4999f))); 89 EXPECT_EQ(Size(-10, -10), ToRoundedSize(SizeF(-10.4999f, -10.4999f)));
90 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.5f, -10.5f))); 90 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.5f, -10.5f)));
91 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.9999f, -10.9999f))); 91 EXPECT_EQ(Size(-11, -11), ToRoundedSize(SizeF(-10.9999f, -10.9999f)));
92 } 92 }
93 93
94 TEST(SizeTest, ClampSize) {
95 Size a;
96
97 a = Size(3, 5);
98 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
99 a.ClampToMin(Size(2, 4));
100 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
101 a.ClampToMin(Size(3, 5));
102 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
103 a.ClampToMin(Size(4, 2));
104 EXPECT_EQ(Size(4, 5).ToString(), a.ToString());
105 a.ClampToMin(Size(8, 10));
106 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
107
108 a.ClampToMax(Size(9, 11));
109 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
110 a.ClampToMax(Size(8, 10));
111 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
112 a.ClampToMax(Size(11, 9));
113 EXPECT_EQ(Size(8, 9).ToString(), a.ToString());
114 a.ClampToMax(Size(7, 11));
115 EXPECT_EQ(Size(7, 9).ToString(), a.ToString());
116 a.ClampToMax(Size(3, 5));
117 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
118 }
119
120 TEST(SizeTest, ClampSizeF) {
121 SizeF a;
122
123 a = SizeF(3.5f, 5.5f);
124 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
125 a.ClampToMin(SizeF(2.5f, 4.5f));
126 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
127 a.ClampToMin(SizeF(3.5f, 5.5f));
128 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
129 a.ClampToMin(SizeF(4.5f, 2.5f));
130 EXPECT_EQ(SizeF(4.5f, 5.5f).ToString(), a.ToString());
131 a.ClampToMin(SizeF(8.5f, 10.5f));
132 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
133
134 a.ClampToMax(SizeF(9.5f, 11.5f));
135 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
136 a.ClampToMax(SizeF(8.5f, 10.5f));
137 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
138 a.ClampToMax(SizeF(11.5f, 9.5f));
139 EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString());
140 a.ClampToMax(SizeF(7.5f, 11.5f));
141 EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString());
142 a.ClampToMax(SizeF(3.5f, 5.5f));
143 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
144 }
145
94 } // namespace gfx 146 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gfx/size_base.h ('k') | ui/gfx/vector2d.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698