unit tests for new optional<Rect> functions

Author: flar

impeller/geometry/geometry_unittests.cc

@@ -1644,6 +1644,58 @@ TEST(GeometryTest, RectUnion) {
   }
 }
 
+TEST(GeometryTest, OptRectUnion) {
+  Rect a = Rect::MakeLTRB(0, 0, 100, 100);
+  Rect b = Rect::MakeLTRB(100, 100, 200, 200);
+  Rect c = Rect::MakeLTRB(100, 0, 200, 100);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(Union(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(Union(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const Rect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(Union(r, std::nullopt).has_value());
+    EXPECT_EQ(Union(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(Union(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(Union(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(Union(std::nullopt, r).has_value());
+    EXPECT_EQ(Union(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(Union(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(Union(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const Rect& a, const Rect& b, const Rect& u) {
+    ASSERT_EQ(a.Union(b), u);
+
+    // Rect, OptRect
+    EXPECT_TRUE(Union(a, std::optional(b)).has_value());
+    EXPECT_EQ(Union(a, std::optional(b)).value(), u);
+
+    // OptRect, Rect
+    EXPECT_TRUE(Union(std::optional(a), b).has_value());
+    EXPECT_EQ(Union(std::optional(a), b).value(), u);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(Union(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(Union(std::optional(a), std::optional(b)).value(), u);
+  };
+
+  test2(a, b, Rect::MakeLTRB(0, 0, 200, 200));
+  test2(a, c, Rect::MakeLTRB(0, 0, 200, 100));
+  test2(b, c, Rect::MakeLTRB(100, 0, 200, 200));
+}
+
 TEST(GeometryTest, RectIntersection) {
   {
     Rect a(100, 100, 100, 100);
@@ -1693,6 +1745,58 @@ TEST(GeometryTest, RectIntersection) {
   }
 }
 
+TEST(GeometryTest, OptRectIntersection) {
+  Rect a = Rect::MakeLTRB(0, 0, 110, 110);
+  Rect b = Rect::MakeLTRB(100, 100, 200, 200);
+  Rect c = Rect::MakeLTRB(100, 0, 200, 110);
+
+  // NullOpt, NullOpt
+  EXPECT_FALSE(Intersection(std::nullopt, std::nullopt).has_value());
+  EXPECT_EQ(Intersection(std::nullopt, std::nullopt), std::nullopt);
+
+  auto test1 = [](const Rect& r) {
+    // Rect, NullOpt
+    EXPECT_TRUE(Intersection(r, std::nullopt).has_value());
+    EXPECT_EQ(Intersection(r, std::nullopt).value(), r);
+
+    // OptRect, NullOpt
+    EXPECT_TRUE(Intersection(std::optional(r), std::nullopt).has_value());
+    EXPECT_EQ(Intersection(std::optional(r), std::nullopt).value(), r);
+
+    // NullOpt, Rect
+    EXPECT_TRUE(Intersection(std::nullopt, r).has_value());
+    EXPECT_EQ(Intersection(std::nullopt, r).value(), r);
+
+    // NullOpt, OptRect
+    EXPECT_TRUE(Intersection(std::nullopt, std::optional(r)).has_value());
+    EXPECT_EQ(Intersection(std::nullopt, std::optional(r)).value(), r);
+  };
+
+  test1(a);
+  test1(b);
+  test1(c);
+
+  auto test2 = [](const Rect& a, const Rect& b, const Rect& i) {
+    ASSERT_EQ(a.Intersection(b), i);
+
+    // Rect, OptRect
+    EXPECT_TRUE(Intersection(a, std::optional(b)).has_value());
+    EXPECT_EQ(Intersection(a, std::optional(b)).value(), i);
+
+    // OptRect, Rect
+    EXPECT_TRUE(Intersection(std::optional(a), b).has_value());
+    EXPECT_EQ(Intersection(std::optional(a), b).value(), i);
+
+    // OptRect, OptRect
+    EXPECT_TRUE(Intersection(std::optional(a), std::optional(b)).has_value());
+    EXPECT_EQ(Intersection(std::optional(a), std::optional(b)).value(), i);
+  };
+
+  test2(a, b, Rect::MakeLTRB(100, 100, 110, 110));
+  test2(a, c, Rect::MakeLTRB(100, 0, 110, 110));
+  test2(b, c, Rect::MakeLTRB(100, 100, 200, 110));
+}
+
 TEST(GeometryTest, RectIntersectsWithRect) {
   {
     Rect a(100, 100, 100, 100);