@@ -2144,6 +2144,7 @@ TEST_F(TestReliableMessageProtocol, CheckReliableMessageAnalyticsForTransmitEven
2144
2144
EXPECT_EQ (firstTransmitEvent.nodeId , expectedNodeId);
2145
2145
EXPECT_EQ (firstTransmitEvent.fabricIndex , expectedFabricIndex);
2146
2146
EXPECT_EQ (firstTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kInitialSend );
2147
+ EXPECT_EQ (firstTransmitEvent.retransmissionCount , std::nullopt);
2147
2148
// We have no way of validating the first messageCounter since this is a randomly generated value, but it should
2148
2149
// remain constant for all subsequent transmit events in this test.
2149
2150
const uint32_t messageCounter = firstTransmitEvent.messageCounter ;
@@ -2153,34 +2154,39 @@ TEST_F(TestReliableMessageProtocol, CheckReliableMessageAnalyticsForTransmitEven
2153
2154
EXPECT_EQ (secondTransmitEvent.nodeId , expectedNodeId);
2154
2155
EXPECT_EQ (secondTransmitEvent.fabricIndex , expectedFabricIndex);
2155
2156
EXPECT_EQ (secondTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2157
+ EXPECT_EQ (secondTransmitEvent.retransmissionCount , 1 );
2156
2158
EXPECT_EQ (messageCounter, secondTransmitEvent.messageCounter );
2157
2159
2158
2160
testAnalyticsDelegate.mTransmitEvents .pop ();
2159
2161
auto thirdTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2160
2162
EXPECT_EQ (thirdTransmitEvent.nodeId , expectedNodeId);
2161
2163
EXPECT_EQ (thirdTransmitEvent.fabricIndex , expectedFabricIndex);
2162
2164
EXPECT_EQ (thirdTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2165
+ EXPECT_EQ (thirdTransmitEvent.retransmissionCount , 2 );
2163
2166
EXPECT_EQ (messageCounter, thirdTransmitEvent.messageCounter );
2164
2167
2165
2168
testAnalyticsDelegate.mTransmitEvents .pop ();
2166
- auto forthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2167
- EXPECT_EQ (forthTransmitEvent.nodeId , expectedNodeId);
2168
- EXPECT_EQ (forthTransmitEvent.fabricIndex , expectedFabricIndex);
2169
- EXPECT_EQ (forthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2170
- EXPECT_EQ (messageCounter, forthTransmitEvent.messageCounter );
2169
+ auto fourthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2170
+ EXPECT_EQ (fourthTransmitEvent.nodeId , expectedNodeId);
2171
+ EXPECT_EQ (fourthTransmitEvent.fabricIndex , expectedFabricIndex);
2172
+ EXPECT_EQ (fourthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2173
+ EXPECT_EQ (fourthTransmitEvent.retransmissionCount , 3 );
2174
+ EXPECT_EQ (messageCounter, fourthTransmitEvent.messageCounter );
2171
2175
2172
2176
testAnalyticsDelegate.mTransmitEvents .pop ();
2173
2177
auto fifthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2174
2178
EXPECT_EQ (fifthTransmitEvent.nodeId , expectedNodeId);
2175
2179
EXPECT_EQ (fifthTransmitEvent.fabricIndex , expectedFabricIndex);
2176
2180
EXPECT_EQ (fifthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2181
+ EXPECT_EQ (fifthTransmitEvent.retransmissionCount , 4 );
2177
2182
EXPECT_EQ (messageCounter, fifthTransmitEvent.messageCounter );
2178
2183
2179
2184
testAnalyticsDelegate.mTransmitEvents .pop ();
2180
2185
auto sixthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2181
2186
EXPECT_EQ (sixthTransmitEvent.nodeId , expectedNodeId);
2182
2187
EXPECT_EQ (sixthTransmitEvent.fabricIndex , expectedFabricIndex);
2183
2188
EXPECT_EQ (sixthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kAcknowledged );
2189
+ EXPECT_EQ (sixthTransmitEvent.retransmissionCount , std::nullopt);
2184
2190
EXPECT_EQ (messageCounter, sixthTransmitEvent.messageCounter );
2185
2191
}
2186
2192
@@ -2280,6 +2286,7 @@ TEST_F(TestReliableMessageProtocol, CheckReliableMessageAnalyticsForTransmitFail
2280
2286
EXPECT_EQ (firstTransmitEvent.nodeId , expectedNodeId);
2281
2287
EXPECT_EQ (firstTransmitEvent.fabricIndex , expectedFabricIndex);
2282
2288
EXPECT_EQ (firstTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kInitialSend );
2289
+ EXPECT_EQ (firstTransmitEvent.retransmissionCount , std::nullopt);
2283
2290
// We have no way of validating the first messageCounter since this is a randomly generated value, but it should
2284
2291
// remain constant for all subsequent transmit events in this test.
2285
2292
const uint32_t messageCounter = firstTransmitEvent.messageCounter ;
@@ -2289,33 +2296,38 @@ TEST_F(TestReliableMessageProtocol, CheckReliableMessageAnalyticsForTransmitFail
2289
2296
EXPECT_EQ (secondTransmitEvent.nodeId , expectedNodeId);
2290
2297
EXPECT_EQ (secondTransmitEvent.fabricIndex , expectedFabricIndex);
2291
2298
EXPECT_EQ (secondTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2299
+ EXPECT_EQ (secondTransmitEvent.retransmissionCount , 1 );
2292
2300
EXPECT_EQ (messageCounter, secondTransmitEvent.messageCounter );
2293
2301
2294
2302
testAnalyticsDelegate.mTransmitEvents .pop ();
2295
2303
auto thirdTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2296
2304
EXPECT_EQ (thirdTransmitEvent.nodeId , expectedNodeId);
2297
2305
EXPECT_EQ (thirdTransmitEvent.fabricIndex , expectedFabricIndex);
2298
2306
EXPECT_EQ (thirdTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2307
+ EXPECT_EQ (thirdTransmitEvent.retransmissionCount , 2 );
2299
2308
EXPECT_EQ (messageCounter, thirdTransmitEvent.messageCounter );
2300
2309
2301
2310
testAnalyticsDelegate.mTransmitEvents .pop ();
2302
- auto forthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2303
- EXPECT_EQ (forthTransmitEvent.nodeId , expectedNodeId);
2304
- EXPECT_EQ (forthTransmitEvent.fabricIndex , expectedFabricIndex);
2305
- EXPECT_EQ (forthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2306
- EXPECT_EQ (messageCounter, forthTransmitEvent.messageCounter );
2311
+ auto fourthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2312
+ EXPECT_EQ (fourthTransmitEvent.nodeId , expectedNodeId);
2313
+ EXPECT_EQ (fourthTransmitEvent.fabricIndex , expectedFabricIndex);
2314
+ EXPECT_EQ (fourthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2315
+ EXPECT_EQ (fourthTransmitEvent.retransmissionCount , 3 );
2316
+ EXPECT_EQ (messageCounter, fourthTransmitEvent.messageCounter );
2307
2317
2308
2318
testAnalyticsDelegate.mTransmitEvents .pop ();
2309
2319
auto fifthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2310
2320
EXPECT_EQ (fifthTransmitEvent.nodeId , expectedNodeId);
2311
2321
EXPECT_EQ (fifthTransmitEvent.fabricIndex , expectedFabricIndex);
2322
+ EXPECT_EQ (fifthTransmitEvent.retransmissionCount , 4 );
2312
2323
EXPECT_EQ (fifthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kRetransmission );
2313
2324
EXPECT_EQ (messageCounter, fifthTransmitEvent.messageCounter );
2314
2325
2315
2326
testAnalyticsDelegate.mTransmitEvents .pop ();
2316
2327
auto sixthTransmitEvent = testAnalyticsDelegate.mTransmitEvents .front ();
2317
2328
EXPECT_EQ (sixthTransmitEvent.nodeId , expectedNodeId);
2318
2329
EXPECT_EQ (sixthTransmitEvent.fabricIndex , expectedFabricIndex);
2330
+ EXPECT_EQ (sixthTransmitEvent.retransmissionCount , std::nullopt);
2319
2331
EXPECT_EQ (sixthTransmitEvent.eventType , ReliableMessageAnalyticsDelegate::EventType::kFailed );
2320
2332
EXPECT_EQ (messageCounter, sixthTransmitEvent.messageCounter );
2321
2333
}
0 commit comments