Revert D48767992: C++ Cleanup 6/N: YGFloatOptional

Differential Revision:
D48767992

Original commit changeset: afaff0234359

Original Phabricator Diff: D48767992

fbshipit-source-id: 4666bdbb83aebbf2f7373b3a10a8c1dd0a03f92c

tests/YGFloatOptionalTest.cpp

@@ -8,19 +8,18 @@
 #include <gtest/gtest.h>
 
 #include <yoga/numeric/Comparison.h>
-#include <yoga/numeric/FloatOptional.h>
+#include <yoga/YGFloatOptional.h>
 #include <yoga/YGValue.h>
 
 using namespace facebook;
-using namespace facebook::yoga;
 
-constexpr auto empty = FloatOptional{};
-constexpr auto zero = FloatOptional{0.0f};
-constexpr auto one = FloatOptional{1.0f};
-constexpr auto positive = FloatOptional{1234.5f};
-constexpr auto negative = FloatOptional{-9876.5f};
+constexpr auto empty = YGFloatOptional{};
+constexpr auto zero = YGFloatOptional{0.0f};
+constexpr auto one = YGFloatOptional{1.0f};
+constexpr auto positive = YGFloatOptional{1234.5f};
+constexpr auto negative = YGFloatOptional{-9876.5f};
 
