From 0982748ad6190cdb46e421531f021f71e170ac70 Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Wed, 7 Feb 2018 02:43:25 +0100 Subject: [PATCH] Enable another test --- include/continuable/continuable-traverse.hpp | 3 +- test/unit-test/test-continuable-traverse.cpp | 30 +++++++++----------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/include/continuable/continuable-traverse.hpp b/include/continuable/continuable-traverse.hpp index 3625bd3..3e56491 100644 --- a/include/continuable/continuable-traverse.hpp +++ b/include/continuable/continuable-traverse.hpp @@ -71,7 +71,8 @@ namespace cti { /// /// \since 3.0.0 template -decltype(auto) map_pack(Mapper&& mapper, T&&... pack) { +/*keep this inline*/ inline decltype(auto) map_pack(Mapper&& mapper, + T&&... pack) { return detail::traversal::transform(detail::traversal::strategy_remap_tag{}, std::forward(mapper), std::forward(pack)...); diff --git a/test/unit-test/test-continuable-traverse.cpp b/test/unit-test/test-continuable-traverse.cpp index b423e37..bd730a2 100644 --- a/test/unit-test/test-continuable-traverse.cpp +++ b/test/unit-test/test-continuable-traverse.cpp @@ -752,15 +752,15 @@ void test_spread_traverse() { void test_spread_container_traverse() { // 1:2 mappings (multiple arguments) - //{ - // std::vector> res = - // map_pack(duplicate_mapper{}, std::vector{1}); + { + std::vector> res = + map_pack(duplicate_mapper{}, std::vector{1}); - // std::vector> expected; - // expected.push_back(make_tuple(1, 1)); + std::vector> expected; + expected.push_back(make_tuple(1, 1)); - // EXPECT_TRUE((res == expected)); - //} + EXPECT_TRUE((res == expected)); + } // 1:0 mappings { @@ -769,8 +769,7 @@ void test_spread_container_traverse() { } } -/* -static void test_spread_tuple_like_traverse() { +void test_spread_tuple_like_traverse() { // 1:2 mappings (multiple arguments) { tuple> res = @@ -790,14 +789,14 @@ static void test_spread_tuple_like_traverse() { } // 1:2 mappings (multiple arguments) - { - std::array res = - map_pack(duplicate_mapper{}, std::array{{1, 2}}); + //{ + // std::array res = + // map_pack(duplicate_mapper{}, std::array{{1, 2}}); - std::array expected{{1, 1, 2, 2}}; + // std::array expected{{1, 1, 2, 2}}; - EXPECT_TRUE((res == expected)); - } + // EXPECT_TRUE((res == expected)); + //} // 1:0 mappings { @@ -806,7 +805,6 @@ static void test_spread_tuple_like_traverse() { static_assert(std::is_void::value, "Failed..."); } } -*/ /* TODO Convert this to gtest