diff --git a/include/async_mqtt/util/packet_variant_operator.hpp b/include/async_mqtt/util/packet_variant_operator.hpp new file mode 100644 index 000000000..59104d9a0 --- /dev/null +++ b/include/async_mqtt/util/packet_variant_operator.hpp @@ -0,0 +1,93 @@ +// Copyright Takatoshi Kondo 2022 +// +// Distributed under the Boost Software License, Version 1.0. +// (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) + +#if !defined(ASYNC_MQTT_UTIL_PACKET_VARIANT_OPERATOR_HPP) +#define ASYNC_MQTT_UTIL_PACKET_VARIANT_OPERATOR_HPP + +#include + +#include +#include + +namespace async_mqtt { + +namespace as = boost::asio; + +template +inline bool basic_packet_variant_equal( + basic_packet_variant const& lhs, + basic_packet_variant const& rhs +) { + auto lhs_cbs = lhs.const_buffer_sequence(); + auto [lhs_b, lhs_e] = make_packet_range(lhs_cbs); + + auto rhs_cbs = rhs.const_buffer_sequence(); + auto [rhs_b, rhs_e] = make_packet_range(rhs_cbs); + + return std::equal(lhs_b, lhs_e, rhs_b, rhs_e); +} + +inline bool packet_variant_equal( + packet_variant const& lhs, + packet_variant const& rhs +) { + return basic_packet_variant_equal<2>(lhs, rhs); +} + +template +inline bool operator==( + basic_packet_variant const& lhs, + basic_packet_variant const& rhs +) { + return basic_packet_variant_equal(lhs, rhs); +} + +inline bool operator==( + packet_variant const& lhs, + packet_variant const& rhs +) { + return packet_variant_equal(lhs, rhs); +} + +template +inline bool basic_packet_variant_less_than( + basic_packet_variant const& lhs, + basic_packet_variant const& rhs +) { + auto lhs_cbs = lhs.const_buffer_sequence(); + auto [lhs_b, lhs_e] = make_packet_range(lhs_cbs); + + auto rhs_cbs = rhs.const_buffer_sequence(); + auto [rhs_b, rhs_e] = make_packet_range(rhs_cbs); + + return std::lexicographical_compare(lhs_b, lhs_e, rhs_b, rhs_e); +} + +inline bool packet_variant_less_than( + packet_variant const& lhs, + packet_variant const& rhs +) { + return basic_packet_variant_less_than<2>(lhs, rhs); +} + +template +inline bool operator<( + basic_packet_variant const& lhs, + basic_packet_variant const& rhs +) { + return basic_packet_variant_less_than(lhs, rhs); +} + +inline bool operator<( + packet_variant const& lhs, + packet_variant const& rhs +) { + return packet_variant_less_than(lhs, rhs); +} + +} // namespace async_mqtt + +#endif // ASYNC_MQTT_UTIL_PACKET_VARIANT_OPERATOR_HPP diff --git a/test/unit/packet_compare.hpp b/test/unit/packet_compare.hpp deleted file mode 100644 index 38b039651..000000000 --- a/test/unit/packet_compare.hpp +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright Takatoshi Kondo 2022 -// -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -#if !defined(ASYNC_MQTT_PACKET_COMPARE_HPP) -#define ASYNC_MQTT_PACKET_COMPARE_HPP - -#include - -#include - -namespace async_mqtt { - -namespace as = boost::asio; - -template -bool packet_compare(T const& t, U const& u) { - - auto t_cbs = t.const_buffer_sequence(); - auto [tb, te] = make_packet_range(t_cbs); - - auto u_cbs = u.const_buffer_sequence(); - auto [ub, ue] = make_packet_range(u_cbs); - - return std::equal(tb, te, ub, ue); -} - -} // namespace async_mqtt - -#endif // ASYNC_MQTT_PACKET_COMPARE_HPP diff --git a/test/unit/ut_cpp20coro_exec.cpp b/test/unit/ut_cpp20coro_exec.cpp index 11cf92e6c..8215018dc 100644 --- a/test/unit/ut_cpp20coro_exec.cpp +++ b/test/unit/ut_cpp20coro_exec.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_cpp20coro_exec) diff --git a/test/unit/ut_ep_con_discon.cpp b/test/unit/ut_ep_con_discon.cpp index 75509de23..25fcc87b1 100644 --- a/test/unit/ut_ep_con_discon.cpp +++ b/test/unit/ut_ep_con_discon.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_con_discon) @@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // register packet_id for testing @@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // send valid packets ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback, wp)); + BOOST_TEST(puback == wp); } ); { @@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec, wp)); + BOOST_TEST(pubrec == wp); } ); { @@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel, wp)); + BOOST_TEST(pubrel == wp); } ); { @@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp, wp)); + BOOST_TEST(pubcomp == wp); } ); { @@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(subscribe, wp)); + BOOST_TEST(subscribe == wp); } ); { @@ -195,7 +195,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(unsubscribe, wp)); + BOOST_TEST(unsubscribe == wp); } ); { @@ -205,7 +205,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pingreq, wp)); + BOOST_TEST(pingreq == wp); } ); { @@ -217,7 +217,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // send disconnect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { @@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -245,13 +245,13 @@ BOOST_AUTO_TEST_CASE(valid_client_v3_1_1) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // send disconnect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { @@ -540,7 +540,7 @@ BOOST_AUTO_TEST_CASE(invalid_client_v3_1_1) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -635,7 +635,7 @@ BOOST_AUTO_TEST_CASE(invalid_client_v3_1_1) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // offline publish success @@ -811,13 +811,13 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { // recv connect { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -831,7 +831,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { // send valid packets ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -841,7 +841,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback, wp)); + BOOST_TEST(puback == wp); } ); { @@ -851,7 +851,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec, wp)); + BOOST_TEST(pubrec == wp); } ); { @@ -861,7 +861,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel, wp)); + BOOST_TEST(pubrel == wp); } ); { @@ -871,7 +871,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp, wp)); + BOOST_TEST(pubcomp == wp); } ); { @@ -881,7 +881,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(suback, wp)); + BOOST_TEST(suback == wp); } ); { @@ -891,7 +891,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(unsuback, wp)); + BOOST_TEST(unsuback == wp); } ); { @@ -901,7 +901,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pingresp, wp)); + BOOST_TEST(pingresp == wp); } ); { @@ -927,13 +927,13 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { // recv connect { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -947,7 +947,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v3_1_1) { // send publish behalf of valid packets ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -1236,7 +1236,7 @@ BOOST_AUTO_TEST_CASE(invalid_server_v3_1_1) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // offline publish success @@ -1324,7 +1324,7 @@ BOOST_AUTO_TEST_CASE(invalid_server_v3_1_1) { // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -1530,7 +1530,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1541,7 +1541,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // send auth packet that can be sent before connack receiving ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(auth, wp)); + BOOST_TEST(auth == wp); } ); { @@ -1552,13 +1552,13 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // send valid packets ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(auth, wp)); + BOOST_TEST(auth == wp); } ); { @@ -1570,7 +1570,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { BOOST_TEST(ep->register_packet_id(0x1, as::use_future).get()); ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -1580,7 +1580,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback, wp)); + BOOST_TEST(puback == wp); } ); { @@ -1590,7 +1590,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec, wp)); + BOOST_TEST(pubrec == wp); } ); { @@ -1600,7 +1600,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel, wp)); + BOOST_TEST(pubrel == wp); } ); { @@ -1610,7 +1610,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp, wp)); + BOOST_TEST(pubcomp == wp); } ); { @@ -1620,7 +1620,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(subscribe, wp)); + BOOST_TEST(subscribe == wp); } ); { @@ -1630,7 +1630,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(unsubscribe, wp)); + BOOST_TEST(unsubscribe == wp); } ); { @@ -1640,7 +1640,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pingreq, wp)); + BOOST_TEST(pingreq == wp); } ); { @@ -1652,7 +1652,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // send disconnect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { @@ -1669,7 +1669,7 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1680,13 +1680,13 @@ BOOST_AUTO_TEST_CASE(valid_client_v5) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // send disconnect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { @@ -2013,7 +2013,7 @@ BOOST_AUTO_TEST_CASE(invalid_client_v5) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -2108,7 +2108,7 @@ BOOST_AUTO_TEST_CASE(invalid_client_v5) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // offline publish success @@ -2312,13 +2312,13 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { // recv connect { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send auth ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(auth, wp)); + BOOST_TEST(auth == wp); } ); { @@ -2329,7 +2329,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { // send connack ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -2343,7 +2343,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { // send valid packets ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(auth, wp)); + BOOST_TEST(auth == wp); } ); { @@ -2353,7 +2353,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -2363,7 +2363,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback, wp)); + BOOST_TEST(puback == wp); } ); { @@ -2373,7 +2373,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec, wp)); + BOOST_TEST(pubrec == wp); } ); { @@ -2383,7 +2383,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel, wp)); + BOOST_TEST(pubrel == wp); } ); { @@ -2393,7 +2393,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp, wp)); + BOOST_TEST(pubcomp == wp); } ); { @@ -2403,7 +2403,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(suback, wp)); + BOOST_TEST(suback == wp); } ); { @@ -2413,7 +2413,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(unsuback, wp)); + BOOST_TEST(unsuback == wp); } ); { @@ -2423,7 +2423,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pingresp, wp)); + BOOST_TEST(pingresp == wp); } ); { @@ -2449,13 +2449,13 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { // recv connect { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -2469,7 +2469,7 @@ BOOST_AUTO_TEST_CASE(valid_server_v5) { // send publish behalf of valid packets ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish, wp)); + BOOST_TEST(publish == wp); } ); { @@ -2796,7 +2796,7 @@ BOOST_AUTO_TEST_CASE(invalid_server_v5) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // offline publish success @@ -2884,7 +2884,7 @@ BOOST_AUTO_TEST_CASE(invalid_server_v5) { // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { diff --git a/test/unit/ut_ep_recv_filter.cpp b/test/unit/ut_ep_recv_filter.cpp index 6c1186a3c..bfe31b408 100644 --- a/test/unit/ut_ep_recv_filter.cpp +++ b/test/unit/ut_ep_recv_filter.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_recv_filter) @@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE(recv_filter) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(recv_filter) { // recv connack { auto pv = ep->recv(am::filter::match, {am::control_packet_type::connack}, as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } ep->close(as::use_future).get(); diff --git a/test/unit/ut_ep_recv_max.cpp b/test/unit/ut_ep_recv_max.cpp index df6ecc18d..1195f200e 100644 --- a/test/unit/ut_ep_recv_max.cpp +++ b/test/unit/ut_ep_recv_max.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_recv_max) @@ -66,7 +66,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } auto pid_opt1 = ep->acquire_unique_packet_id(as::use_future).get(); @@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send publish_1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_1_q1, wp)); + BOOST_TEST(publish_1_q1 == wp); } ); { @@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send publish_2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_2_q1, wp)); + BOOST_TEST(publish_2_q1 == wp); } ); { @@ -162,7 +162,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send publish_3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_3_q2, wp)); + BOOST_TEST(publish_3_q2 == wp); pub3_send = true; p.set_value(); } @@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(client_send) { bool pub4_send = false; ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_4_q0, wp)); + BOOST_TEST(publish_4_q0 == wp); pub4_send = true; } ); @@ -190,7 +190,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // set send publish_3 checker again ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_3_q2, wp)); + BOOST_TEST(publish_3_q2 == wp); pub3_send = true; p.set_value(); } @@ -208,7 +208,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // recv puback2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(puback2, pv)); + BOOST_TEST(puback2 == pv); } f.get(); @@ -216,13 +216,13 @@ BOOST_AUTO_TEST_CASE(client_send) { // recv pubrec3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec3, pv)); + BOOST_TEST(pubrec3 == pv); } // send pubrel3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -233,7 +233,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // recv pubcomp3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubcomp3, pv)); + BOOST_TEST(pubcomp3 == pv); } ep->close(as::use_future).get(); guard.reset(); @@ -285,13 +285,13 @@ BOOST_AUTO_TEST_CASE(server_send) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -365,7 +365,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // send publish_1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_1_q1, wp)); + BOOST_TEST(publish_1_q1 == wp); } ); { @@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // send publish_2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_2_q1, wp)); + BOOST_TEST(publish_2_q1 == wp); } ); { @@ -390,7 +390,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // send publish_3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_3_q2, wp)); + BOOST_TEST(publish_3_q2 == wp); pub3_send = true; p.set_value(); } @@ -405,7 +405,7 @@ BOOST_AUTO_TEST_CASE(server_send) { bool pub4_send = false; ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_4_q0, wp)); + BOOST_TEST(publish_4_q0 == wp); pub4_send = true; } ); @@ -418,7 +418,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // set send publish_3 checker again ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_3_q2, wp)); + BOOST_TEST(publish_3_q2 == wp); pub3_send = true; p.set_value(); } @@ -427,7 +427,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // recv puback2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(puback2, pv)); + BOOST_TEST(puback2 == pv); } f.get(); @@ -435,13 +435,13 @@ BOOST_AUTO_TEST_CASE(server_send) { // recv pubrec3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec3, pv)); + BOOST_TEST(pubrec3 == pv); } // send pubrel3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -452,7 +452,7 @@ BOOST_AUTO_TEST_CASE(server_send) { // recv pubcomp3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubcomp3, pv)); + BOOST_TEST(pubcomp3 == pv); } ep->close(as::use_future).get(); guard.reset(); @@ -511,7 +511,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -522,7 +522,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } auto publish_1_q1 = am::v5::publish_packet( @@ -603,17 +603,17 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv publish1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_2_q1, pv)); + BOOST_TEST(publish_2_q1 == pv); } // recv publish3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_3_q0, pv)); + BOOST_TEST(publish_3_q0 == pv); } bool close_called = false; @@ -624,7 +624,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish4 @@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -662,7 +662,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } ep->next_layer().set_recv_packets( @@ -682,17 +682,17 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv publish1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish4 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_4_q2, pv)); + BOOST_TEST(publish_4_q2 == pv); } // send puback2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback2, wp)); + BOOST_TEST(puback2 == wp); } ); { @@ -702,7 +702,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // send pubrec3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec3, wp)); + BOOST_TEST(pubrec3 == wp); } ); { @@ -712,12 +712,12 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv pubrel3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrel3, pv)); + BOOST_TEST(pubrel3 == pv); } // send pubcomp3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp3, wp)); + BOOST_TEST(pubcomp3 == wp); } ); { @@ -727,17 +727,17 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv publish2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_2_q1, pv)); + BOOST_TEST(publish_2_q1 == pv); } // recv publish3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_3_q0, pv)); + BOOST_TEST(publish_3_q0 == pv); } // recv publish5 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_5_q1, pv)); + BOOST_TEST(publish_5_q1 == pv); } close_called = false; @@ -748,7 +748,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish6 @@ -821,13 +821,13 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv connect { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -913,17 +913,17 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv publish1 { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish2 { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_2_q1, pv)); + BOOST_TEST(publish_2_q1 == pv); } // recv publish3 { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_3_q0, pv)); + BOOST_TEST(publish_3_q0 == pv); } bool close_called = false; @@ -934,7 +934,7 @@ BOOST_AUTO_TEST_CASE(server_recv) { ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish4 @@ -961,13 +961,13 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv connect { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -992,17 +992,17 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv publish1 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish4 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_4_q2, pv)); + BOOST_TEST(publish_4_q2 == pv); } // send puback2 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(puback2, wp)); + BOOST_TEST(puback2 == wp); } ); { @@ -1012,7 +1012,7 @@ BOOST_AUTO_TEST_CASE(server_recv) { // send pubrec3 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrec3, wp)); + BOOST_TEST(pubrec3 == wp); } ); { @@ -1022,12 +1022,12 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv pubrel3 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrel3, pv)); + BOOST_TEST(pubrel3 == pv); } // send pubcomp3 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubcomp3, wp)); + BOOST_TEST(pubcomp3 == wp); } ); { @@ -1037,17 +1037,17 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv publish2 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_2_q1, pv)); + BOOST_TEST(publish_2_q1 == pv); } // recv publish3 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_3_q0, pv)); + BOOST_TEST(publish_3_q0 == pv); } // recv publish5 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_5_q1, pv)); + BOOST_TEST(publish_5_q1 == pv); } close_called = false; @@ -1058,7 +1058,7 @@ BOOST_AUTO_TEST_CASE(server_recv) { ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish6 diff --git a/test/unit/ut_ep_send_rt_chk.cpp b/test/unit/ut_ep_send_rt_chk.cpp index 2864166aa..52832e205 100644 --- a/test/unit/ut_ep_send_rt_chk.cpp +++ b/test/unit/ut_ep_send_rt_chk.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_send_rt_chk) diff --git a/test/unit/ut_ep_size_max.cpp b/test/unit/ut_ep_size_max.cpp index 458af4e7e..829fd8e08 100644 --- a/test/unit/ut_ep_size_max.cpp +++ b/test/unit/ut_ep_size_max.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_size_max) @@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // size: 21bytes @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(client_send) { // send publish_1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_1_q1, wp)); + BOOST_TEST(publish_1_q1 == wp); } ); { @@ -195,7 +195,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -206,7 +206,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } // size: 21bytes @@ -242,7 +242,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { // recv publish1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish2 @@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(client_recv) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { @@ -323,13 +323,13 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE(server_recv) { // recv publish1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_1_q1, pv)); + BOOST_TEST(publish_1_q1 == pv); } // recv publish2 @@ -381,7 +381,7 @@ BOOST_AUTO_TEST_CASE(server_recv) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); { diff --git a/test/unit/ut_ep_store.cpp b/test/unit/ut_ep_store.cpp index 1da1f8538..cd7414cca 100644 --- a/test/unit/ut_ep_store.cpp +++ b/test/unit/ut_ep_store.cpp @@ -14,7 +14,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_store) @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // recv connack_sp_false { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } auto close = am::make_error(am::errc::network_reset, "pseudo close"); @@ -146,7 +146,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send publish0 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish0, wp)); + BOOST_TEST(publish0 == wp); } ); { @@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send publish1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish1, wp)); + BOOST_TEST(publish1 == wp); } ); { @@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send publish2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish2, wp)); + BOOST_TEST(publish2 == wp); } ); { @@ -185,7 +185,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -201,10 +201,10 @@ BOOST_AUTO_TEST_CASE(v311_client) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish2dup, wp)); + BOOST_TEST(publish2dup == wp); p.set_value(); break; default: @@ -215,7 +215,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 2); @@ -223,13 +223,13 @@ BOOST_AUTO_TEST_CASE(v311_client) { // recv pubrec2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec2, pv)); + BOOST_TEST(pubrec2 == pv); } // send pubrel2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); } ); { @@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send pubrel3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -273,13 +273,13 @@ BOOST_AUTO_TEST_CASE(v311_client) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); break; case 2: - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); p.set_value(); break; default: @@ -290,7 +290,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 3); @@ -304,7 +304,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -321,7 +321,7 @@ BOOST_AUTO_TEST_CASE(v311_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } ep->close(as::use_future).get(); guard.reset(); @@ -403,13 +403,13 @@ BOOST_AUTO_TEST_CASE(v311_server) { // recv connect_no_clean { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // send connack_sp_false ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack_sp_false, wp)); + BOOST_TEST(connack_sp_false == wp); } ); { @@ -493,7 +493,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // send publish0 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish0, wp)); + BOOST_TEST(publish0 == wp); } ); { @@ -504,7 +504,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // send publish1 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish1, wp)); + BOOST_TEST(publish1 == wp); } ); { @@ -515,7 +515,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // send publish2 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish2, wp)); + BOOST_TEST(publish2 == wp); } ); { @@ -532,7 +532,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // recv connect_no_clean { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // get_stored and restore next endpoint @@ -549,13 +549,13 @@ BOOST_AUTO_TEST_CASE(v311_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_true, wp)); + BOOST_TEST(connack_sp_true == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 2: - BOOST_TEST(am::packet_compare(publish2dup, wp)); + BOOST_TEST(publish2dup == wp); p.set_value(); break; default: @@ -579,13 +579,13 @@ BOOST_AUTO_TEST_CASE(v311_server) { // recv pubrec2 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec2, pv)); + BOOST_TEST(pubrec2 == pv); } // send pubrel2 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); } ); { @@ -596,7 +596,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // send pubrel3 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -613,7 +613,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // recv connect_no_clean { auto pv = ep3->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // get_stored and restore next endpoint @@ -630,16 +630,16 @@ BOOST_AUTO_TEST_CASE(v311_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_true, wp)); + BOOST_TEST(connack_sp_true == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 2: - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); break; case 3: - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); p.set_value(); break; default: @@ -669,7 +669,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { // recv connect_clean { auto pv = ep4->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_clean, pv)); + BOOST_TEST(connect_clean == pv); } // no restore because clean_session is true @@ -682,7 +682,7 @@ BOOST_AUTO_TEST_CASE(v311_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_false, wp)); + BOOST_TEST(connack_sp_false == wp); p.set_value(); break; default: @@ -760,7 +760,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -771,7 +771,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // recv connack_sp_false { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } auto publish0 = am::v5::publish_packet( @@ -838,7 +838,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send publish0 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish0, wp)); + BOOST_TEST(publish0 == wp); } ); { @@ -849,7 +849,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send publish1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish1, wp)); + BOOST_TEST(publish1 == wp); } ); { @@ -860,7 +860,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send publish2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish2, wp)); + BOOST_TEST(publish2 == wp); } ); { @@ -877,7 +877,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -893,10 +893,10 @@ BOOST_AUTO_TEST_CASE(v5_client) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish2dup, wp)); + BOOST_TEST(publish2dup == wp); p.set_value(); break; default: @@ -907,7 +907,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 2); @@ -915,13 +915,13 @@ BOOST_AUTO_TEST_CASE(v5_client) { // recv pubrec2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec2, pv)); + BOOST_TEST(pubrec2 == pv); } // send pubrel2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); } ); { @@ -932,7 +932,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send pubrel3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -949,7 +949,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -965,13 +965,13 @@ BOOST_AUTO_TEST_CASE(v5_client) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); break; case 2: - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); p.set_value(); break; default: @@ -982,7 +982,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 3); @@ -996,7 +996,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1013,7 +1013,7 @@ BOOST_AUTO_TEST_CASE(v5_client) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } ep->close(as::use_future).get(); guard.reset(); @@ -1101,13 +1101,13 @@ BOOST_AUTO_TEST_CASE(v5_server) { // recv connect_no_clean { auto pv = ep1->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // send connack_sp_false ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack_sp_false, wp)); + BOOST_TEST(connack_sp_false == wp); } ); { @@ -1194,7 +1194,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // send publish0 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish0, wp)); + BOOST_TEST(publish0 == wp); } ); { @@ -1205,7 +1205,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // send publish1 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish1, wp)); + BOOST_TEST(publish1 == wp); } ); { @@ -1216,7 +1216,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // send publish2 ep1->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish2, wp)); + BOOST_TEST(publish2 == wp); } ); { @@ -1233,7 +1233,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // recv connect_no_clean { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // get_stored and restore next endpoint @@ -1250,13 +1250,13 @@ BOOST_AUTO_TEST_CASE(v5_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_true, wp)); + BOOST_TEST(connack_sp_true == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 2: - BOOST_TEST(am::packet_compare(publish2dup, wp)); + BOOST_TEST(publish2dup == wp); p.set_value(); break; default: @@ -1281,13 +1281,13 @@ BOOST_AUTO_TEST_CASE(v5_server) { // recv pubrec2 { auto pv = ep2->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec2, pv)); + BOOST_TEST(pubrec2 == pv); } // send pubrel2 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); } ); { @@ -1298,7 +1298,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // send pubrel3 ep2->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -1315,7 +1315,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // recv connect_no_clean { auto pv = ep3->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_no_clean, pv)); + BOOST_TEST(connect_no_clean == pv); } // get_stored and restore next endpoint @@ -1332,16 +1332,16 @@ BOOST_AUTO_TEST_CASE(v5_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_true, wp)); + BOOST_TEST(connack_sp_true == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish1dup, wp)); + BOOST_TEST(publish1dup == wp); break; case 2: - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); break; case 3: - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); p.set_value(); break; default: @@ -1371,7 +1371,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { // recv connect_clean { auto pv = ep4->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect_clean, pv)); + BOOST_TEST(connect_clean == pv); } // no restore because clean_session is true @@ -1384,7 +1384,7 @@ BOOST_AUTO_TEST_CASE(v5_server) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(connack_sp_false, wp)); + BOOST_TEST(connack_sp_false == wp); p.set_value(); break; default: @@ -1464,7 +1464,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1475,7 +1475,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // recv connack_sp_false { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } auto publish0 = am::v5::publish_packet( @@ -1562,7 +1562,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send publish0 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish0, wp)); + BOOST_TEST(publish0 == wp); } ); { @@ -1573,7 +1573,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send publish1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish1, wp)); + BOOST_TEST(publish1 == wp); } ); { @@ -1584,7 +1584,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send publish2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish2, wp)); + BOOST_TEST(publish2 == wp); } ); { @@ -1601,7 +1601,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1617,10 +1617,10 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1no_ta_dup, wp)); + BOOST_TEST(publish1no_ta_dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(publish2no_ta_dup, wp)); + BOOST_TEST(publish2no_ta_dup == wp); p.set_value(); break; default: @@ -1631,7 +1631,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 2); @@ -1639,13 +1639,13 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // recv pubrec2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(pubrec2, pv)); + BOOST_TEST(pubrec2 == pv); } // send pubrel2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); } ); { @@ -1656,7 +1656,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send pubrel3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); } ); { @@ -1673,7 +1673,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1689,13 +1689,13 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { [&](am::packet_variant wp) { switch (index++) { case 0: - BOOST_TEST(am::packet_compare(publish1no_ta_dup, wp)); + BOOST_TEST(publish1no_ta_dup == wp); break; case 1: - BOOST_TEST(am::packet_compare(pubrel2, wp)); + BOOST_TEST(pubrel2 == wp); break; case 2: - BOOST_TEST(am::packet_compare(pubrel3, wp)); + BOOST_TEST(pubrel3 == wp); p.set_value(); break; default: @@ -1706,7 +1706,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_true, pv)); + BOOST_TEST(connack_sp_true == pv); } f.get(); BOOST_TEST(index == 3); @@ -1720,7 +1720,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -1737,7 +1737,7 @@ BOOST_AUTO_TEST_CASE(v5_topic_alias) { ); { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack_sp_false, pv)); + BOOST_TEST(connack_sp_false == pv); } ep->close(as::use_future).get(); guard.reset(); diff --git a/test/unit/ut_ep_topic_alias.cpp b/test/unit/ut_ep_topic_alias.cpp index 539181337..fd6c34721 100644 --- a/test/unit/ut_ep_topic_alias.cpp +++ b/test/unit/ut_ep_topic_alias.cpp @@ -15,7 +15,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_ep_topic_alias) @@ -86,7 +86,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } auto pid_opt1 = ep->acquire_unique_packet_id(as::use_future).get(); @@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send publish_reg_t1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_reg_t1, wp)); + BOOST_TEST(publish_reg_t1 == wp); } ); { @@ -210,7 +210,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send publish_use_ta1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta1, wp)); + BOOST_TEST(publish_use_ta1 == wp); } ); { @@ -227,7 +227,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send publish_reg_t2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_reg_t2, wp)); + BOOST_TEST(publish_reg_t2 == wp); } ); { @@ -238,7 +238,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send publish_use_ta2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta2, wp)); + BOOST_TEST(publish_use_ta2 == wp); } ); { @@ -271,7 +271,7 @@ BOOST_AUTO_TEST_CASE(send_client) { // send publish_upd_t3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_upd_t3, wp)); + BOOST_TEST(publish_upd_t3 == wp); } ); { @@ -329,13 +329,13 @@ BOOST_AUTO_TEST_CASE(send_server) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(send_server) { // send publish_reg_t1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_reg_t1, wp)); + BOOST_TEST(publish_reg_t1 == wp); } ); { @@ -441,7 +441,7 @@ BOOST_AUTO_TEST_CASE(send_server) { // send publish_use_ta1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta1, wp)); + BOOST_TEST(publish_use_ta1 == wp); } ); { @@ -452,7 +452,7 @@ BOOST_AUTO_TEST_CASE(send_server) { // send publish_reg_t2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_reg_t2, wp)); + BOOST_TEST(publish_reg_t2 == wp); } ); { @@ -463,7 +463,7 @@ BOOST_AUTO_TEST_CASE(send_server) { // send publish_use_ta2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta2, wp)); + BOOST_TEST(publish_use_ta2 == wp); } ); { @@ -496,7 +496,7 @@ BOOST_AUTO_TEST_CASE(send_server) { // send publish_upd_t3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_upd_t3, wp)); + BOOST_TEST(publish_upd_t3 == wp); } ); { @@ -556,7 +556,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -567,7 +567,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } auto pid_opt1 = ep->acquire_unique_packet_id(as::use_future).get(); @@ -663,7 +663,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_mapped_ta1, wp)); + BOOST_TEST(publish_mapped_ta1 == wp); } ); { @@ -674,7 +674,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta1, wp)); + BOOST_TEST(publish_use_ta1 == wp); } ); { @@ -685,7 +685,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_mapped_ta2, wp)); + BOOST_TEST(publish_mapped_ta2 == wp); } ); { @@ -696,7 +696,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t2 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta2, wp)); + BOOST_TEST(publish_use_ta2 == wp); } ); { @@ -707,7 +707,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_mapped_ta1_2, wp)); + BOOST_TEST(publish_mapped_ta1_2 == wp); } ); { @@ -718,7 +718,7 @@ BOOST_AUTO_TEST_CASE(send_auto_map) { // send publish_t3 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_use_ta1_2, wp)); + BOOST_TEST(publish_use_ta1_2 == wp); } ); { @@ -778,7 +778,7 @@ BOOST_AUTO_TEST_CASE(send_auto_replace) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -789,7 +789,7 @@ BOOST_AUTO_TEST_CASE(send_auto_replace) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } auto pid_opt1 = ep->acquire_unique_packet_id(as::use_future).get(); @@ -849,7 +849,7 @@ BOOST_AUTO_TEST_CASE(send_auto_replace) { // send publish_t1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_t1, wp)); + BOOST_TEST(publish_t1 == wp); } ); { @@ -871,7 +871,7 @@ BOOST_AUTO_TEST_CASE(send_auto_replace) { // send publish_map_ta1 ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(publish_map_ta1, wp)); + BOOST_TEST(publish_map_ta1 == wp); } ); { @@ -883,7 +883,7 @@ BOOST_AUTO_TEST_CASE(send_auto_replace) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { // auto use - BOOST_TEST(am::packet_compare(publish_exp_ta1, wp)); + BOOST_TEST(publish_exp_ta1 == wp); } ); { @@ -950,7 +950,7 @@ BOOST_AUTO_TEST_CASE(recv_client) { // send connect ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connect, wp)); + BOOST_TEST(connect == wp); } ); { @@ -961,7 +961,7 @@ BOOST_AUTO_TEST_CASE(recv_client) { // recv connack { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connack, pv)); + BOOST_TEST(connack == pv); } }; @@ -1114,25 +1114,25 @@ BOOST_AUTO_TEST_CASE(recv_client) { // recv publish_reg_t1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_reg_t1, pv)); + BOOST_TEST(publish_reg_t1 == pv); } // recv publish_use_ta1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t1, pv)); + BOOST_TEST(publish_exp_t1 == pv); } // recv publish_reg_t2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_reg_t2, pv)); + BOOST_TEST(publish_reg_t2 == pv); } // recv publish_use_ta2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t2, pv)); + BOOST_TEST(publish_exp_t2 == pv); } @@ -1144,7 +1144,7 @@ BOOST_AUTO_TEST_CASE(recv_client) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish_reg_t3 (invalid) @@ -1171,7 +1171,7 @@ BOOST_AUTO_TEST_CASE(recv_client) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish_use_ta3 @@ -1192,13 +1192,13 @@ BOOST_AUTO_TEST_CASE(recv_client) { // recv publish_upd_t3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_upd_t3, pv)); + BOOST_TEST(publish_upd_t3 == pv); } // recv publish_use_ta1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t3, pv)); + BOOST_TEST(publish_exp_t3 == pv); } ep->close(as::use_future).get(); guard.reset(); @@ -1260,13 +1260,13 @@ BOOST_AUTO_TEST_CASE(recv_server) { // recv connect { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(connect, pv)); + BOOST_TEST(connect == pv); } // send connack ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { - BOOST_TEST(am::packet_compare(connack, wp)); + BOOST_TEST(connack == wp); } ); { @@ -1425,25 +1425,25 @@ BOOST_AUTO_TEST_CASE(recv_server) { // recv publish_reg_t1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_reg_t1, pv)); + BOOST_TEST(publish_reg_t1 == pv); } // recv publish_use_ta1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t1, pv)); + BOOST_TEST(publish_exp_t1 == pv); } // recv publish_reg_t2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_reg_t2, pv)); + BOOST_TEST(publish_reg_t2 == pv); } // recv publish_use_ta2 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t2, pv)); + BOOST_TEST(publish_exp_t2 == pv); } bool close_called = false; @@ -1454,7 +1454,7 @@ BOOST_AUTO_TEST_CASE(recv_server) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish_reg_t3 (invalid) @@ -1479,7 +1479,7 @@ BOOST_AUTO_TEST_CASE(recv_server) { ep->next_layer().set_write_packet_checker( [&](am::packet_variant wp) { BOOST_TEST(!close_called); - BOOST_TEST(am::packet_compare(disconnect, wp)); + BOOST_TEST(disconnect == wp); } ); // recv publish_use_ta3 @@ -1499,13 +1499,13 @@ BOOST_AUTO_TEST_CASE(recv_server) { // recv publish_upd_t3 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_upd_t3, pv)); + BOOST_TEST(publish_upd_t3 == pv); } // recv publish_use_ta1 { auto pv = ep->recv(as::use_future).get(); - BOOST_TEST(am::packet_compare(publish_exp_t3, pv)); + BOOST_TEST(publish_exp_t3 == pv); } ep->close(as::use_future).get(); diff --git a/test/unit/ut_strm.cpp b/test/unit/ut_strm.cpp index adda30cc7..d8c5c63ec 100644 --- a/test/unit/ut_strm.cpp +++ b/test/unit/ut_strm.cpp @@ -15,7 +15,7 @@ #include #include "stub_socket.hpp" -#include "packet_compare.hpp" +#include BOOST_AUTO_TEST_SUITE(ut_strm)