@@ -17,62 +17,58 @@ static_assert(!std::is_copy_assignable<zmq::active_poller_t>::value, "active_act
17
17
18
18
TEST (active_poller, move_construct_empty)
19
19
{
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);
23
23
ASSERT_TRUE (b.empty ());
24
- ASSERT_EQ (0u , a-> size ());
24
+ ASSERT_EQ (0u , a. size ());
25
25
ASSERT_EQ (0u , b.size ());
26
- a.reset ();
27
26
}
28
27
29
28
TEST (active_poller, move_assign_empty)
30
29
{
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 ());
33
32
zmq::active_poller_t b;
34
33
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 ());
37
36
ASSERT_EQ (0u , b.size ());
38
- ASSERT_TRUE (a-> empty ());
37
+ ASSERT_TRUE (a. empty ());
39
38
ASSERT_TRUE (b.empty ());
40
- a.reset ();
41
39
}
42
40
43
41
TEST (active_poller, move_construct_non_empty)
44
42
{
45
43
zmq::context_t context;
46
44
zmq::socket_t socket{context, zmq::socket_type::router};
47
45
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 ());
55
53
ASSERT_FALSE (b.empty ());
56
54
ASSERT_EQ (1u , b.size ());
57
- a.reset ();
58
55
}
59
56
60
57
TEST (active_poller, move_assign_non_empty)
61
58
{
62
59
zmq::context_t context;
63
60
zmq::socket_t socket{context, zmq::socket_type::router};
64
61
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 ());
69
66
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 ());
73
70
ASSERT_FALSE (b.empty ());
74
71
ASSERT_EQ (1u , b.size ());
75
- a.reset ();
76
72
}
77
73
78
74
TEST (active_poller, add_handler)
0 commit comments