Skip to content

Add process loop timeout configuration and check received topic in MQTT test. #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2022
Merged

Add process loop timeout configuration and check received topic in MQTT test. #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions config_template/test_param_config_template.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@
* #define MQTT_TEST_NETWORK_BUFFER_SIZE ( 5000 )
*/

/**
* @brief Timeout for MQTT_ProcessLoop() function in milliseconds.
* The timeout value is appropriately chosen for receiving an incoming
* PUBLISH message and ack responses for QoS 1 and QoS 2 communications
* with the broker.
*
* #define MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ( 700 )
*/

/**
* @brief Root certificate of the IoT Core.
*
Expand Down
54 changes: 23 additions & 31 deletions src/mqtt/mqtt_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,6 @@
*/
#define MQTT_KEEP_ALIVE_INTERVAL_SECONDS ( 5U )

/**
* @brief Timeout for MQTT_ProcessLoop() function in milliseconds.
* The timeout value is appropriately chosen for receiving an incoming
* PUBLISH message and ack responses for QoS 1 and QoS 2 communications
* with the broker.
*/
#define MQTT_PROCESS_LOOP_TIMEOUT_MS ( 700U )

/**
* @brief The MQTT message published in this example.
*/
Expand Down Expand Up @@ -854,7 +846,7 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_0 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -883,7 +875,7 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_0 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -917,7 +909,7 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_0 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -955,7 +947,7 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -997,12 +989,12 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
}
else if( ( receivedPubAck != 0 ) && ( incomingInfo.topicNameLength > 0 ) )
else if( ( receivedPubAck != 0 ) && ( incomingInfo.topicNameLength > 0 ) && ( strncmp( TEST_MQTT_TOPIC, incomingInfo.pTopicName, TEST_MQTT_TOPIC_LENGTH ) == 0 ) )
{
/* Both the PUBACK and the incoming publish have been received. */
/* "incomingInfo.topicNameLength > 0" means we got a publish message from MQTT broker.
Expand Down Expand Up @@ -1041,7 +1033,7 @@ TEST( MqttTest, MQTT_Subscribe_Publish_With_Qos_1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1096,7 +1088,7 @@ TEST( MqttTest, MQTT_Connect_LWT )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1126,12 +1118,12 @@ TEST( MqttTest, MQTT_Connect_LWT )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
}
else if( incomingInfo.topicNameLength > 0 )
else if( ( incomingInfo.topicNameLength > 0 ) && ( strncmp( TEST_MQTT_LWT_TOPIC, incomingInfo.pTopicName, TEST_MQTT_LWT_TOPIC_LENGTH ) == 0 ) )
{
/* Some data was received on the LWT topic. */
/* "incomingInfo.topicNameLength > 0" means we got a publish message from MQTT broker.
Expand Down Expand Up @@ -1169,7 +1161,7 @@ TEST( MqttTest, MQTT_Connect_LWT )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1272,7 +1264,7 @@ TEST( MqttTest, MQTT_Resend_Unacked_Publish_QoS1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1318,7 +1310,7 @@ TEST( MqttTest, MQTT_Resend_Unacked_Publish_QoS1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1371,7 +1363,7 @@ TEST( MqttTest, MQTT_Restore_Session_Duplicate_Incoming_Publish_Qos1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1409,7 +1401,7 @@ TEST( MqttTest, MQTT_Restore_Session_Duplicate_Incoming_Publish_Qos1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1439,7 +1431,7 @@ TEST( MqttTest, MQTT_Restore_Session_Duplicate_Incoming_Publish_Qos1 )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1479,7 +1471,7 @@ TEST( MqttTest, MQTT_Publish_With_Retain_Flag )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1512,7 +1504,7 @@ TEST( MqttTest, MQTT_Publish_With_Retain_Flag )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1557,7 +1549,7 @@ TEST( MqttTest, MQTT_Publish_With_Retain_Flag )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1588,7 +1580,7 @@ TEST( MqttTest, MQTT_Publish_With_Retain_Flag )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
if( FRTest_GetTimeMs() > ( entryTime + ( MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS * 2 ) ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1663,7 +1655,7 @@ TEST( MqttTest, MQTT_SubUnsub_Multiple_Topics )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1705,7 +1697,7 @@ TEST( MqttTest, MQTT_SubUnsub_Multiple_Topics )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down Expand Up @@ -1755,7 +1747,7 @@ TEST( MqttTest, MQTT_SubUnsub_Multiple_Topics )
{
xMQTTStatus = MQTT_ProcessLoop( &context );

if( FRTest_GetTimeMs() > ( entryTime + MQTT_PROCESS_LOOP_TIMEOUT_MS ) )
if( FRTest_GetTimeMs() > ( entryTime + MQTT_TEST_PROCESS_LOOP_TIMEOUT_MS ) )
{
/* Timeout. */
break;
Expand Down