diff options
| author | William A. Kennington III <wak@google.com> | 2018-09-11 23:02:38 -0700 |
|---|---|---|
| committer | William A. Kennington III <wak@google.com> | 2018-09-11 23:04:35 -0700 |
| commit | 5f3cdfad398489acb457a144b300653f44b41eae (patch) | |
| tree | b7233477835399ef78f176969061736de32b42b4 /test/event.cpp | |
| parent | d38b8ffc4ee5324cf7865f31b2492a5f95e928eb (diff) | |
| download | sdeventplus-5f3cdfad398489acb457a144b300653f44b41eae.tar.gz sdeventplus-5f3cdfad398489acb457a144b300653f44b41eae.zip | |
Upgrade to C++17
Change-Id: I0efd11f488ceee9b1a03ffaa1522cf0182ae1aca
Signed-off-by: William A. Kennington III <wak@google.com>
Diffstat (limited to 'test/event.cpp')
| -rw-r--r-- | test/event.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/event.cpp b/test/event.cpp index a9b6439..1bf5976 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -1,6 +1,7 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> #include <memory> +#include <optional> #include <sdeventplus/event.hpp> #include <sdeventplus/exception.hpp> #include <sdeventplus/test/sdevent.hpp> @@ -128,14 +129,14 @@ TEST_F(EventMethodTest, WaitSuccessReady) const int events_ready = 10; EXPECT_CALL(mock, sd_event_wait(expected_event, static_cast<uint64_t>(-1))) .WillOnce(Return(events_ready)); - EXPECT_EQ(events_ready, event->wait(std::experimental::nullopt)); + EXPECT_EQ(events_ready, event->wait(std::nullopt)); } TEST_F(EventMethodTest, WaitInternalError) { EXPECT_CALL(mock, sd_event_wait(expected_event, static_cast<uint64_t>(-1))) .WillOnce(Return(-EINVAL)); - EXPECT_THROW(event->wait(std::experimental::nullopt), SdEventError); + EXPECT_THROW(event->wait(std::nullopt), SdEventError); } TEST_F(EventMethodTest, DispatchInitial) @@ -172,14 +173,14 @@ TEST_F(EventMethodTest, RunSuccessReady) const int events_ready = 10; EXPECT_CALL(mock, sd_event_run(expected_event, static_cast<uint64_t>(-1))) .WillOnce(Return(events_ready)); - EXPECT_EQ(events_ready, event->run(std::experimental::nullopt)); + EXPECT_EQ(events_ready, event->run(std::nullopt)); } TEST_F(EventMethodTest, RunInternalError) { EXPECT_CALL(mock, sd_event_run(expected_event, static_cast<uint64_t>(-1))) .WillOnce(Return(-EINVAL)); - EXPECT_THROW(event->run(std::experimental::nullopt), SdEventError); + EXPECT_THROW(event->run(std::nullopt), SdEventError); } TEST_F(EventMethodTest, LoopSuccess) |