-TEST(FloatOptional, value) {
+TEST(YGFloatOptional, value) {
   ASSERT_TRUE(YGFloatIsUndefined(empty.unwrap()));
   ASSERT_EQ(zero.unwrap(), 0.0f);
   ASSERT_EQ(one.unwrap(), 1.0f);
@@ -34,7 +33,7 @@ TEST(FloatOptional, value) {
   ASSERT_FALSE(negative.isUndefined());
 }
 
-TEST(FloatOptional, equality) {
+TEST(YGFloatOptional, equality) {
   ASSERT_TRUE(empty == empty);
   ASSERT_TRUE(empty == YGUndefined);
   ASSERT_FALSE(empty == zero);
@@ -59,7 +58,7 @@ TEST(FloatOptional, equality) {
   ASSERT_FALSE(negative == zero);
 }
 
-TEST(FloatOptional, inequality) {
+TEST(YGFloatOptional, inequality) {
   ASSERT_FALSE(empty != empty);
   ASSERT_FALSE(empty != YGUndefined);
   ASSERT_TRUE(empty != zero);
@@ -84,7 +83,7 @@ TEST(FloatOptional, inequality) {
   ASSERT_TRUE(negative != zero);
 }
 
-TEST(FloatOptional, greater_than_with_undefined) {
+TEST(YGFloatOptional, greater_than_with_undefined) {
   ASSERT_FALSE(empty > empty);
   ASSERT_FALSE(empty > zero);
   ASSERT_FALSE(empty > one);
@@ -96,7 +95,7 @@ TEST(FloatOptional, greater_than_with_undefined) {
   ASSERT_FALSE(negative > empty);
 }
 
-TEST(FloatOptional, greater_than) {
+TEST(YGFloatOptional, greater_than) {
   ASSERT_TRUE(zero > negative);
   ASSERT_FALSE(zero > zero);
   ASSERT_FALSE(zero > positive);
@@ -106,10 +105,10 @@ TEST(FloatOptional, greater_than) {
   ASSERT_TRUE(one > zero);
   ASSERT_FALSE(one > positive);
 
-  ASSERT_TRUE(negative > FloatOptional{-INFINITY});
+  ASSERT_TRUE(negative > YGFloatOptional{-INFINITY});
 }
 
-TEST(FloatOptional, less_than_with_undefined) {
+TEST(YGFloatOptional, less_than_with_undefined) {
   ASSERT_FALSE(empty < empty);
   ASSERT_FALSE(zero < empty);
   ASSERT_FALSE(one < empty);
@@ -121,7 +120,7 @@ TEST(FloatOptional, less_than_with_undefined) {
   ASSERT_FALSE(empty < negative);
 }
 
-TEST(FloatOptional, less_than) {
+TEST(YGFloatOptional, less_than) {
   ASSERT_TRUE(negative < zero);
   ASSERT_FALSE(zero < zero);
   ASSERT_FALSE(positive < zero);
@@ -131,10 +130,10 @@ TEST(FloatOptional, less_than) {
   ASSERT_TRUE(zero < one);
   ASSERT_FALSE(positive < one);
 
-  ASSERT_TRUE(FloatOptional{-INFINITY} < negative);
+  ASSERT_TRUE(YGFloatOptional{-INFINITY} < negative);
 }
 
-TEST(FloatOptional, greater_than_equals_with_undefined) {
+TEST(YGFloatOptional, greater_than_equals_with_undefined) {
   ASSERT_TRUE(empty >= empty);
   ASSERT_FALSE(empty >= zero);
   ASSERT_FALSE(empty >= one);
@@ -146,7 +145,7 @@ TEST(FloatOptional, greater_than_equals_with_undefined) {
   ASSERT_FALSE(negative >= empty);
 }
 
-TEST(FloatOptional, greater_than_equals) {
+TEST(YGFloatOptional, greater_than_equals) {
   ASSERT_TRUE(zero >= negative);
   ASSERT_TRUE(zero >= zero);
   ASSERT_FALSE(zero >= positive);
@@ -156,10 +155,10 @@ TEST(FloatOptional, greater_than_equals) {
   ASSERT_TRUE(one >= zero);
   ASSERT_FALSE(one >= positive);
 
-  ASSERT_TRUE(negative >= FloatOptional{-INFINITY});
+  ASSERT_TRUE(negative >= YGFloatOptional{-INFINITY});
 }
 
-TEST(FloatOptional, less_than_equals_with_undefined) {
+TEST(YGFloatOptional, less_than_equals_with_undefined) {
   ASSERT_TRUE(empty <= empty);
   ASSERT_FALSE(zero <= empty);
   ASSERT_FALSE(one <= empty);
@@ -171,7 +170,7 @@ TEST(FloatOptional, less_than_equals_with_undefined) {
   ASSERT_FALSE(empty <= negative);
 }
 
-TEST(FloatOptional, less_than_equals) {
+TEST(YGFloatOptional, less_than_equals) {
   ASSERT_TRUE(negative <= zero);
   ASSERT_TRUE(zero <= zero);
   ASSERT_FALSE(positive <= zero);
@@ -181,32 +180,32 @@ TEST(FloatOptional, less_than_equals) {
   ASSERT_TRUE(zero <= one);
   ASSERT_FALSE(positive <= one);
 
-  ASSERT_TRUE(FloatOptional{-INFINITY} <= negative);
+  ASSERT_TRUE(YGFloatOptional{-INFINITY} <= negative);
 }
 
-TEST(FloatOptional, addition) {
+TEST(YGFloatOptional, addition) {
   auto n = negative.unwrap();
   auto p = positive.unwrap();
 
   ASSERT_EQ(zero + one, one);
-  ASSERT_EQ(negative + positive, FloatOptional{n + p});
+  ASSERT_EQ(negative + positive, YGFloatOptional{n + p});
   ASSERT_EQ(empty + zero, empty);
   ASSERT_EQ(empty + empty, empty);
   ASSERT_EQ(negative + empty, empty);
 }
 
-TEST(YGFloatOptiona, maxOrDefined) {
+TEST(YGFloatOptionalTest, maxOrDefined) {
   ASSERT_EQ(yoga::maxOrDefined(empty, empty), empty);
   ASSERT_EQ(yoga::maxOrDefined(empty, positive), positive);
   ASSERT_EQ(yoga::maxOrDefined(negative, empty), negative);
-  ASSERT_EQ(yoga::maxOrDefined(negative, FloatOptional{-INFINITY}), negative);
+  ASSERT_EQ(yoga::maxOrDefined(negative, YGFloatOptional{-INFINITY}), negative);
   ASSERT_EQ(
-      yoga::maxOrDefined(FloatOptional{1.0f}, FloatOptional{1.125f}),
-      FloatOptional{1.125f});
+      yoga::maxOrDefined(YGFloatOptional{1.0f}, YGFloatOptional{1.125f}),
+      YGFloatOptional{1.125f});
 }
 
-TEST(FloatOptional, unwrap) {
+TEST(YGFloatOptionalTest, unwrap) {
   ASSERT_TRUE(YGFloatIsUndefined(empty.unwrap()));
   ASSERT_EQ(zero.unwrap(), 0.0f);
-  ASSERT_EQ(FloatOptional{123456.78f}.unwrap(), 123456.78f);
+  ASSERT_EQ(YGFloatOptional{123456.78f}.unwrap(), 123456.78f);
 }

tests/YGStyleAccessorsTest.cpp

@@ -154,24 +154,24 @@ ACCESSOR_TEST(display, YGDisplayFlex, YGDisplayNone, YGDisplayFlex)
 
 ACCESSOR_TEST(
     flex,
-    FloatOptional{},
-    FloatOptional{123.45f},
-    FloatOptional{-9.87f},
-    FloatOptional{})
+    YGFloatOptional{},
+    YGFloatOptional{123.45f},
+    YGFloatOptional{-9.87f},
+    YGFloatOptional{})
 
 ACCESSOR_TEST(
     flexGrow,
-    FloatOptional{},
-    FloatOptional{123.45f},
-    FloatOptional{-9.87f},
-    FloatOptional{})
+    YGFloatOptional{},
+    YGFloatOptional{123.45f},
+    YGFloatOptional{-9.87f},
+    YGFloatOptional{})
 
 ACCESSOR_TEST(
     flexShrink,
-    FloatOptional{},
-    FloatOptional{123.45f},
-    FloatOptional{-9.87f},
-    FloatOptional{})
+    YGFloatOptional{},
+    YGFloatOptional{123.45f},
+    YGFloatOptional{-9.87f},
+    YGFloatOptional{})
 
 ACCESSOR_TEST(
     flexBasis,
@@ -243,11 +243,11 @@ INDEX_ACCESSOR_TEST(
 
 ACCESSOR_TEST(
     aspectRatio,
-    FloatOptional{},
-    FloatOptional{-123.45f},
-    FloatOptional{9876.5f},
-    FloatOptional{0.0f},
-    FloatOptional{});
+    YGFloatOptional{},
+    YGFloatOptional{-123.45f},
+    YGFloatOptional{9876.5f},
+    YGFloatOptional{0.0f},
+    YGFloatOptional{});
 
 #endif