Enable passing parts of the unit test

This commit is contained in:
Denis Blank 2018-02-06 02:18:28 +01:00
parent 78f1c0ae78
commit 72974d402e

View File

@ -67,7 +67,7 @@ struct my_mapper {
struct all_map { struct all_map {
template <typename T> template <typename T>
int operator()(T el) const { int operator()(T) const {
return 0; return 0;
} }
}; };
@ -94,28 +94,7 @@ TEST(traverse_single_test, test_container_categories) {
"Wrong category!"); "Wrong category!");
} }
TEST(traverse_single_test, test_simple_mapping) { TEST(traverse_single_test, test_mixed_traversal) {
/*auto res = map_pack(
[](int i) {
// ...
return i + 1;
},
0, 1, 2, std::vector<int>{3, 4, 5});*/
auto res =
map_pack(all_map_float{}, 0, 1.f, make_tuple(1.f, 3),
std::vector<std::vector<int>>{{1, 2}, {4, 5}},
std::vector<std::vector<float>>{{1.f, 2.f}, {4.f, 5.f}}, 2);
auto expected = make_tuple( // ...
1.f, 2.f, make_tuple(2.f, 4.f),
std::vector<std::vector<float>>{{2.f, 3.f}, {5.f, 6.f}},
std::vector<std::vector<float>>{{2.f, 3.f}, {5.f, 6.f}}, 3.f);
}
static void test_mixed_traversal() {
{
auto res = auto res =
map_pack(all_map_float{}, 0, 1.f, make_tuple(1.f, 3), map_pack(all_map_float{}, 0, 1.f, make_tuple(1.f, 3),
std::vector<std::vector<int>>{{1, 2}, {4, 5}}, std::vector<std::vector<int>>{{1, 2}, {4, 5}},
@ -131,19 +110,19 @@ static void test_mixed_traversal() {
EXPECT_TRUE((res == expected)); EXPECT_TRUE((res == expected));
} }
{ TEST(traverse_single_test, test_mixed_traversal_build_regression) {
// Broken build regression tests: // Broken build regression tests:
traverse_pack(my_mapper{}, int(0), 1.f); traverse_pack(my_mapper{}, int(0), 1.f);
map_pack(all_map{}, 0, std::vector<int>{1, 2}); map_pack(all_map{}, 0, std::vector<int>{1, 2});
} }
{ TEST(traverse_single_test, test_mixed_traversal_container_container_map) {
// Also a regression test // Also a regression test
auto res = map_pack(all_map{}, std::vector<std::vector<int>>{{1, 2}}); auto res = map_pack(all_map{}, std::vector<std::vector<int>>{{1, 2}});
EXPECT_EQ((res[0][0]), (0)); EXPECT_EQ((res[0][0]), (0));
} }
{ TEST(traverse_single_test, test_mixed_traversal_result_tuple_mapped) {
auto res = map_pack( auto res = map_pack(
my_mapper{}, 0, 1.f, my_mapper{}, 0, 1.f,
make_tuple(1.f, 3, std::vector<std::vector<int>>{{1, 2}, {4, 5}}, make_tuple(1.f, 3, std::vector<std::vector<int>>{{1, 2}, {4, 5}},
@ -162,7 +141,7 @@ static void test_mixed_traversal() {
EXPECT_TRUE((res == expected)); EXPECT_TRUE((res == expected));
} }
{ TEST(traverse_single_test, test_mixed_traversal_all_elements_traversed) {
int count = 0; int count = 0;
traverse_pack( traverse_pack(
[&](int el) { [&](int el) {
@ -174,9 +153,7 @@ static void test_mixed_traversal() {
EXPECT_EQ((count), (7)); EXPECT_EQ((count), (7));
} }
return; /*
}
struct my_unwrapper { struct my_unwrapper {
template <typename T, template <typename T,
typename std::enable_if<is_future<T>::value>::type* = nullptr> typename std::enable_if<is_future<T>::value>::type* = nullptr>
@ -185,7 +162,6 @@ struct my_unwrapper {
} }
}; };
/*
static void test_mixed_early_unwrapping() { static void test_mixed_early_unwrapping() {
{ {
auto res = map_pack(my_unwrapper{}, // ... auto res = map_pack(my_unwrapper{}, // ...