From cd265f991b26a801791ed5a1b4bed22bfe5159db Mon Sep 17 00:00:00 2001 From: Denis Blank Date: Tue, 28 Feb 2017 23:49:36 +0100 Subject: [PATCH] Re-enable the evaluation order tests --- test/unit-test/test-continuable-connection.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/test/unit-test/test-continuable-connection.cpp b/test/unit-test/test-continuable-connection.cpp index 862d46a..80c000e 100644 --- a/test/unit-test/test-continuable-connection.cpp +++ b/test/unit-test/test-continuable-connection.cpp @@ -52,13 +52,13 @@ TYPED_TEST(single_dimension_tests, is_logical_and_connectable) { ASSERT_ASYNC_TYPES(std::move(chain), tag1, tag2, tag3); } - /*{ + { // Check the evaluation order unsigned i = 0; auto composed = make_step(this, i, 0) && make_step(this, i, 1) && make_step(this, i, 2); EXPECT_ASYNC_RESULT(std::move(composed)); - }*/ + } } TYPED_TEST(single_dimension_tests, is_logical_or_connectable) { @@ -94,4 +94,13 @@ TYPED_TEST(single_dimension_tests, is_logical_or_connectable) { auto chain = this->supply(char(0), int(0)) || this->supply(int(0), char(0)); ASSERT_ASYNC_TYPES(std::move(chain), common, common); } + + { + // Check the evaluation order + unsigned i = 0; + auto composed = + make_step(this, i, 0) || make_step(this, i, 1) || make_step(this, i, 2); + EXPECT_ASYNC_RESULT(std::move(composed)); + } +} }