Refactor result creation in tests

GregoryKogan · Dec 23, 2023 · f152e40 · f152e40
1 parent 9812953
commit f152e40
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/tests/is_ok.cpp b/tests/is_ok.cpp
@@ -4,13 +4,13 @@
 
 TEST(IsOk, Ok) {
   const int value = 5;
-  res::Result<int, std::string> result = res::Result<int, std::string>::Ok(value);
+  res::Result<int, std::string> result = res::Ok(value);
   EXPECT_TRUE(result.is_ok());
   EXPECT_FALSE(result.is_err());
 }
 
 TEST(IsOk, Err) {
-  res::Result<int, std::string> result = res::Result<int, std::string>::Err(std::string("Something went wrong"));
+  res::Result<int, std::string> result = res::Err(std::string("Something went wrong"));
   EXPECT_FALSE(result.is_ok());
   EXPECT_TRUE(result.is_err());
 }
diff --git a/tests/type_edgecases.cpp b/tests/type_edgecases.cpp
@@ -5,8 +5,8 @@
 TEST(Types, SameInt) {
   const int value = 42;
   const int error = 43;
-  auto ok_result = res::Result<int, int>::Ok(value);
-  auto err_result = res::Result<int, int>::Err(error);
+  res::Result<int, int> ok_result = res::Ok(value);
+  res::Result<int, int> err_result = res::Err(error);
 
   EXPECT_TRUE(ok_result.is_ok());
   EXPECT_FALSE(ok_result.is_err());
@@ -22,8 +22,8 @@ TEST(Types, SameInt) {
 TEST(Types, SameString) {
   const std::string value = "Hello";
   const std::string error = "World";
-  auto ok_result = res::Result<std::string, std::string>::Ok(value);
-  auto err_result = res::Result<std::string, std::string>::Err(error);
+  res::Result<std::string, std::string> ok_result = res::Ok(value);
+  res::Result<std::string, std::string> err_result = res::Err(error);
 
   EXPECT_TRUE(ok_result.is_ok());
   EXPECT_FALSE(ok_result.is_err());
@@ -37,8 +37,8 @@ TEST(Types, SameString) {
 }
 
 TEST(Types, EmptyValue) {
-  auto empty_ok_result = res::Result<std::monostate, std::string>::Ok();
-  auto empty_err_result = res::Result<std::monostate, std::string>::Err("Hello");
+  res::Result<std::monostate, std::string> empty_ok_result = res::Ok();
+  res::Result<std::monostate, std::string> empty_err_result = res::Err(std::string("Hello"));
 
   EXPECT_TRUE(empty_ok_result.is_ok());
   EXPECT_FALSE(empty_ok_result.is_err());

diff --git a/tests/unwrap.cpp b/tests/unwrap.cpp
@@ -4,15 +4,15 @@
 
 TEST(Unwrap, Ok) {
   const int value = 5;
-  res::Result<int, std::string> result = res::Result<int, std::string>::Ok(value);
+  res::Result<int, std::string> result = res::Ok(value);
 
   EXPECT_EQ(result.unwrap(), value);
   EXPECT_THROW(auto res = result.unwrap_err(), std::runtime_error);
 }
 
 TEST(Unwrap, Err) {
   const std::string value = "Something went wrong";
-  res::Result<int, std::string> result = res::Result<int, std::string>::Err(value);
+  res::Result<int, std::string> result = res::Err(value);
 
   EXPECT_EQ(result.unwrap_err(), value);
   EXPECT_THROW(auto res = result.unwrap(), std::runtime_error);