Reverted commit D3557832

[folly.git] / folly / test / StringTest.cpp

diff --git a/folly/test/StringTest.cpp b/folly/test/StringTest.cpp
index c01cca5ddf07776b618211eaba06087571a2de23..76cf6ac40f78c0bdd8d300ed2dff5e98e945b02c 100644 (file)
--- a/folly/test/StringTest.cpp
+++ b/folly/test/StringTest.cpp
@@ -921,27 +921,14 @@ enum class Color {
   Blue,
 };
 
-enum class ColorErrorCode { INVALID_COLOR };
-
-struct ColorError : std::runtime_error {
-  using std::runtime_error::runtime_error;
-};
-
-ColorError makeConversionError(ColorErrorCode, StringPiece sp) {
-  return ColorError("Invalid my::Color representation : " + sp.str());
-}
-
-Expected<StringPiece, ColorErrorCode> parseTo(
-    StringPiece in,
-    Color& out) noexcept {
+void parseTo(folly::StringPiece in, Color& out) {
   if (in == "R") {
     out = Color::Red;
   } else if (in == "B") {
     out = Color::Blue;
   } else {
-    return makeUnexpected(ColorErrorCode::INVALID_COLOR);
+    throw runtime_error("");
   }
-  return StringPiece(in.end(), in.end());
 }
 }
 
@@ -951,8 +938,6 @@ TEST(Split, fixed_convert_custom) {
   EXPECT_TRUE(folly::split(',', "R,B", c1, c2));
   EXPECT_EQ(c1, my::Color::Red);
   EXPECT_EQ(c2, my::Color::Blue);
-
-  EXPECT_THROW(folly::split(',', "B,G", c1, c2), my::ColorError);
 }
 
 TEST(String, join) {