From 425d92296572d6d0161d7693eee677d7dfcec2ef Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Wed, 4 Oct 2017 18:45:45 +0200 Subject: [PATCH] Test the flatten transform --- test/unit-test/CMakeLists.txt | 5 +++ .../test-continuable-base-errors.cpp | 42 ------------------ .../unit-test/test-continuable-transforms.cpp | 19 ++++---- test/unit-test/test-continuable.cpp | 35 +++++++++++++++ test/unit-test/test-continuable.hpp | 43 +++++++++++++++++-- 5 files changed, 90 insertions(+), 54 deletions(-) create mode 100644 test/unit-test/test-continuable.cpp diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt index affd20f..c12e35f 100644 --- a/test/unit-test/CMakeLists.txt +++ b/test/unit-test/CMakeLists.txt @@ -4,6 +4,7 @@ foreach(STEP RANGE 4) add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_LIST_DIR}/test-continuable.hpp + ${CMAKE_CURRENT_LIST_DIR}/test-continuable.cpp ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-chaining.cpp ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-destruct.cpp ${CMAKE_CURRENT_LIST_DIR}/test-continuable-base-errors.cpp @@ -15,6 +16,10 @@ foreach(STEP RANGE 4) ${CMAKE_CURRENT_LIST_DIR}/test-continuable-regression.cpp ${CMAKE_CURRENT_LIST_DIR}/test-continuable-transforms.cpp) + target_include_directories(${PROJECT_NAME} + PRIVATE + ${CMAKE_CURRENT_LIST_DIR}) + target_link_libraries(${PROJECT_NAME} PRIVATE gtest-main diff --git a/test/unit-test/test-continuable-base-errors.cpp b/test/unit-test/test-continuable-base-errors.cpp index 8ca33df..9bb242c 100644 --- a/test/unit-test/test-continuable-base-errors.cpp +++ b/test/unit-test/test-continuable-base-errors.cpp @@ -27,48 +27,6 @@ #include "test-continuable.hpp" -#if !defined(CONTINUABLE_WITH_NO_EXCEPTIONS) -struct test_exception : std::exception { - explicit test_exception() { - } - - bool operator==(test_exception const&) const noexcept { - return true; - } -}; - -static auto get_test_exception_proto() { - return test_exception{}; -} - -static auto supply_test_exception() { - try { - throw get_test_exception_proto(); - } catch (...) { - return std::current_exception(); - } -} -#else -struct my_error_category : std::error_category { - const char* name() const noexcept override { - return "generic name"; - } - - std::string message(int) const override { - return "generic"; - } -}; - -static auto get_test_exception_proto() { - static const my_error_category cat; - return std::error_condition(123, cat); -} - -static auto supply_test_exception() { - return get_test_exception_proto(); -} -#endif - TYPED_TEST(single_dimension_tests, are_completing_errors) { ASSERT_ASYNC_EXCEPTION_COMPLETION( this->supply_exception(supply_test_exception())); diff --git a/test/unit-test/test-continuable-transforms.cpp b/test/unit-test/test-continuable-transforms.cpp index fe9c4d3..6e91437 100644 --- a/test/unit-test/test-continuable-transforms.cpp +++ b/test/unit-test/test-continuable-transforms.cpp @@ -28,15 +28,13 @@ using namespace cti; using namespace cti::detail; -#ifndef NO_FUTURE_TESTS +template +bool is_ready(T& future) { + // Check that the future is ready + return future.wait_for(std::chrono::seconds(0)) == std::future_status::ready; +} TYPED_TEST(single_dimension_tests, are_convertible_to_futures) { - auto is_ready = [](auto& future) { - // Check that the future is ready - return future.wait_for(std::chrono::seconds(0)) == - std::future_status::ready; - }; - { auto future = this->supply().apply(cti::futurize()); ASSERT_TRUE(is_ready(future)); @@ -70,4 +68,9 @@ TYPED_TEST(single_dimension_tests, are_convertible_to_futures) { } } -#endif // NO_FUTURE_TESTS +TYPED_TEST(single_dimension_tests, are_flattable) { + auto continuation = + this->supply_exception(supply_test_exception()).apply(cti::flatten()); + + ASSERT_ASYNC_INCOMPLETION(std::move(continuation)); +} diff --git a/test/unit-test/test-continuable.cpp b/test/unit-test/test-continuable.cpp new file mode 100644 index 0000000..374ecbb --- /dev/null +++ b/test/unit-test/test-continuable.cpp @@ -0,0 +1,35 @@ + +/** + Copyright(c) 2015 - 2017 Denis Blank + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files(the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and / or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions : + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +**/ + +#include "test-continuable.hpp" + +#if !defined(CONTINUABLE_WITH_NO_EXCEPTIONS) +test_exception get_test_exception_proto() { + return test_exception{}; +} +#else +std::error_condition get_test_exception_proto() { + static const my_error_category cat; + return std::error_condition(123, cat); +} +#endif diff --git a/test/unit-test/test-continuable.hpp b/test/unit-test/test-continuable.hpp index 339a2f0..80d7bce 100644 --- a/test/unit-test/test-continuable.hpp +++ b/test/unit-test/test-continuable.hpp @@ -181,10 +181,8 @@ using single_types = ::testing::Types< #elif UNIT_TEST_STEP == 3 provide_unique #elif UNIT_TEST_STEP == 4 -//#define NO_ERASURE_TESTS -//#define NO_FUTURE_TESTS -// provide_erasure, -// provide_erasure + // provide_erasure, + // provide_erasure provide_continuation_seq_right #endif >; @@ -207,4 +205,41 @@ auto make_step(T* me, unsigned& current, unsigned step) { }); } +#if !defined(CONTINUABLE_WITH_NO_EXCEPTIONS) +struct test_exception : std::exception { + explicit test_exception() { + } + + bool operator==(test_exception const&) const noexcept { + return true; + } +}; + +test_exception get_test_exception_proto(); + +inline auto supply_test_exception() { + try { + throw get_test_exception_proto(); + } catch (...) { + return std::current_exception(); + } +} +#else +struct my_error_category : std::error_category { + const char* name() const noexcept override { + return "generic name"; + } + + std::string message(int) const override { + return "generic"; + } +}; + +std::error_condition get_test_exception_proto(); + +inline std::error_condition supply_test_exception() { + return get_test_exception_proto(); +} +#endif + #endif // TEST_CONTINUABLE_HPP__