diff options
author | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:29:05 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-06-29 15:30:06 +0300 |
commit | 18bff53c997f5bfac0435b8a03ee967eed8c9e20 (patch) | |
tree | b0d3b788a7e2a64f746ba96e3456f01d7b274ca2 /tests | |
parent | 4fc5233467b1c273cdb82b221d8faa53249b99c6 (diff) |
BLI: remove blender::Optional in favor of std::optional
`std::optional` can be used now, because we switched to C++17.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/gtests/blenlib/BLI_map_test.cc | 2 | ||||
-rw-r--r-- | tests/gtests/blenlib/BLI_optional_test.cc | 61 | ||||
-rw-r--r-- | tests/gtests/blenlib/CMakeLists.txt | 1 |
3 files changed, 1 insertions, 63 deletions
diff --git a/tests/gtests/blenlib/BLI_map_test.cc b/tests/gtests/blenlib/BLI_map_test.cc index 79a8786def9..7a67255d8d3 100644 --- a/tests/gtests/blenlib/BLI_map_test.cc +++ b/tests/gtests/blenlib/BLI_map_test.cc @@ -88,7 +88,7 @@ TEST(map, PopTry) map.add(1, 5); map.add(2, 7); EXPECT_EQ(map.size(), 2u); - Optional<int> value = map.pop_try(4); + std::optional<int> value = map.pop_try(4); EXPECT_EQ(map.size(), 2u); EXPECT_FALSE(value.has_value()); value = map.pop_try(2); diff --git a/tests/gtests/blenlib/BLI_optional_test.cc b/tests/gtests/blenlib/BLI_optional_test.cc deleted file mode 100644 index 2fc2188563e..00000000000 --- a/tests/gtests/blenlib/BLI_optional_test.cc +++ /dev/null @@ -1,61 +0,0 @@ -#include "BLI_optional.hh" -#include "BLI_strict_flags.h" -#include "testing/testing.h" -#include <string> - -using namespace blender; - -TEST(optional, DefaultConstructor) -{ - Optional<int> a; - EXPECT_FALSE(a.has_value()); -} - -TEST(optional, ValueConstructor) -{ - Optional<int> a(5); - EXPECT_TRUE(a.has_value()); - EXPECT_EQ(a.value(), 5); -} - -TEST(optional, CopyConstructor) -{ - Optional<std::string> a("Hello"); - Optional<std::string> b = a; - EXPECT_TRUE(a.has_value()); - EXPECT_TRUE(b.has_value()); - b.value()[0] = 'T'; - EXPECT_EQ(a.value(), "Hello"); - EXPECT_EQ(b.value(), "Tello"); -} - -TEST(optional, Reset) -{ - Optional<int> a(4); - EXPECT_TRUE(a.has_value()); - a.reset(); - EXPECT_FALSE(a.has_value()); -} - -TEST(optional, Extract) -{ - Optional<int> a(32); - EXPECT_TRUE(a.has_value()); - EXPECT_EQ(a.extract(), 32); - EXPECT_FALSE(a.has_value()); -} - -TEST(optional, ArrowOperator) -{ - Optional<std::string> value = std::string("Hello"); - EXPECT_TRUE(value.has_value()); - EXPECT_EQ(value->size(), 5); -} - -TEST(optional, StarOperator) -{ - Optional<std::string> value = std::string("Hello"); - EXPECT_TRUE(value.has_value()); - std::string &s = *value; - EXPECT_EQ(s.size(), 5); -} diff --git a/tests/gtests/blenlib/CMakeLists.txt b/tests/gtests/blenlib/CMakeLists.txt index 31c8e983292..ba493b22b42 100644 --- a/tests/gtests/blenlib/CMakeLists.txt +++ b/tests/gtests/blenlib/CMakeLists.txt @@ -63,7 +63,6 @@ BLENDER_TEST(BLI_math_geom "bf_blenlib") BLENDER_TEST(BLI_math_matrix "bf_blenlib") BLENDER_TEST(BLI_math_vector "bf_blenlib") BLENDER_TEST(BLI_memiter "bf_blenlib") -BLENDER_TEST(BLI_optional "bf_blenlib") BLENDER_TEST(BLI_path_util "${BLI_path_util_extra_libs}") BLENDER_TEST(BLI_polyfill_2d "bf_blenlib") BLENDER_TEST(BLI_set "bf_blenlib") |