Skip to content

Commit ee1cc9a

Browse files
committed
Problem: unnecessary heap allocations for test subject
Solution: change to local variables
1 parent 882f5e8 commit ee1cc9a

File tree

1 file changed

+23
-27
lines changed

1 file changed

+23
-27
lines changed

tests/active_poller.cpp

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,58 @@ static_assert(!std::is_copy_assignable<zmq::active_poller_t>::value, "active_act
1717

1818
TEST(active_poller, move_construct_empty)
1919
{
20-
std::unique_ptr<zmq::active_poller_t> a {new zmq::active_poller_t};
21-
ASSERT_TRUE(a->empty ());
22-
zmq::active_poller_t b = std::move (*a);
20+
zmq::active_poller_t a;
21+
ASSERT_TRUE(a.empty ());
22+
zmq::active_poller_t b = std::move (a);
2323
ASSERT_TRUE(b.empty ());
24-
ASSERT_EQ(0u, a->size ());
24+
ASSERT_EQ(0u, a.size ());
2525
ASSERT_EQ(0u, b.size ());
26-
a.reset ();
2726
}
2827

2928
TEST(active_poller, move_assign_empty)
3029
{
31-
std::unique_ptr<zmq::active_poller_t> a{new zmq::active_poller_t};
32-
ASSERT_TRUE(a->empty());
30+
zmq::active_poller_t a;
31+
ASSERT_TRUE(a.empty());
3332
zmq::active_poller_t b;
3433
ASSERT_TRUE(b.empty());
35-
b = std::move(*a);
36-
ASSERT_EQ(0u, a->size ());
34+
b = std::move(a);
35+
ASSERT_EQ(0u, a.size ());
3736
ASSERT_EQ(0u, b.size ());
38-
ASSERT_TRUE(a->empty());
37+
ASSERT_TRUE(a.empty());
3938
ASSERT_TRUE(b.empty());
40-
a.reset ();
4139
}
4240

4341
TEST(active_poller, move_construct_non_empty)
4442
{
4543
zmq::context_t context;
4644
zmq::socket_t socket{context, zmq::socket_type::router};
4745

48-
std::unique_ptr<zmq::active_poller_t> a{new zmq::active_poller_t};
49-
a->add(socket, ZMQ_POLLIN, [](short) {});
50-
ASSERT_FALSE(a->empty ());
51-
ASSERT_EQ(1u, a->size ());
52-
zmq::active_poller_t b = std::move (*a);
53-
ASSERT_TRUE(a->empty ());
54-
ASSERT_EQ(0u, a->size ());
46+
zmq::active_poller_t a;
47+
a.add(socket, ZMQ_POLLIN, [](short) {});
48+
ASSERT_FALSE(a.empty ());
49+
ASSERT_EQ(1u, a.size ());
50+
zmq::active_poller_t b = std::move (a);
51+
ASSERT_TRUE(a.empty ());
52+
ASSERT_EQ(0u, a.size ());
5553
ASSERT_FALSE(b.empty ());
5654
ASSERT_EQ(1u, b.size ());
57-
a.reset ();
5855
}
5956

6057
TEST(active_poller, move_assign_non_empty)
6158
{
6259
zmq::context_t context;
6360
zmq::socket_t socket{context, zmq::socket_type::router};
6461

65-
std::unique_ptr<zmq::active_poller_t> a{new zmq::active_poller_t};
66-
a->add(socket, ZMQ_POLLIN, [](short) {});
67-
ASSERT_FALSE(a->empty());
68-
ASSERT_EQ(1u, a->size ());
62+
zmq::active_poller_t a;
63+
a.add(socket, ZMQ_POLLIN, [](short) {});
64+
ASSERT_FALSE(a.empty());
65+
ASSERT_EQ(1u, a.size ());
6966
zmq::active_poller_t b;
70-
b = std::move(*a);
71-
ASSERT_TRUE(a->empty ());
72-
ASSERT_EQ(0u, a->size ());
67+
b = std::move(a);
68+
ASSERT_TRUE(a.empty ());
69+
ASSERT_EQ(0u, a.size ());
7370
ASSERT_FALSE(b.empty ());
7471
ASSERT_EQ(1u, b.size ());
75-
a.reset ();
7672
}
7773

7874
TEST(active_poller, add_handler)

0 commit comments

Comments
 (0)