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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14367021: Rename ClampToMin and ClampToMax (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« ui/gfx/point_base.h ('K') | « 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f))); 71 EXPECT_EQ(Size(10, 10), ToRoundedSize(SizeF(10.4999f, 10.4999f)));
72 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f))); 72 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.5f, 10.5f)));
73 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f))); 73 EXPECT_EQ(Size(11, 11), ToRoundedSize(SizeF(10.9999f, 10.9999f)));
74 } 74 }
75 75
76 TEST(SizeTest, ClampSize) { 76 TEST(SizeTest, ClampSize) {
77 Size a; 77 Size a;
78 78
79 a = Size(3, 5); 79 a = Size(3, 5);
80 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 80 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
81 a.ClampToMin(Size(2, 4)); 81 a.ClampToLowerBound(Size(2, 4));
82 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 82 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
83 a.ClampToMin(Size(3, 5)); 83 a.ClampToLowerBound(Size(3, 5));
84 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 84 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
85 a.ClampToMin(Size(4, 2)); 85 a.ClampToLowerBound(Size(4, 2));
86 EXPECT_EQ(Size(4, 5).ToString(), a.ToString()); 86 EXPECT_EQ(Size(4, 5).ToString(), a.ToString());
87 a.ClampToMin(Size(8, 10)); 87 a.ClampToLowerBound(Size(8, 10));
88 EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); 88 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
89 89
90 a.ClampToMax(Size(9, 11)); 90 a.ClampToUpperBound(Size(9, 11));
91 EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); 91 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
92 a.ClampToMax(Size(8, 10)); 92 a.ClampToUpperBound(Size(8, 10));
93 EXPECT_EQ(Size(8, 10).ToString(), a.ToString()); 93 EXPECT_EQ(Size(8, 10).ToString(), a.ToString());
94 a.ClampToMax(Size(11, 9)); 94 a.ClampToUpperBound(Size(11, 9));
95 EXPECT_EQ(Size(8, 9).ToString(), a.ToString()); 95 EXPECT_EQ(Size(8, 9).ToString(), a.ToString());
96 a.ClampToMax(Size(7, 11)); 96 a.ClampToUpperBound(Size(7, 11));
97 EXPECT_EQ(Size(7, 9).ToString(), a.ToString()); 97 EXPECT_EQ(Size(7, 9).ToString(), a.ToString());
98 a.ClampToMax(Size(3, 5)); 98 a.ClampToUpperBound(Size(3, 5));
99 EXPECT_EQ(Size(3, 5).ToString(), a.ToString()); 99 EXPECT_EQ(Size(3, 5).ToString(), a.ToString());
100 } 100 }
101 101
102 TEST(SizeTest, ClampSizeF) { 102 TEST(SizeTest, ClampSizeF) {
103 SizeF a; 103 SizeF a;
104 104
105 a = SizeF(3.5f, 5.5f); 105 a = SizeF(3.5f, 5.5f);
106 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); 106 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
107 a.ClampToMin(SizeF(2.5f, 4.5f)); 107 a.ClampToLowerBound(SizeF(2.5f, 4.5f));
108 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); 108 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
109 a.ClampToMin(SizeF(3.5f, 5.5f)); 109 a.ClampToLowerBound(SizeF(3.5f, 5.5f));
110 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); 110 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
111 a.ClampToMin(SizeF(4.5f, 2.5f)); 111 a.ClampToLowerBound(SizeF(4.5f, 2.5f));
112 EXPECT_EQ(SizeF(4.5f, 5.5f).ToString(), a.ToString()); 112 EXPECT_EQ(SizeF(4.5f, 5.5f).ToString(), a.ToString());
113 a.ClampToMin(SizeF(8.5f, 10.5f)); 113 a.ClampToLowerBound(SizeF(8.5f, 10.5f));
114 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); 114 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
115 115
116 a.ClampToMax(SizeF(9.5f, 11.5f)); 116 a.ClampToUpperBound(SizeF(9.5f, 11.5f));
117 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); 117 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
118 a.ClampToMax(SizeF(8.5f, 10.5f)); 118 a.ClampToUpperBound(SizeF(8.5f, 10.5f));
119 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString()); 119 EXPECT_EQ(SizeF(8.5f, 10.5f).ToString(), a.ToString());
120 a.ClampToMax(SizeF(11.5f, 9.5f)); 120 a.ClampToUpperBound(SizeF(11.5f, 9.5f));
121 EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString()); 121 EXPECT_EQ(SizeF(8.5f, 9.5f).ToString(), a.ToString());
122 a.ClampToMax(SizeF(7.5f, 11.5f)); 122 a.ClampToUpperBound(SizeF(7.5f, 11.5f));
123 EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString()); 123 EXPECT_EQ(SizeF(7.5f, 9.5f).ToString(), a.ToString());
124 a.ClampToMax(SizeF(3.5f, 5.5f)); 124 a.ClampToUpperBound(SizeF(3.5f, 5.5f));
125 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString()); 125 EXPECT_EQ(SizeF(3.5f, 5.5f).ToString(), a.ToString());
126 } 126 }
127 127
128 } // namespace gfx 128 } // namespace gfx
OLDNEW
« ui/gfx/point_base.h ('K') | « 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