Add BoxF::ExpandTo

ui/gfx/box_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/box_f.h"
 
 namespace gfx {
 
@@ skipping 60 matching lines @@
   EXPECT_EQ(BoxF(0.f, 0.f, 0.f, 9.f, 8.f, 5.f).ToString(),
             UnionBoxes(box3, box1).ToString());
 
   // box_2 and box_3 intersect, but neither contains the other
   EXPECT_EQ(BoxF(0.f, 0.f, 0.f, 9.f, 8.f, 8.f).ToString(),
             UnionBoxes(box2, box3).ToString());
   EXPECT_EQ(BoxF(0.f, 0.f, 0.f, 9.f, 8.f, 8.f).ToString(),
             UnionBoxes(box3, box2).ToString());
 }
 
+TEST(BoxTest, ExpandTo) {
+  BoxF box1;
+  BoxF box2(0.f, 0.f, 0.f, 1.f, 1.f, 1.f);
+  BoxF box3(1.f, 1.f, 1.f, 0.f, 0.f, 0.f);
+
+  Point3F point1(0.5f, 0.5f, 0.5f);
+  Point3F point2(-0.5f, -0.5f, -0.5f);
+
+  BoxF expected1_1(0.f, 0.f, 0.f, 0.5f, 0.5f, 0.5f);
+  BoxF expected1_2(-0.5f, -0.5f, -0.5f, 1.f, 1.f, 1.f);
+
+  BoxF expected2_1 = box2;
+  BoxF expected2_2(-0.5f, -0.5f, -0.5f, 1.5f, 1.5f, 1.5f);
+
+  BoxF expected3_1(0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f);
+  BoxF expected3_2(-0.5f, -0.5f, -0.5f, 1.5f, 1.5f, 1.5f);
+
+  box1.ExpandTo(point1);
+  EXPECT_EQ(box1.ToString(), expected1_1.ToString());

[danakj, 2013/10/01 14:23:44]

expected values come first

+  box1.ExpandTo(point2);
+  EXPECT_EQ(box1.ToString(), expected1_2.ToString());
+
+  box2.ExpandTo(point1);
+  EXPECT_EQ(box2.ToString(), expected2_1.ToString());
+  box2.ExpandTo(point2);
+  EXPECT_EQ(box2.ToString(), expected2_2.ToString());
+
+  box3.ExpandTo(point1);
+  EXPECT_EQ(box3.ToString(), expected3_1.ToString());
+  box3.ExpandTo(point2);
+  EXPECT_EQ(box3.ToString(), expected3_2.ToString());
+}
+
 TEST(BoxTest, Scale) {
   BoxF box1(2.f, 3.f, 4.f, 5.f, 6.f, 7.f);
 
   EXPECT_EQ(BoxF().ToString(), ScaleBox(box1, 0.f).ToString());
   EXPECT_EQ(box1.ToString(), ScaleBox(box1, 1.f).ToString());
   EXPECT_EQ(BoxF(4.f, 12.f, 24.f, 10.f, 24.f, 42.f).ToString(),
             ScaleBox(box1, 2.f, 4.f, 6.f).ToString());
 
   BoxF box2 = box1;
   box2.Scale(0.f);
@@ skipping 43 matching lines @@
   BoxF box2 = box1;
   box2 += Vector3dF(0.f, 0.f, 0.f);
   EXPECT_EQ(box1.ToString(), box2.ToString());
 
   box2 += Vector3dF(1.f, -2.f, -4.f);
   EXPECT_EQ(BoxF(3.f, 1.f, 0.f, 5.f, 6.f, 7.f).ToString(),
             box2.ToString());
 }
 
 }  // namespace gfx