Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 79bfa41

Browse files
flarflar
committed
switch to EXPECT for more complete test runs on failures
1 parent d8d8043 commit 79bfa41

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎impeller/geometry/rect_unittests.cc

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ namespace testing {
1414
TEST(RectTest, RectOriginSizeGetters) {
1515
{
1616
Rect r = Rect::MakeOriginSize({10, 20}, {50, 40});
17-
ASSERT_EQ(r.GetOrigin(), Point(10, 20));
18-
ASSERT_EQ(r.GetSize(), Size(50, 40));
17+
EXPECT_EQ(r.GetOrigin(), Point(10, 20));
18+
EXPECT_EQ(r.GetSize(), Size(50, 40));
1919
}
2020

2121
{
2222
Rect r = Rect::MakeLTRB(10, 20, 50, 40);
23-
ASSERT_EQ(r.GetOrigin(), Point(10, 20));
24-
ASSERT_EQ(r.GetSize(), Size(40, 20));
23+
EXPECT_EQ(r.GetOrigin(), Point(10, 20));
24+
EXPECT_EQ(r.GetSize(), Size(40, 20));
2525
}
2626
}
2727

@@ -44,14 +44,14 @@ TEST(RectTest, RectMakeSize) {
4444
Size s(100, 200);
4545
IRect r = IRect::MakeSize(s);
4646
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
47-
ASSERT_EQ(r, expected);
47+
EXPECT_EQ(r, expected);
4848
}
4949

5050
{
5151
ISize s(100, 200);
5252
IRect r = IRect::MakeSize(s);
5353
IRect expected = IRect::MakeLTRB(0, 0, 100, 200);
54-
ASSERT_EQ(r, expected);
54+
EXPECT_EQ(r, expected);
5555
}
5656
}
5757

@@ -70,19 +70,19 @@ TEST(RectTest, NormalizePoint) {
7070
const std::string& pt_desc, //
7171
Point expected) {
7272
// Scalar point inside Scalar rect
73-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
73+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
7474
expected)
7575
<< "Point(" << pt_desc << ") in " << rect_desc << " Rect";
7676
// Scalar point inside Integer rect
77-
ASSERT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
77+
EXPECT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
7878
expected)
7979
<< "Point(" << pt_desc << ") in " << rect_desc << " IRect";
8080
// Integer point inside Scalar rect
81-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(IPoint(px, py)),
81+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(IPoint(px, py)),
8282
expected)
8383
<< "IPoint(" << pt_desc << ") in " << rect_desc << " Rect";
8484
// Integer point inside Integer rect
85-
ASSERT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(IPoint(px, py)),
85+
EXPECT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(IPoint(px, py)),
8686
expected)
8787
<< "IPoint(" << pt_desc << ") in " << rect_desc << " IRect";
8888

