Add float version of gfx::Range

ui/gfx/range/range_unittest.cc

Index: ui/gfx/range/range_unittest.cc
diff --git a/ui/gfx/range/range_unittest.cc b/ui/gfx/range/range_unittest.cc
index 0afaa405ca41e9ac46dc82d8ae1967ce42679547..1e18940cc2680721ce3da4f825abad828f54c886 100644
--- a/ui/gfx/range/range_unittest.cc
+++ b/ui/gfx/range/range_unittest.cc
@@ -5,8 +5,11 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/range/range.h"
 
-TEST(RangeTest, EmptyInit) {
-  gfx::Range r;
+namespace {
+
+template <typename T>
+void EmptyInit() {
+  T r;
   EXPECT_EQ(0U, r.start());
   EXPECT_EQ(0U, r.end());
   EXPECT_EQ(0U, r.length());
@@ -17,8 +20,9 @@ TEST(RangeTest, EmptyInit) {
   EXPECT_EQ(0U, r.GetMax());
 }
 
-TEST(RangeTest, StartEndInit) {
-  gfx::Range r(10, 15);
+template <typename T>
+void StartEndInit() {
+  T r(10, 15);
   EXPECT_EQ(10U, r.start());
   EXPECT_EQ(15U, r.end());
   EXPECT_EQ(5U, r.length());
@@ -29,8 +33,9 @@ TEST(RangeTest, StartEndInit) {
   EXPECT_EQ(15U, r.GetMax());
 }
 
-TEST(RangeTest, StartEndReversedInit) {
-  gfx::Range r(10, 5);
+template <typename T>
+void StartEndReversedInit() {
+  T r(10, 5);
   EXPECT_EQ(10U, r.start());
   EXPECT_EQ(5U, r.end());
   EXPECT_EQ(5U, r.length());
@@ -41,8 +46,9 @@ TEST(RangeTest, StartEndReversedInit) {
   EXPECT_EQ(10U, r.GetMax());
 }
 
-TEST(RangeTest, PositionInit) {
-  gfx::Range r(12);
+template <typename T>
+void PositionInit() {
+  T r(12);
   EXPECT_EQ(12U, r.start());
   EXPECT_EQ(12U, r.end());
   EXPECT_EQ(0U, r.length());
@@ -53,42 +59,43 @@ TEST(RangeTest, PositionInit) {
   EXPECT_EQ(12U, r.GetMax());
 }
 
-TEST(RangeTest, InvalidRange) {
-  gfx::Range r(gfx::Range::InvalidRange());
-  EXPECT_EQ(0U, r.length());
-  EXPECT_EQ(r.start(), r.end());
-  EXPECT_FALSE(r.is_reversed());
+template <typename T>
+void InvalidRange() {
+  T r(T::InvalidRange());
   EXPECT_TRUE(r.is_empty());
   EXPECT_FALSE(r.IsValid());
 }
 
-TEST(RangeTest, Equality) {
-  gfx::Range r1(10, 4);
-  gfx::Range r2(10, 4);
-  gfx::Range r3(10, 2);
+template <typename T>
+void Equality() {
+  T r1(10, 4);
+  T r2(10, 4);
+  T r3(10, 2);
   EXPECT_EQ(r1, r2);
   EXPECT_NE(r1, r3);
   EXPECT_NE(r2, r3);
 
-  gfx::Range r4(11, 4);
+  T r4(11, 4);
   EXPECT_NE(r1, r4);
   EXPECT_NE(r2, r4);
   EXPECT_NE(r3, r4);
 
-  gfx::Range r5(12, 5);
+  T r5(12, 5);
   EXPECT_NE(r1, r5);
   EXPECT_NE(r2, r5);
   EXPECT_NE(r3, r5);
 }
 
-TEST(RangeTest, EqualsIgnoringDirection) {
-  gfx::Range r1(10, 5);
-  gfx::Range r2(5, 10);
+template <typename T>
+void EqualsIgnoringDirection() {
+  T r1(10, 5);
+  T r2(5, 10);
   EXPECT_TRUE(r1.EqualsIgnoringDirection(r2));
 }
 
-TEST(RangeTest, SetStart) {
-  gfx::Range r(10, 20);
+template <typename T>
+void SetStart() {
+  T r(10, 20);
   EXPECT_EQ(10U, r.start());
   EXPECT_EQ(10U, r.length());
 
@@ -99,8 +106,9 @@ TEST(RangeTest, SetStart) {
   EXPECT_TRUE(r.is_reversed());
 }
 
-TEST(RangeTest, SetEnd) {
-  gfx::Range r(10, 13);
+template <typename T>
+void SetEnd() {
+  T r(10, 13);
   EXPECT_EQ(10U, r.start());
   EXPECT_EQ(3U, r.length());
 
@@ -110,8 +118,9 @@ TEST(RangeTest, SetEnd) {
   EXPECT_EQ(10U, r.length());
 }
 
-TEST(RangeTest, SetStartAndEnd) {
-  gfx::Range r;
+template <typename T>
+void SetStartAndEnd() {
+  T r;
   r.set_end(5);
   r.set_start(1);
   EXPECT_EQ(1U, r.start());
@@ -121,8 +130,9 @@ TEST(RangeTest, SetStartAndEnd) {
   EXPECT_EQ(5U, r.GetMax());
 }
 
-TEST(RangeTest, ReversedRange) {
-  gfx::Range r(10, 5);
+template <typename T>
+void ReversedRange() {
+  T r(10, 5);
   EXPECT_EQ(10U, r.start());
   EXPECT_EQ(5U, r.end());
   EXPECT_EQ(5U, r.length());
@@ -132,8 +142,9 @@ TEST(RangeTest, ReversedRange) {
   EXPECT_EQ(10U, r.GetMax());
 }
 
-TEST(RangeTest, SetReversedRange) {
-  gfx::Range r(10, 20);
+template <typename T>
+void SetReversedRange() {
+  T r(10, 20);
   r.set_start(25);
   EXPECT_EQ(25U, r.start());
   EXPECT_EQ(20U, r.end());
@@ -150,12 +161,13 @@ TEST(RangeTest, SetReversedRange) {
   EXPECT_EQ(25U, r.GetMax());
 }
 
-void TestContainsAndIntersects(const gfx::Range& r1,
-                               const gfx::Range& r2,
-                               const gfx::Range& r3) {
+template <typename T>
+void TestContainsAndIntersects(const T& r1,
+                               const T& r2,
+                               const T& r3) {
   EXPECT_TRUE(r1.Intersects(r1));
   EXPECT_TRUE(r1.Contains(r1));
-  EXPECT_EQ(gfx::Range(10, 12), r1.Intersect(r1));
+  EXPECT_EQ(T(10, 12), r1.Intersect(r1));
 
   EXPECT_FALSE(r1.Intersects(r2));
   EXPECT_FALSE(r1.Contains(r2));
@@ -168,36 +180,37 @@ void TestContainsAndIntersects(const gfx::Range& r1,
   EXPECT_TRUE(r3.Intersects(r1));
   EXPECT_TRUE(r3.Contains(r1));
   EXPECT_FALSE(r1.Contains(r3));
-  EXPECT_EQ(gfx::Range(10, 12), r1.Intersect(r3));
-  EXPECT_EQ(gfx::Range(10, 12), r3.Intersect(r1));
+  EXPECT_EQ(T(10, 12), r1.Intersect(r3));
+  EXPECT_EQ(T(10, 12), r3.Intersect(r1));
 
   EXPECT_TRUE(r2.Intersects(r3));
   EXPECT_TRUE(r3.Intersects(r2));
   EXPECT_FALSE(r3.Contains(r2));
   EXPECT_FALSE(r2.Contains(r3));
-  EXPECT_EQ(gfx::Range(5, 8), r2.Intersect(r3));
-  EXPECT_EQ(gfx::Range(5, 8), r3.Intersect(r2));
+  EXPECT_EQ(T(5, 8), r2.Intersect(r3));
+  EXPECT_EQ(T(5, 8), r3.Intersect(r2));
 }
 
-TEST(RangeTest, ContainAndIntersect) {
+template <typename T>
+void ContainAndIntersect() {
   {
     SCOPED_TRACE("contain and intersect");
-    gfx::Range r1(10, 12);
-    gfx::Range r2(1, 8);
-    gfx::Range r3(5, 12);
+    T r1(10, 12);
+    T r2(1, 8);
+    T r3(5, 12);
     TestContainsAndIntersects(r1, r2, r3);
   }
   {
     SCOPED_TRACE("contain and intersect: reversed");
-    gfx::Range r1(12, 10);
-    gfx::Range r2(8, 1);
-    gfx::Range r3(12, 5);
+    T r1(12, 10);
+    T r2(8, 1);
+    T r3(12, 5);
     TestContainsAndIntersects(r1, r2, r3);
   }
   // Invalid rect tests
-  gfx::Range r1(10, 12);
-  gfx::Range r2(8, 1);
-  gfx::Range invalid = r1.Intersect(r2);
+  T r1(10, 12);
+  T r2(8, 1);
+  T invalid = r1.Intersect(r2);
   EXPECT_FALSE(invalid.IsValid());
   EXPECT_FALSE(invalid.Contains(invalid));
   EXPECT_FALSE(invalid.Contains(r1));
@@ -206,3 +219,70 @@ TEST(RangeTest, ContainAndIntersect) {
   EXPECT_FALSE(r1.Contains(invalid));
   EXPECT_FALSE(r1.Intersects(invalid));
 }
+
+}  // namespace
+
+TEST(RangeTest, EmptyInit) {

[Robert Sesek, 2015/01/30 20:47:02]

I'd recommend using
https://code.google.com/p/googletest/wiki/V1_7_AdvancedGuide#Typed_Tests
instead. It'll make the test output more clear.

[ckocagil, 2015/01/31 02:44:39]

Done. I didn't know that existed!

+  EmptyInit<gfx::Range>();
+  EmptyInit<gfx::RangeF>();
+}
+
+TEST(RangeTest, StartEndInit) {
+  StartEndInit<gfx::Range>();
+  StartEndInit<gfx::RangeF>();
+}
+
+TEST(RangeTest, StartEndReversedInit) {
+  StartEndReversedInit<gfx::Range>();
+  StartEndReversedInit<gfx::RangeF>();
+}
+
+TEST(RangeTest, PositionInit) {
+  PositionInit<gfx::Range>();
+  PositionInit<gfx::RangeF>();
+}
+
+TEST(RangeTest, InvalidRange) {
+  InvalidRange<gfx::Range>();
+  InvalidRange<gfx::RangeF>();
+}
+
+TEST(RangeTest, Equality) {
+  Equality<gfx::Range>();
+  Equality<gfx::RangeF>();
+}
+
+TEST(RangeTest, EqualsIgnoringDirection) {
+  EqualsIgnoringDirection<gfx::Range>();
+  EqualsIgnoringDirection<gfx::RangeF>();
+}
+
+TEST(RangeTest, SetStart) {
+  SetStart<gfx::Range>();
+  SetStart<gfx::RangeF>();
+}
+
+TEST(RangeTest, SetEnd) {
+  SetEnd<gfx::Range>();
+  SetEnd<gfx::RangeF>();
+}
+
+TEST(RangeTest, SetStartAndEnd) {
+  SetStartAndEnd<gfx::Range>();
+  SetStartAndEnd<gfx::RangeF>();
+}
+
+TEST(RangeTest, ReversedRange) {
+  ReversedRange<gfx::Range>();
+  ReversedRange<gfx::RangeF>();
+}
+
+TEST(RangeTest, SetReversedRange) {
+  SetReversedRange<gfx::Range>();
+  SetReversedRange<gfx::RangeF>();
+}
+
+TEST(RangeTest, ContainAndIntersect) {
+  ContainAndIntersect<gfx::Range>();
+  ContainAndIntersect<gfx::RangeF>();
+}