From 89d9db7366982773f8cf3524abafcb6e7673d240 Mon Sep 17 00:00:00 2001 From: Simon Giesecke Date: Fri, 11 May 2018 10:32:02 +0200 Subject: [PATCH] Problem: move poller tests are unspecific Solution: remove redundant assertions (tested elsewhere), and add assertion behaviour of calling wait on moved-from poller --- tests/poller.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/poller.cpp b/tests/poller.cpp index aa1fc77..edd4d7c 100644 --- a/tests/poller.cpp +++ b/tests/poller.cpp @@ -367,28 +367,29 @@ TEST(poller, wait_on_move_constructed_poller) zmq::poller_t a; zmq::poller_t::handler_t handler; ASSERT_NO_THROW (a.add (s.server, ZMQ_POLLIN, handler)); - ASSERT_EQ(1u, a.size ()); zmq::poller_t b {std::move (a)}; ASSERT_EQ(1u, b.size ()); - ASSERT_NO_THROW (b.wait (std::chrono::milliseconds {-1})); + /// \todo the actual error code should be checked + ASSERT_THROW(a.wait(std::chrono::milliseconds{10}), zmq::error_t); + ASSERT_TRUE (b.wait (std::chrono::milliseconds {-1})); } -TEST(poller, wait_on_move_assign_poller) +TEST(poller, wait_on_move_assigned_poller) { server_client_setup s; ASSERT_NO_THROW (s.client.send ("Hi")); zmq::poller_t a; zmq::poller_t::handler_t handler; ASSERT_NO_THROW (a.add (s.server, ZMQ_POLLIN, handler)); - ASSERT_EQ(1u, a.size ()); zmq::poller_t b; - ASSERT_EQ(0u, b.size ()); b = {std::move (a)}; ASSERT_EQ(1u, b.size ()); - ASSERT_NO_THROW (b.wait (std::chrono::milliseconds {-1})); + /// \todo the actual error code should be checked + ASSERT_THROW(a.wait(std::chrono::milliseconds{10}), zmq::error_t); + ASSERT_TRUE (b.wait (std::chrono::milliseconds {-1})); } -TEST(poller, received_on_move_construced_poller) +TEST(poller, received_on_move_constructed_poller) { // Setup server and client server_client_setup s;