tests

Author: pavel-kirienko

tests/src/test_e2e_api.cpp

@@ -21,9 +21,9 @@ struct CapturedFrame
 
 struct FeedbackState
 {
-    size_t   count       = 0;
-    bool     success     = false;
-    uint64_t transfer_id = 0;
+    size_t   count            = 0;
+    uint32_t acknowledgements = 0;
+    uint64_t transfer_id      = 0;
 };
 
 struct RxContext
@@ -75,8 +75,8 @@ void record_feedback(udpard_tx_t*, const udpard_tx_feedback_t fb)
     auto* st = static_cast<FeedbackState*>(fb.user.ptr[0]);
     if (st != nullptr) {
         st->count++;
-        st->success     = fb.success;
-        st->transfer_id = fb.transfer_id;
+        st->acknowledgements = fb.acknowledgements;
+        st->transfer_id      = fb.transfer_id;
     }
 }
 
@@ -290,7 +290,7 @@ void test_reliable_delivery_under_losses()
     }
 
     TEST_ASSERT_EQUAL_size_t(1, fb.count);
-    TEST_ASSERT_TRUE(fb.success);
+    TEST_ASSERT_EQUAL_UINT32(1, fb.acknowledgements);
     TEST_ASSERT_EQUAL_size_t(1, ctx.received);
     TEST_ASSERT_EQUAL_size_t(0, ctx.collisions);
 
@@ -359,7 +359,7 @@ void test_reliable_stats_and_failures()
     exp_frames.clear();
     udpard_tx_poll(&exp_tx, 20, UDPARD_IFACE_MASK_ALL);
     TEST_ASSERT_EQUAL_size_t(1, fb_fail.count);
-    TEST_ASSERT_FALSE(fb_fail.success);
+    TEST_ASSERT_EQUAL_UINT32(0, fb_fail.acknowledgements);
     TEST_ASSERT_GREATER_THAN_UINT64(0, exp_tx.errors_expiration);
     udpard_tx_free(&exp_tx);
     TEST_ASSERT_EQUAL_size_t(0, exp_alloc_transfer.allocated_fragments);

tests/src/test_e2e_edge.cpp

@@ -21,9 +21,9 @@ constexpr udpard_rx_port_p2p_vtable_t p2p_callbacks{ &on_message_p2p };
 
 struct FbState
 {
-    size_t   count   = 0;
-    bool     success = false;
-    uint64_t tid     = 0;
+    size_t   count            = 0;
+    uint32_t acknowledgements = 0;
+    uint64_t tid              = 0;
 };
 
 struct CapturedFrame
@@ -58,8 +58,8 @@ void fb_record(udpard_tx_t*, const udpard_tx_feedback_t fb)
     auto* st = static_cast<FbState*>(fb.user.ptr[0]);
     if (st != nullptr) {
         st->count++;
-        st->success = fb.success;
-        st->tid     = fb.transfer_id;
+        st->acknowledgements = fb.acknowledgements;
+        st->tid              = fb.transfer_id;
     }
 }
 
@@ -373,7 +373,7 @@ void test_udpard_tx_feedback_always_called()
                                                        make_user_context(&fb)));
         udpard_tx_poll(&tx, 11, UDPARD_IFACE_MASK_ALL);
         TEST_ASSERT_EQUAL_size_t(1, fb.count);
-        TEST_ASSERT_FALSE(fb.success);
+        TEST_ASSERT_EQUAL_UINT32(0, fb.acknowledgements);
         release_frames(frames);
         udpard_tx_free(&tx);
     }
@@ -409,7 +409,7 @@ void test_udpard_tx_feedback_always_called()
                              fb_record,
                              make_user_context(&fb_new));
         TEST_ASSERT_EQUAL_size_t(1, fb_old.count);
-        TEST_ASSERT_FALSE(fb_old.success);
+        TEST_ASSERT_EQUAL_UINT32(0, fb_old.acknowledgements);
         TEST_ASSERT_GREATER_OR_EQUAL_UINT64(1, tx.errors_sacrifice);
         TEST_ASSERT_EQUAL_size_t(0, fb_new.count);
         release_frames(frames);
@@ -437,7 +437,7 @@ void test_udpard_tx_feedback_always_called()
                                                        make_user_context(&fb)));
         udpard_tx_free(&tx);
         TEST_ASSERT_EQUAL_size_t(1, fb.count);
-        TEST_ASSERT_FALSE(fb.success);
+        TEST_ASSERT_EQUAL_UINT32(0, fb.acknowledgements);
         release_frames(frames);
     }
 

