diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt index cf99c76..c4f7908 100644 --- a/test/unit-test/CMakeLists.txt +++ b/test/unit-test/CMakeLists.txt @@ -43,7 +43,8 @@ foreach(STEP RANGE 4) ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-destruct.cpp ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-errors.cpp ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-base-partial.cpp - ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all-seq-ag.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all-seq-ag-1.cpp + ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all-seq-ag-2.cpp ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all-seq-op.cpp ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-all.cpp ${CMAKE_CURRENT_LIST_DIR}/multi/test-continuable-connection-any.cpp diff --git a/test/unit-test/multi/test-continuable-connection-all-seq-ag-1.cpp b/test/unit-test/multi/test-continuable-connection-all-seq-ag-1.cpp new file mode 100644 index 0000000..6f53f6a --- /dev/null +++ b/test/unit-test/multi/test-continuable-connection-all-seq-ag-1.cpp @@ -0,0 +1,42 @@ + +/* + Copyright(c) 2015 - 2018 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 +#include +#include + +#include + +TYPED_TEST(single_aggregate_tests, is_logical_seq_connectable_three_tags) { + auto chain = + this->ag(this->supply(1, 2), this->supply(3, 4), this->supply(5, 6)); + EXPECT_ASYNC_RESULT(std::move(chain), 1, 2, 3, 4, 5, 6); +} + +TYPED_TEST(single_aggregate_tests, is_logical_connectable_nested) { + auto chain = this->ag( + std::make_tuple(this->supply(1, 2), std::make_tuple(this->supply(3, 4))), + this->supply(5, 6)); + EXPECT_ASYNC_RESULT(std::move(chain), + std::make_tuple(1, 2, std::make_tuple(3, 4)), 5, 6); +} diff --git a/test/unit-test/multi/test-continuable-connection-all-seq-ag.cpp b/test/unit-test/multi/test-continuable-connection-all-seq-ag-2.cpp similarity index 78% rename from test/unit-test/multi/test-continuable-connection-all-seq-ag.cpp rename to test/unit-test/multi/test-continuable-connection-all-seq-ag-2.cpp index 5c8be58..a877cff 100644 --- a/test/unit-test/multi/test-continuable-connection-all-seq-ag.cpp +++ b/test/unit-test/multi/test-continuable-connection-all-seq-ag-2.cpp @@ -33,20 +33,6 @@ public: } }; -TYPED_TEST(single_aggregate_tests, is_logical_seq_connectable_three_tags) { - auto chain = - this->ag(this->supply(1, 2), this->supply(3, 4), this->supply(5, 6)); - EXPECT_ASYNC_RESULT(std::move(chain), 1, 2, 3, 4, 5, 6); -} - -TYPED_TEST(single_aggregate_tests, is_logical_connectable_nested) { - auto chain = this->ag( - std::make_tuple(this->supply(1, 2), std::make_tuple(this->supply(3, 4))), - this->supply(5, 6)); - EXPECT_ASYNC_RESULT(std::move(chain), - std::make_tuple(1, 2, std::make_tuple(3, 4)), 5, 6); -} - TYPED_TEST(single_aggregate_tests, is_logical_connectable_nested_dyn) { auto chain = this->ag(std::make_tuple(cti::populate( this->supply(1, 2), this->supply(3, 4), this->supply(5, 6))));