Skip to content

Commit 6588bcc

Browse files
Ink Open Sourcecopybara-github
Ink Open Source
authored and
copybara-github
committed
Cleanup: Use status matchers in geometry tests
PiperOrigin-RevId: 914284550
1 parent 3f0e6a8 commit 6588bcc

10 files changed

Lines changed: 1945 additions & 1991 deletions

‎ink/geometry/BUILD.bazel‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@ cc_test(
365365
":triangle",
366366
":type_matchers",
367367
"@com_google_absl//absl/status",
368+
"@com_google_absl//absl/status:status_matchers",
368369
"@com_google_absl//absl/status:statusor",
369370
"@com_google_absl//absl/types:span",
370371
"@com_google_googletest//:gtest_main",
@@ -527,6 +528,7 @@ cc_test(
527528
"//ink/types:small_array",
528529
"@com_google_absl//absl/container:inlined_vector",
529530
"@com_google_absl//absl/status",
531+
"@com_google_absl//absl/status:status_matchers",
530532
"@com_google_absl//absl/strings",
531533
"@com_google_absl//absl/types:span",
532534
"@com_google_fuzztest//fuzztest",
@@ -570,6 +572,7 @@ cc_test(
570572
":type_matchers",
571573
"//ink/geometry/internal:mesh_packing",
572574
"@com_google_absl//absl/status",
575+
"@com_google_absl//absl/status:status_matchers",
573576
"@com_google_absl//absl/status:statusor",
574577
"@com_google_absl//absl/types:span",
575578
"@com_google_googletest//:gtest_main",
@@ -610,6 +613,7 @@ cc_test(
610613
deps = [
611614
":affine_transform",
612615
":angle",
616+
":mesh",
613617
":mesh_format",
614618
":mesh_test_helpers",
615619
":mutable_mesh",

‎ink/geometry/internal/BUILD.bazel‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ cc_test(
5858
"//ink/geometry:vec",
5959
"@com_google_absl//absl/container:inlined_vector",
6060
"@com_google_absl//absl/status",
61+
"@com_google_absl//absl/status:status_matchers",
6162
"@com_google_absl//absl/status:statusor",
6263
"@com_google_absl//absl/types:span",
6364
"@com_google_googletest//:gtest_main",
@@ -296,6 +297,7 @@ cc_test(
296297
"@com_google_absl//absl/container:inlined_vector",
297298
"@com_google_absl//absl/log:absl_check",
298299
"@com_google_absl//absl/status",
300+
"@com_google_absl//absl/status:status_matchers",
299301
"@com_google_absl//absl/types:span",
300302
"@com_google_googletest//:gtest_main",
301303
],

‎ink/geometry/internal/algorithms_test.cc‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "gtest/gtest.h"
2222
#include "absl/container/inlined_vector.h"
2323
#include "absl/status/status.h"
24+
#include "absl/status/status_matchers.h"
2425
#include "absl/status/statusor.h"
2526
#include "absl/types/span.h"
2627
#include "ink/geometry/affine_transform.h"
@@ -40,12 +41,14 @@ namespace ink {
4041
namespace geometry_internal {
4142
namespace {
4243

44+
using ::absl_testing::IsOkAndHolds;
4345
using ::testing::ElementsAre;
4446
using ::testing::Eq;
4547
using ::testing::FloatEq;
4648
using ::testing::FloatNear;
4749
using ::testing::Optional;
4850
using ::testing::Pair;
51+
using ::testing::SizeIs;
4952

5053
TEST(GetBarycentricCoordinatesTest, NonDegenerateTriangle) {
5154
Triangle triangle{.p0 = {1, 2}, .p1 = {4, 2}, .p2 = {1, 8}};
@@ -408,14 +411,12 @@ TEST(SegmentIntersectionTest, NoIntersection) {
408411
TEST(CalculateCollapsedSegmentTest, CollapseToPointSingleMesh) {
409412
absl::StatusOr<absl::InlinedVector<Mesh, 1>> star_meshes =
410413
MakeStarMutableMesh(6).AsMeshes();
411-
ASSERT_EQ(star_meshes.status(), absl::OkStatus());
414+
ASSERT_THAT(star_meshes, IsOkAndHolds(SizeIs(1)));
412415

413416
absl::StatusOr<absl::InlinedVector<Mesh, 1>> line_meshes =
414417
MakeStraightLineMutableMesh(3).AsMeshes();
415-
ASSERT_EQ(line_meshes.status(), absl::OkStatus());
418+
ASSERT_THAT(line_meshes, IsOkAndHolds(SizeIs(1)));
416419

417-
ASSERT_EQ(star_meshes->size(), 1);
418-
ASSERT_EQ(line_meshes->size(), 1);
419420
const Mesh& star_mesh = (*star_meshes)[0];
420421
const Mesh& line_mesh = (*line_meshes)[0];
421422

@@ -435,14 +436,12 @@ TEST(CalculateCollapsedSegmentTest, CollapseToPointSingleMesh) {
435436
TEST(CalculateCollapsedSegmentTest, CollapseToPointMultipleMeshes) {
436437
absl::StatusOr<absl::InlinedVector<Mesh, 1>> star_meshes =
437438
MakeStarMutableMesh(6).AsMeshes();
438-
ASSERT_EQ(star_meshes.status(), absl::OkStatus());
439+
ASSERT_THAT(star_meshes, IsOkAndHolds(SizeIs(1)));
439440

440441
absl::StatusOr<absl::InlinedVector<Mesh, 1>> line_meshes =
441442
MakeStraightLineMutableMesh(3).AsMeshes();
442-
ASSERT_EQ(line_meshes.status(), absl::OkStatus());
443+
ASSERT_THAT(line_meshes, IsOkAndHolds(SizeIs(1)));
443444

444-
ASSERT_EQ(star_meshes->size(), 1);
445-
ASSERT_EQ(line_meshes->size(), 1);
446445
std::vector<Mesh> meshes = {(*star_meshes)[0], (*line_meshes)[0]};
447446
Envelope bounds = meshes[0].Bounds();
448447
bounds.Add(meshes[1].Bounds());
@@ -460,14 +459,12 @@ TEST(CalculateCollapsedSegmentTest, CollapseToPointMultipleMeshes) {
460459
TEST(CalculateCollapsedSegmentTest, CollapseToSegmentSingleMesh) {
461460
absl::StatusOr<absl::InlinedVector<Mesh, 1>> star_meshes =
462461
MakeStarMutableMesh(6).AsMeshes();
463-
ASSERT_EQ(star_meshes.status(), absl::OkStatus());
462+
ASSERT_THAT(star_meshes, IsOkAndHolds(SizeIs(1)));
464463

465464
absl::StatusOr<absl::InlinedVector<Mesh, 1>> line_meshes =
466465
MakeStraightLineMutableMesh(3).AsMeshes();
467-
ASSERT_EQ(line_meshes.status(), absl::OkStatus());
466+
ASSERT_THAT(line_meshes, IsOkAndHolds(SizeIs(1)));
468467

469-
ASSERT_EQ(star_meshes->size(), 1);
470-
ASSERT_EQ(line_meshes->size(), 1);
471468
const Mesh& star_mesh = (*star_meshes)[0];
472469
const Mesh& line_mesh = (*line_meshes)[0];
473470

@@ -494,14 +491,12 @@ TEST(CalculateCollapsedSegmentTest, CollapseToSegmentSingleMesh) {
494491
TEST(CalculateCollapsedSegmentTest, CollapseToSegmentMultipleMeshes) {
495492
absl::StatusOr<absl::InlinedVector<Mesh, 1>> star_meshes =
496493
MakeStarMutableMesh(6).AsMeshes();
497-
ASSERT_EQ(star_meshes.status(), absl::OkStatus());
494+
ASSERT_THAT(star_meshes, IsOkAndHolds(SizeIs(1)));
498495

499496
absl::StatusOr<absl::InlinedVector<Mesh, 1>> line_meshes =
500497
MakeStraightLineMutableMesh(3).AsMeshes();
501-
ASSERT_EQ(line_meshes.status(), absl::OkStatus());
498+
ASSERT_THAT(line_meshes, IsOkAndHolds(SizeIs(1)));
502499

503-
ASSERT_EQ(star_meshes->size(), 1);
504-
ASSERT_EQ(line_meshes->size(), 1);
505500
std::vector<Mesh> meshes = {(*star_meshes)[0], (*line_meshes)[0]};
506501
Envelope bounds = meshes[0].Bounds();
507502
bounds.Add(meshes[1].Bounds());

0 commit comments

Comments
 (0)