TartanLlama/optional
1
0
Fork 1
mirror of https://github.com/TartanLlama/optional.git synced 2025-08-01 02:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

More tests

Browse Source
This commit is contained in:
Simon Brand
2017-10-21 21:24:34 +01:00
parent 701f0ace93
commit 0950f2e721
4 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -16,6 +16,8 @@ set(TEST_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/observers.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/extensions.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/constexpr.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/constructors.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/assignment.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tests/nullopt.cpp)
add_executable(tests ${TEST_SOURCES})

8
optional.hpp
View File

@@ -977,7 +977,7 @@ public:
optional &operator=(const optional<U> &rhs) {
if (has_value()) {
if (rhs.has_value()) {
this->m_value = rhs.m_value;
this->m_value = *rhs;
} else {
this->m_value.~T();
this->m_has_value = false;
@@ -985,7 +985,7 @@ public:
}
if (rhs.has_value()) {
new (std::addressof(this->m_value)) T(rhs.m_value);
new (std::addressof(this->m_value)) T(*rhs);
this->m_has_value = true;
}
}
@@ -999,7 +999,7 @@ public:
optional &operator=(optional<U> &&rhs) {
if (has_value()) {
if (rhs.has_value()) {
this->m_value = std::move(rhs.m_value);
this->m_value = std::move(*rhs);
} else {
this->m_value.~T();
this->m_has_value = false;
@@ -1007,7 +1007,7 @@ public:
}
if (rhs.has_value()) {
new (std::addressof(this->m_value)) T(std::move(rhs.m_value));
new (std::addressof(this->m_value)) T(std::move(*rhs));
this->m_has_value = true;
}
}

32
tests/assignment.cpp
View File

@@ -1,4 +1,34 @@
#include "catch.hpp"
#include "optional.hpp"
TEST_CASE("Assignment", "[assignment]") {}
TEST_CASE("Assignment", "[assignment]") {
tl::optional<int> o1 = 42;
tl::optional<int> o2 = 12;
tl::optional<int> o3;
o1 = o1;
REQUIRE(*o1 == 42);
o1 = o2;
REQUIRE(*o1 == 12);
o1 = o3;
REQUIRE(!o1);
o1 = 42;
REQUIRE(*o1 == 42);
o1 = tl::nullopt;
REQUIRE(!o1);
o1 = std::move(o2);
REQUIRE(*o1 == 12);
tl::optional<short> o4 = 42;
o1 = o4;
REQUIRE(*o1 == 42);
o1 = std::move(o4);
REQUIRE(*o1 == 42);
}

29
tests/constructors.cpp
View File

@@ -1,4 +1,31 @@
#include "catch.hpp"
#include "optional.hpp"
TEST_CASE("Constructors", "[constructors]") {}
TEST_CASE("Constructors", "[constructors]") {
tl::optional<int> o1;
REQUIRE(!o1);
tl::optional<int> o2 = tl::nullopt;
REQUIRE(!o2);
tl::optional<int> o3 = 42;
REQUIRE(*o3 == 42);
tl::optional<int> o4 = o3;
REQUIRE(*o4 == 42);
tl::optional<int> o5 = o1;
REQUIRE(!o5);
tl::optional<int> o6 = std::move(o3);
REQUIRE(*o6 == 42);
tl::optional<short> o7 = 42;
REQUIRE(*o7 == 42);
tl::optional<int> o8 = o7;
REQUIRE(*o8 == 42);
tl::optional<int> o9 = std::move(o7);
REQUIRE(*o9 == 42);
}