Fixed test.

redboltz · Nov 26, 2024 · 3d6967a · 3d6967a
1 parent 8e91b3a
commit 3d6967a
Showing 1 changed file with 27 additions and 12 deletions.
diff --git a/test/system/st_inflight.cpp b/test/system/st_inflight.cpp
@@ -70,10 +70,13 @@ BOOST_AUTO_TEST_CASE(v311_to_broker) {
                         }
                    }
                 );
+
+                BOOST_TEST(ep().register_packet_id(1));
+                BOOST_TEST(ep().register_packet_id(2));
                 // publish QoS1
                 yield ep().async_send(
                     am::v3_1_1::publish_packet{
-                        *ep().acquire_unique_packet_id(),
+                        1,
                         "topic1",
                         "payload1",
                         am::qos::at_least_once | am::pub::retain::yes | am::pub::dup::no
@@ -85,7 +88,7 @@ BOOST_AUTO_TEST_CASE(v311_to_broker) {
                 // publish QoS2
                 yield ep().async_send(
                     am::v3_1_1::publish_packet{
-                        *ep().acquire_unique_packet_id(),
+                        2,
                         "topic1",
                         "payload1",
                         am::qos::exactly_once | am::pub::retain::no | am::pub::dup::no
@@ -126,12 +129,16 @@ BOOST_AUTO_TEST_CASE(v311_to_broker) {
                         }
                    }
                 );
-                // recv puback
+                static std::set<am::packet_variant> exp {
+                    am::v3_1_1::puback_packet{1},
+                    am::v3_1_1::pubrec_packet{2}
+                };
+                // recv puback or pubrec
                 yield ep().async_recv(*this);
-                BOOST_TEST(*pv_opt == am::v3_1_1::puback_packet{1});
+                BOOST_TEST(exp.erase(*pv_opt) == 1);
                 // recv pubrec
                 yield ep().async_recv(*this);
-                BOOST_TEST(*pv_opt == am::v3_1_1::pubrec_packet{2});
+                BOOST_TEST(exp.erase(*pv_opt) == 1);
                 // send pubrel
                 yield ep().async_send(am::v3_1_1::pubrel_packet{2}, *this);
 
@@ -241,10 +248,14 @@ BOOST_AUTO_TEST_CASE(v5_to_broker) {
                         }
                    }
                 );
+
+                BOOST_TEST(ep().register_packet_id(1));
+                BOOST_TEST(ep().register_packet_id(2));
+
                 // publish QoS1
                 yield ep().async_send(
                     am::v5::publish_packet{
-                        *ep().acquire_unique_packet_id(),
+                        1,
                         "topic1",
                         "payload1",
                         am::qos::at_least_once | am::pub::retain::yes | am::pub::dup::no
@@ -256,7 +267,7 @@ BOOST_AUTO_TEST_CASE(v5_to_broker) {
                 // publish QoS2
                 yield ep().async_send(
                     am::v5::publish_packet{
-                        *ep().acquire_unique_packet_id(),
+                        2,
                         "topic1",
                         "payload1",
                         am::qos::exactly_once | am::pub::retain::no | am::pub::dup::no
@@ -298,15 +309,19 @@ BOOST_AUTO_TEST_CASE(v5_to_broker) {
                         }
                    }
                 );
+
+                static std::set<am::packet_variant> exp {
+                    am::v5::puback_packet{1, am::puback_reason_code::no_matching_subscribers},
+                    am::v5::pubrec_packet{2, am::pubrec_reason_code::no_matching_subscribers},
+                    am::v5::pubrec_packet{2} // already handled in the broker
+                };
+
                 // recv puback
                 yield ep().async_recv(*this);
-                BOOST_TEST(*pv_opt == (am::v5::puback_packet{1, am::puback_reason_code::no_matching_subscribers}));
+                BOOST_TEST(exp.erase(*pv_opt) == 1);
                 // recv pubrec
                 yield ep().async_recv(*this);
-                BOOST_CHECK(
-                    *pv_opt == (am::v5::pubrec_packet{2, am::pubrec_reason_code::no_matching_subscribers}) ||
-                    *pv_opt == (am::v5::pubrec_packet{2})
-                );
+                BOOST_TEST(exp.erase(*pv_opt) == 1);
 
                 // send pubrel
                 yield ep().async_send(am::v5::pubrel_packet{2}, *this);