From ccc8d48efc7c981b82a70f1f593095c33ae46419 Mon Sep 17 00:00:00 2001 From: Bruno Iljazovic Date: Fri, 22 Mar 2024 11:13:35 +0100 Subject: [PATCH] Fix MSVC warning and test fail. Reviewers: korina Reviewed By: korina Differential Revision: https://repo.mireo.local/D28583 --- test/integration/async_sender.cpp | 26 ++++++++++++-------------- test/integration/read_message.cpp | 2 +- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/test/integration/async_sender.cpp b/test/integration/async_sender.cpp index d25447d..0162ffe 100644 --- a/test/integration/async_sender.cpp +++ b/test/integration/async_sender.cpp @@ -26,6 +26,7 @@ struct shared_test_data { const std::string connack = encoders::encode_connack( false, reason_codes::success.value(), {} ); + std::string connack_rm; const std::string publish_qos1 = encoders::encode_publish( 1, topic, payload, qos_e::at_least_once, retain_e::no, dup_e::no, {} @@ -35,6 +36,15 @@ struct shared_test_data { ); const std::string puback = encoders::encode_puback(1, uint8_t(0x00), {}); + + shared_test_data() { + connack_props props; + props[prop::receive_maximum] = uint16_t(1); + + connack_rm = encoders::encode_connack( + false, reason_codes::success.value(), props + ); + } }; using test::after; @@ -144,7 +154,7 @@ BOOST_FIXTURE_TEST_CASE(sub_unsub_ordering_after_reconnect, shared_test_data) { .reply_with(connack, after(2ms)) .expect(subscribe, unsubscribe) .complete_with(success, after(1ms)) - .send(disconnect, after(5ms)) + .send(disconnect, after(50ms)) .expect(connect) .complete_with(success, after(1ms)) .reply_with(connack, after(2ms)) @@ -195,14 +205,7 @@ BOOST_FIXTURE_TEST_CASE(throttling, shared_test_data) { constexpr int expected_handlers_called = 3; int handlers_called = 0; - connack_props props; - props[prop::receive_maximum] = uint16_t(1); - - //packets - auto connack_rm = encoders::encode_connack( - false, reason_codes::success.value(), props - ); - + // packets auto publish_1 = encoders::encode_publish( 1, topic, payload, qos_e::at_least_once, retain_e::no, dup_e::no, {} ); @@ -268,11 +271,6 @@ BOOST_FIXTURE_TEST_CASE(throttling_ordering, shared_test_data) { int handlers_called = 0; // packets - connack_props props; - props[prop::receive_maximum] = 2; - const std::string connack = encoders::encode_connack( - false, reason_codes::success.value(), props - ); auto publish_qos0 = encoders::encode_publish( 0, topic, payload, qos_e::at_most_once, retain_e::no, dup_e::no, {} ); diff --git a/test/integration/read_message.cpp b/test/integration/read_message.cpp index ee112ba..3cc8c3c 100644 --- a/test/integration/read_message.cpp +++ b/test/integration/read_message.cpp @@ -134,7 +134,7 @@ BOOST_FIXTURE_TEST_CASE(receive_disconnect, shared_test_data) { .expect(connect) .complete_with(success, after(0ms)) .reply_with(connack, after(0ms)) - .send(disconnect, after(5ms)) + .send(disconnect, after(50ms)) .expect(connect) .complete_with(success, after(0ms)) .reply_with(connack, after(0ms));