diff --git a/example/no_tls_both.cpp b/example/no_tls_both.cpp index 8fb61eb50..50bb47cc3 100644 --- a/example/no_tls_both.cpp +++ b/example/no_tls_both.cpp @@ -77,15 +77,10 @@ void client_proc( }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "[client] suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "[client] subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "[client] subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/no_tls_client.cpp b/example/no_tls_client.cpp index ad5eda9cb..ae7dafb13 100644 --- a/example/no_tls_client.cpp +++ b/example/no_tls_client.cpp @@ -85,15 +85,10 @@ int main(int argc, char** argv) { }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/no_tls_ws_both.cpp b/example/no_tls_ws_both.cpp index 9c5613a20..095209265 100644 --- a/example/no_tls_ws_both.cpp +++ b/example/no_tls_ws_both.cpp @@ -77,15 +77,10 @@ void client_proc( }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "[client] suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "[client] subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "[client] subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/no_tls_ws_client.cpp b/example/no_tls_ws_client.cpp index e9424d763..54bd025c9 100644 --- a/example/no_tls_ws_client.cpp +++ b/example/no_tls_ws_client.cpp @@ -85,15 +85,10 @@ int main(int argc, char** argv) { }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/tls_both.cpp b/example/tls_both.cpp index 0b6904c68..67516175a 100644 --- a/example/tls_both.cpp +++ b/example/tls_both.cpp @@ -78,15 +78,10 @@ void client_proc( }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "[client] suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "[client] subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "[client] subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/tls_client.cpp b/example/tls_client.cpp index d3aaf996e..b9bd8dd05 100644 --- a/example/tls_client.cpp +++ b/example/tls_client.cpp @@ -100,15 +100,10 @@ int main(int argc, char** argv) { }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/tls_ws_both.cpp b/example/tls_ws_both.cpp index a8c2585e0..f5500737d 100644 --- a/example/tls_ws_both.cpp +++ b/example/tls_ws_both.cpp @@ -77,15 +77,10 @@ void client_proc( }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "[client] suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "[client] subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "[client] subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/example/tls_ws_client.cpp b/example/tls_ws_client.cpp index 82c0a7765..de3a9d21a 100644 --- a/example/tls_ws_client.cpp +++ b/example/tls_ws_client.cpp @@ -91,15 +91,10 @@ int main(int argc, char** argv) { }); c->set_suback_handler( [&] - (packet_id_t packet_id, std::vector> results){ + (packet_id_t packet_id, std::vector results){ std::cout << "suback received. packet_id: " << packet_id << std::endl; for (auto const& e : results) { - if (e) { - std::cout << "subscribe success: " << static_cast(*e) << std::endl; - } - else { - std::cout << "subscribe failed" << std::endl; - } + std::cout << "[client] subscribe result: " << e << std::endl; } if (packet_id == pid_sub1) { c->publish("mqtt_client_cpp/topic1", "test1", MQTT_NS::qos::at_most_once); diff --git a/include/mqtt/endpoint.hpp b/include/mqtt/endpoint.hpp index 07cfb1f62..c8dc6662d 100644 --- a/include/mqtt/endpoint.hpp +++ b/include/mqtt/endpoint.hpp @@ -282,7 +282,7 @@ class endpoint : public std::enable_shared_from_this> qoss)>; + std::vector qoss)>; /** * @brief Unsubscribe handler @@ -11341,19 +11341,23 @@ class endpoint : public std::enable_shared_from_this> results; + // TODO: We can avoid an allocation by casting the raw bytes of the + // mqtt::buffer that is being parsed, and instead call the suback + // handler with an std::span and the mqtt::buffer (as lifekeeper) + std::vector results; results.resize(body.size()); std::transform( body.begin(), body.end(), results.begin(), - [&](auto const& e) -> optional { - if (e & variable_length_continue_flag) { - return nullopt; - } - else { - return static_cast(e); - } + // http://docs.oasis-open.org/mqtt/mqtt/v3.1.1/errata01/os/mqtt-v3.1.1-errata01-os-complete.html#_Toc442180880 + // The SUBACK Packet sent by the Server to the Client MUST + // contain a return code for each Topic Filter/QoS pair. + // This return code MUST either show the maximum QoS that + // was granted for that Subscription or indicate that the + // subscription failed [MQTT-3.8.4-5]. + [&](auto const& e) -> suback_reason_code { + return static_cast(e); } ); if (!h_suback_(info.packet_id, force_move(results))) { @@ -11364,12 +11368,22 @@ class endpoint : public std::enable_shared_from_this reasons; reasons.resize(body.size()); std::transform( body.begin(), body.end(), reasons.begin(), + // https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901170 + // The SUBACK packet sent by the Server to the Client MUST + // contain a Reason Code for each Topic Filter/Subscription + // Option pair [MQTT-3.8.4-6]. + // This Reason Code MUST either show the maximum QoS that + // was granted for that Subscription or indicate that the + // subscription failed [MQTT-3.8.4-7]. [&](auto const& e) { return static_cast(e); } diff --git a/test/as_buffer_async_pubsub_1.cpp b/test/as_buffer_async_pubsub_1.cpp index 9d90f2b1d..059553fb7 100644 --- a/test/as_buffer_async_pubsub_1.cpp +++ b/test/as_buffer_async_pubsub_1.cpp @@ -71,11 +71,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->async_publish( as::buffer("topic1", sizeof("topic1") - 1), as::buffer("topic1_contents", sizeof("topic1_contents") - 1), @@ -291,11 +291,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( @@ -511,11 +511,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( @@ -721,11 +721,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c->async_publish( as::buffer("topic1", sizeof("topic1") - 1), as::buffer("topic1_contents", sizeof("topic1_contents") - 1), @@ -949,11 +949,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( @@ -1169,11 +1169,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( diff --git a/test/as_buffer_async_pubsub_2.cpp b/test/as_buffer_async_pubsub_2.cpp index f007fbd9d..e095aec47 100644 --- a/test/as_buffer_async_pubsub_2.cpp +++ b/test/as_buffer_async_pubsub_2.cpp @@ -72,11 +72,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); c->async_publish( @@ -305,11 +305,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( @@ -532,11 +532,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); pid_pub = c->async_publish( @@ -740,11 +740,11 @@ BOOST_AUTO_TEST_CASE( publish_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); c->async_publish( @@ -949,11 +949,11 @@ BOOST_AUTO_TEST_CASE( publish_function_buffer ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto topic1 = MQTT_NS::allocate_buffer("topic1"); auto contents = MQTT_NS::allocate_buffer("topic1_contents"); c->async_publish( @@ -1163,11 +1163,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto topic1 = std::make_shared("topic1"); auto contents = std::make_shared("topic1_contents"); auto ret = c->async_publish_dup( diff --git a/test/as_buffer_pubsub.cpp b/test/as_buffer_pubsub.cpp index 3ed496a39..50dcac178 100644 --- a/test/as_buffer_pubsub.cpp +++ b/test/as_buffer_pubsub.cpp @@ -64,11 +64,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -254,11 +254,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -448,11 +448,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -632,11 +632,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -831,11 +831,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -1030,11 +1030,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -1212,11 +1212,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -1411,11 +1411,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -1610,11 +1610,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -1792,11 +1792,11 @@ BOOST_AUTO_TEST_CASE( publish_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -1973,11 +1973,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto ret = c->publish_dup(1, "topic1", "topic1_contents", MQTT_NS::qos::at_least_once); BOOST_TEST(ret == true); return true; diff --git a/test/as_buffer_sub.cpp b/test/as_buffer_sub.cpp index fd49cf4c6..82d529a2d 100644 --- a/test/as_buffer_sub.cpp +++ b/test/as_buffer_sub.cpp @@ -44,7 +44,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_single ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe("topic1"); return true; @@ -140,7 +140,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_arg ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe({"topic1"s, "topic2"s}); return true; @@ -241,7 +241,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_vec ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe(std::vector{"topic1", "topic2"}); return true; @@ -340,7 +340,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_single_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); auto topic = std::make_shared("topic1"); c->async_unsubscribe( @@ -449,7 +449,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_arg_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); auto topic1 = std::make_shared("topic1"); auto topic2 = std::make_shared("topic2"); @@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_vec_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); auto topic1 = std::make_shared("topic1"); auto topic2 = std::make_shared("topic2"); diff --git a/test/async_pubsub_1.cpp b/test/async_pubsub_1.cpp index 1a9e7a88c..54eee7cad 100644 --- a/test/async_pubsub_1.cpp +++ b/test/async_pubsub_1.cpp @@ -49,11 +49,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -259,11 +259,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -453,11 +453,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -637,11 +637,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -833,11 +833,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -1027,11 +1027,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); diff --git a/test/async_pubsub_2.cpp b/test/async_pubsub_2.cpp index 38a6fbc29..7b9acb64e 100644 --- a/test/async_pubsub_2.cpp +++ b/test/async_pubsub_2.cpp @@ -69,11 +69,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -265,11 +265,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -461,11 +461,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -642,11 +642,11 @@ BOOST_AUTO_TEST_CASE( publish_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->async_publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -823,11 +823,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto ret = c->async_publish_dup(1, "topic1", "topic1_contents", MQTT_NS::qos::at_least_once); BOOST_TEST(ret == true); @@ -1008,11 +1008,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function_buffer ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto ret = c->async_publish_dup(1, "topic1"_mb, "topic1_contents"_mb, MQTT_NS::qos::at_least_once); BOOST_TEST(ret == true); diff --git a/test/length_check.cpp b/test/length_check.cpp index 6bff66839..dcc9ad558 100644 --- a/test/length_check.cpp +++ b/test/length_check.cpp @@ -55,7 +55,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; diff --git a/test/manual_publish.cpp b/test/manual_publish.cpp index d59713504..58c9e71f1 100644 --- a/test/manual_publish.cpp +++ b/test/manual_publish.cpp @@ -86,11 +86,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); BOOST_TEST(c->publish( 0, "topic1", diff --git a/test/multi_sub.cpp b/test/multi_sub.cpp index 667d3c8b2..d67e63575 100644 --- a/test/multi_sub.cpp +++ b/test/multi_sub.cpp @@ -85,12 +85,12 @@ BOOST_AUTO_TEST_CASE( multi_channel ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 2U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); - BOOST_TEST(*results[1] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[1] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -227,11 +227,11 @@ BOOST_AUTO_TEST_CASE( multi_client_qos0 ) { }); c1->set_suback_handler( [&chk, &c1, &sub_count, &pid_sub1] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_1"); BOOST_TEST(packet_id == pid_sub1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); if (++sub_count == 2) c1->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; @@ -310,11 +310,11 @@ BOOST_AUTO_TEST_CASE( multi_client_qos0 ) { }); c2->set_suback_handler( [&chk, &c2, &sub_count, &pid_sub2] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_2"); BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); if (++sub_count == 2) c2->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; @@ -433,11 +433,11 @@ BOOST_AUTO_TEST_CASE( multi_client_qos1 ) { }); c1->set_suback_handler( [&chk, &c1ready, &c2ready, &c3ready, &c3, &pid_sub1, &pid_pub3] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_1"); BOOST_TEST(packet_id == pid_sub1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c1ready = true; if (c1ready && c2ready && c3ready) { @@ -497,11 +497,11 @@ BOOST_AUTO_TEST_CASE( multi_client_qos1 ) { }); c2->set_suback_handler( [&chk, &c1ready, &c2ready, &c3ready, &c3, &pid_sub2, &pid_pub3] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_2"); BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c2ready = true; if (c1ready && c2ready && c3ready) { diff --git a/test/pubsub.cpp b/test/pubsub.cpp index e891493bd..ac5ed4719 100644 --- a/test/pubsub.cpp +++ b/test/pubsub.cpp @@ -65,11 +65,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -259,11 +259,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -457,11 +457,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -641,11 +641,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -839,11 +839,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -1037,11 +1037,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -1225,11 +1225,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -1419,11 +1419,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -1618,11 +1618,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -1800,11 +1800,11 @@ BOOST_AUTO_TEST_CASE( publish_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -1978,11 +1978,11 @@ BOOST_AUTO_TEST_CASE( publish_function_buffer ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1"_mb, "topic1_contents"_mb, MQTT_NS::qos::at_most_once); return true; }); @@ -2159,11 +2159,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto ret = c->publish_dup(1, "topic1", "topic1_contents", MQTT_NS::qos::at_least_once); BOOST_TEST(ret == true); @@ -2344,11 +2344,11 @@ BOOST_AUTO_TEST_CASE( publish_dup_function_buffer ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); auto ret = c->publish_dup(1, "topic1"_mb, "topic1_contents"_mb, MQTT_NS::qos::at_least_once); BOOST_TEST(ret == true); diff --git a/test/pubsub_no_strand.cpp b/test/pubsub_no_strand.cpp index 860d3f6b9..e3b1ed773 100644 --- a/test/pubsub_no_strand.cpp +++ b/test/pubsub_no_strand.cpp @@ -81,11 +81,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -188,11 +188,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -296,11 +296,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos0 ) { }); c->set_suback_handler( [&chk, &c, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == 1); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -398,11 +398,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -513,11 +513,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -630,11 +630,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos1 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -733,11 +733,11 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); @@ -848,11 +848,11 @@ BOOST_AUTO_TEST_CASE( pub_qos1_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_least_once); return true; }); @@ -965,11 +965,11 @@ BOOST_AUTO_TEST_CASE( pub_qos2_sub_qos2 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &pid_pub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); pid_pub = c->publish("topic1", "topic1_contents", MQTT_NS::qos::exactly_once); return true; }); @@ -1068,11 +1068,11 @@ BOOST_AUTO_TEST_CASE( publish_function ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", "topic1_contents", MQTT_NS::qos::at_most_once); return true; }); diff --git a/test/remaining_length.cpp b/test/remaining_length.cpp index d22d3994d..5040a3fed 100644 --- a/test/remaining_length.cpp +++ b/test/remaining_length.cpp @@ -80,11 +80,11 @@ BOOST_AUTO_TEST_CASE( pub_sub_over_127 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &test_contents] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", test_contents, MQTT_NS::qos::at_most_once); return true; }); @@ -189,11 +189,11 @@ BOOST_AUTO_TEST_CASE( pub_sub_over_16384 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &test_contents] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", test_contents, MQTT_NS::qos::at_most_once); return true; }); @@ -300,11 +300,11 @@ BOOST_AUTO_TEST_CASE( pub_sub_over_2097152 ) { }); c->set_suback_handler( [&chk, &c, &pid_sub, &test_contents] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c->publish("topic1", test_contents, MQTT_NS::qos::at_most_once); return true; }); diff --git a/test/retain.cpp b/test/retain.cpp index 83200d86a..60156d468 100644 --- a/test/retain.cpp +++ b/test/retain.cpp @@ -69,11 +69,11 @@ BOOST_AUTO_TEST_CASE( simple ) { }); c->set_suback_handler( [&chk, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); return true; }); c->set_unsuback_handler( @@ -255,11 +255,11 @@ BOOST_AUTO_TEST_CASE( overwrite ) { }); c->set_suback_handler( [&chk, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback"); BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); return true; }); c->set_unsuback_handler( @@ -442,10 +442,10 @@ BOOST_AUTO_TEST_CASE( retain_and_publish ) { }); c->set_suback_handler( [&chk, &c, &pid_sub] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { BOOST_TEST(packet_id == pid_sub); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto ret = chk.match( "h_connack", [&] { diff --git a/test/sub.cpp b/test/sub.cpp index 299e181a0..cb3adba01 100644 --- a/test/sub.cpp +++ b/test/sub.cpp @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_single ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe("topic1"); return true; @@ -137,7 +137,7 @@ BOOST_AUTO_TEST_CASE( sub_v5_options ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe("topic1"); return true; @@ -236,7 +236,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_arg ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->unsubscribe( { MQTT_NS::string_view{"topic1"}, MQTT_NS::string_view{"topic2"} } ); return true; @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_vec ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); std::vector v { @@ -439,7 +439,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_single_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->async_unsubscribe("topic1", [](boost::system::error_code const&) {}); return true; @@ -536,7 +536,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_arg_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); c->async_unsubscribe( std::vector { @@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE( pub_qos0_sub_string_multi_vec_async ) { }); c->set_suback_handler( [&chk, &c] - (packet_id_t /*packet_id*/, std::vector> /*results*/) { + (packet_id_t /*packet_id*/, std::vector /*results*/) { MQTT_CHK("h_suback"); std::vector v { diff --git a/test/will.cpp b/test/will.cpp index 281699f1d..a37c3e542 100644 --- a/test/will.cpp +++ b/test/will.cpp @@ -106,11 +106,11 @@ BOOST_AUTO_TEST_CASE( will_qos0 ) { }); c2->set_suback_handler( [&chk, &c1_force_disconnect, &pid_sub2] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_2"); BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); c1_force_disconnect(); return true; }); @@ -233,11 +233,11 @@ BOOST_AUTO_TEST_CASE( will_qos1 ) { }); c2->set_suback_handler( [&chk, &c1_force_disconnect, &pid_sub2] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_2"); BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_1); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_1); c1_force_disconnect(); return true; }); @@ -362,11 +362,11 @@ BOOST_AUTO_TEST_CASE( will_qos2 ) { }); c2->set_suback_handler( [&chk, &c1_force_disconnect, &pid_sub2] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { MQTT_CHK("h_suback_2"); BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_2); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_2); c1_force_disconnect(); return true; }); @@ -499,10 +499,10 @@ BOOST_AUTO_TEST_CASE( will_retain ) { }); c2->set_suback_handler( [&chk, &c1_force_disconnect, &pid_sub2] - (packet_id_t packet_id, std::vector> results) { + (packet_id_t packet_id, std::vector results) { BOOST_TEST(packet_id == pid_sub2); BOOST_TEST(results.size() == 1U); - BOOST_TEST(*results[0] == MQTT_NS::suback_reason_code::granted_qos_0); + BOOST_TEST(results[0] == MQTT_NS::suback_reason_code::granted_qos_0); auto ret = chk.match( "h_connack_2", [&] {