tests/src/test_e2e_random.cpp

@@ -109,7 +109,7 @@ void record_feedback(udpard_tx_t*, const udpard_tx_feedback_t fb)
 {
     auto* ctx = static_cast<Context*>(fb.user.ptr[0]);
     if (ctx != nullptr) {
-        if (fb.success) {
+        if (fb.acknowledgements > 0U) {
             ctx->reliable_feedback_success++;
         } else {
             ctx->reliable_feedback_failure++;

tests/src/test_e2e_responses.cpp

@@ -55,20 +55,20 @@ constexpr udpard_mem_deleter_t tx_payload_deleter{ .user = nullptr, .free = &tx_
 
 struct FeedbackState
 {
-    size_t   count       = 0;
-    bool     success     = false;
-    uint64_t topic_hash  = 0;
-    uint64_t transfer_id = 0;
+    size_t   count            = 0;
+    uint32_t acknowledgements = 0;
+    uint64_t topic_hash       = 0;
+    uint64_t transfer_id      = 0;
 };
 
 void record_feedback(udpard_tx_t*, const udpard_tx_feedback_t fb)
 {
     auto* st = static_cast<FeedbackState*>(fb.user.ptr[0]);
     if (st != nullptr) {
         st->count++;
-        st->success     = fb.success;
-        st->topic_hash  = fb.topic_hash;
-        st->transfer_id = fb.transfer_id;
+        st->acknowledgements = fb.acknowledgements;
+        st->topic_hash       = fb.topic_hash;
+        st->transfer_id      = fb.transfer_id;
     }
 }
 
@@ -353,7 +353,7 @@ void test_topic_with_p2p_response()
     now += 100;
     udpard_tx_poll(&a_tx, now, UDPARD_IFACE_MASK_ALL);
     TEST_ASSERT_EQUAL_size_t(1, a_topic_fb.count);
-    TEST_ASSERT_TRUE(a_topic_fb.success);
+    TEST_ASSERT_EQUAL_UINT32(1, a_topic_fb.acknowledgements);
     TEST_ASSERT_EQUAL_UINT64(topic_hash, a_topic_fb.topic_hash);
     TEST_ASSERT_EQUAL_UINT64(transfer_id, a_topic_fb.transfer_id);
 
@@ -426,7 +426,7 @@ void test_topic_with_p2p_response()
     now += 100;
     udpard_tx_poll(&b_tx, now, UDPARD_IFACE_MASK_ALL);
     TEST_ASSERT_EQUAL_size_t(1, b_response_fb.count);
-    TEST_ASSERT_TRUE(b_response_fb.success);
+    TEST_ASSERT_EQUAL_UINT32(1, b_response_fb.acknowledgements);
     TEST_ASSERT_EQUAL_UINT64(topic_hash, b_response_fb.topic_hash);
     TEST_ASSERT_EQUAL_UINT64(transfer_id, b_response_fb.transfer_id);
 
@@ -725,10 +725,10 @@ void test_topic_with_p2p_response_under_loss()
     TEST_ASSERT_TRUE(first_resp_ack_dropped);
 
     TEST_ASSERT_EQUAL_size_t(1, a_topic_fb.count);
-    TEST_ASSERT_TRUE(a_topic_fb.success);
+    TEST_ASSERT_EQUAL_UINT32(1, a_topic_fb.acknowledgements);
 
     TEST_ASSERT_EQUAL_size_t(1, b_response_fb.count);
-    TEST_ASSERT_TRUE(b_response_fb.success);
+    TEST_ASSERT_EQUAL_UINT32(1, b_response_fb.acknowledgements);
     TEST_ASSERT_EQUAL_UINT64(topic_hash, b_response_fb.topic_hash);
     TEST_ASSERT_EQUAL_UINT64(transfer_id, b_response_fb.transfer_id);
 

tests/src/test_intrusive_tx.c

@@ -645,7 +645,7 @@ static void test_tx_cancel(void)
     TEST_ASSERT_TRUE(udpard_tx_cancel(&tx, 200, 1));
     TEST_ASSERT_NULL(tx_transfer_find(&tx, 200, 1));
     TEST_ASSERT_EQUAL_size_t(1, fstate.count);
-    TEST_ASSERT_FALSE(fstate.last.success);
+    TEST_ASSERT_EQUAL_UINT32(0, fstate.last.acknowledgements);
     TEST_ASSERT_EQUAL_size_t(0, tx.enqueued_frames_count);
     TEST_ASSERT_FALSE(udpard_tx_cancel(&tx, 200, 1));