@@ -91,17 +91,17 @@ TEST(RectTest, NormalizePoint) {
9191
auto nan_y = Point(px, nan);
9292
auto nan_p = Point(nan, nan);
9393
// Nan Scalar point inside Scalar and integer rects
94-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
94+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
9595
<< "Point(NaN x) in " << rect_desc << " Rect";
96-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
96+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
9797
<< "Point(NaN y) in " << rect_desc << " Rect";
98-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
98+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
9999
<< "Point(NaN x&y) in " << rect_desc << " Rect";
100-
ASSERT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
100+
EXPECT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
101101
<< "Point(NaN x) in " << rect_desc << " Rect";
102-
ASSERT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
102+
EXPECT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
103103
<< "Point(NaN y) in " << rect_desc << " Rect";
104-
ASSERT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
104+
EXPECT_EQ(IRect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
105105
<< "Point(NaN x&y) in " << rect_desc << " Rect";
106106
};
107107

@@ -153,39 +153,39 @@ TEST(RectTest, NormalizePointToNonFiniteRects) {
153153
auto inf = std::numeric_limits<Scalar>::infinity();
154154

155155
// Scalar point inside Scalar rect
156-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
156+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(Point(px, py)),
157157
expected)
158158
<< "Point(" << pt_desc << ") in Rect";
159159
// Scalar point inside Scalar rect with NaN left
160-
ASSERT_EQ(Rect::MakeLTRB(nan, t, r, b).NormalizePoint(Point(px, py)),
160+
EXPECT_EQ(Rect::MakeLTRB(nan, t, r, b).NormalizePoint(Point(px, py)),
161161
Point())
162162
<< "Point(" << pt_desc << ") in Rect NaN Left";
163163
// Scalar point inside Scalar rect with NaN top
164-
ASSERT_EQ(Rect::MakeLTRB(l, nan, r, b).NormalizePoint(Point(px, py)),
164+
EXPECT_EQ(Rect::MakeLTRB(l, nan, r, b).NormalizePoint(Point(px, py)),
165165
Point())
166166
<< "Point(" << pt_desc << ") in Rect NaN Top";
167167
// Scalar point inside Scalar rect with NaN right
168-
ASSERT_EQ(Rect::MakeLTRB(l, t, nan, b).NormalizePoint(Point(px, py)),
168+
EXPECT_EQ(Rect::MakeLTRB(l, t, nan, b).NormalizePoint(Point(px, py)),
169169
Point())
170170
<< "Point(" << pt_desc << ") in Rect NaN Left";
171171
// Scalar point inside Scalar rect with NaN bottom
172-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, nan).NormalizePoint(Point(px, py)),
172+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, nan).NormalizePoint(Point(px, py)),
173173
Point())
174174
<< "Point(" << pt_desc << ") in Rect NaN Top";
175175
// Scalar point inside Scalar rect with infinite left
176-
ASSERT_EQ(Rect::MakeLTRB(-inf, t, r, b).NormalizePoint(Point(px, py)),
176+
EXPECT_EQ(Rect::MakeLTRB(-inf, t, r, b).NormalizePoint(Point(px, py)),
177177
Point())
178178
<< "Point(" << pt_desc << ") in Rect -Inf Left";
179179
// Scalar point inside Scalar rect with infinite top
180-
ASSERT_EQ(Rect::MakeLTRB(l, -inf, r, b).NormalizePoint(Point(px, py)),
180+
EXPECT_EQ(Rect::MakeLTRB(l, -inf, r, b).NormalizePoint(Point(px, py)),
181181
Point())
182182
<< "Point(" << pt_desc << ") in Rect -Inf Top";
183183
// Scalar point inside Scalar rect with infinite right
184-
ASSERT_EQ(Rect::MakeLTRB(l, t, inf, b).NormalizePoint(Point(px, py)),
184+
EXPECT_EQ(Rect::MakeLTRB(l, t, inf, b).NormalizePoint(Point(px, py)),
185185
Point(0, expected.y))
186186
<< "Point(" << pt_desc << ") in Rect Inf Right";
187187
// Scalar point inside Scalar rect with infinite bottom
188-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, inf).NormalizePoint(Point(px, py)),
188+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, inf).NormalizePoint(Point(px, py)),
189189
Point(expected.x, 0))
190190
<< "Point(" << pt_desc << ") in Rect Inf Bottom";
191191

@@ -194,29 +194,29 @@ TEST(RectTest, NormalizePointToNonFiniteRects) {
194194
auto nan_y = Point(px, nan);
195195
auto nan_p = Point(nan, nan);
196196
// Nan Scalar point inside Scalar rect
197-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
197+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_x), Point())
198198
<< "Point(NaN x) in Rect";
199-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
199+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_y), Point())
200200
<< "Point(NaN y) in Rect";
201-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
201+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(nan_p), Point())
202202
<< "Point(NaN x&y) in Rect";
203203

204204
// Testing with infinite points
205205
auto inf_x = Point(inf, py);
206206
auto inf_y = Point(px, inf);
207207
auto inf_p = Point(inf, inf);
208208
// Infinite Scalar point inside Scalar rect
209-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_x), Point())
209+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_x), Point())
210210
<< "Point(Infinite x) in Rect";
211-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_y), Point())
211+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_y), Point())
212212
<< "Point(Infinite y) in Rect";
213-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_p), Point())
213+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(inf_p), Point())
214214
<< "Point(Infinite x&y) in Rect";
215-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_x), Point())
215+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_x), Point())
216216
<< "Point(-Infinite x) in Rect";
217-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_y), Point())
217+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_y), Point())
218218
<< "Point(-Infinite y) in Rect";
219-
ASSERT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_p), Point())
219+
EXPECT_EQ(Rect::MakeLTRB(l, t, r, b).NormalizePoint(-inf_p), Point())
220220
<< "Point(-Infinite x&y) in Rect";
221221
};
222222

0 commit comments

Comments
 (0)