Testing

awslabs · Jan 25, 2024 · 46b0d66 · 46b0d66
1 parent 7388fc5
commit 46b0d66
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 34 deletions.
diff --git a/include/aws/mqtt/private/mqtt311_listener.h b/include/aws/mqtt/private/mqtt311_listener.h
@@ -33,7 +33,7 @@ struct aws_mqtt311_callback_set {
     aws_mqtt_client_publish_received_fn *publish_received_handler;
 
     /* Called from s_packet_handler_connack which is event-loop invoked */
-    aws_mqtt_client_on_connection_resumed_fn *connection_resumed_handler;
+    aws_mqtt_client_on_connection_success_fn *connection_success_handler;
 
     void *user_data;
 };
@@ -162,7 +162,7 @@ void aws_mqtt311_callback_set_manager_on_publish_received(
     bool retain);
 
 AWS_MQTT_API
-void aws_mqtt311_callback_set_manager_on_connection_resumed(
+void aws_mqtt311_callback_set_manager_on_connection_success(
     struct aws_mqtt311_callback_set_manager *manager,
     enum aws_mqtt_connect_return_code return_code,
     bool rejoined_session);

diff --git a/source/client_channel_handler.c b/source/client_channel_handler.c
@@ -240,9 +240,6 @@ static int s_packet_handler_connack(struct aws_byte_cursor message_cursor, void
             (void *)connection);
 
         MQTT_CLIENT_CALL_CALLBACK_ARGS(connection, on_resumed, connack.connect_return_code, connack.session_present);
-
-        aws_mqtt311_callback_set_manager_on_connection_resumed(
-            &connection->callback_manager, connack.connect_return_code, connack.session_present);
     } else {
 
         aws_create_reconnect_task(connection);
@@ -266,6 +263,9 @@ static int s_packet_handler_connack(struct aws_byte_cursor message_cursor, void
     MQTT_CLIENT_CALL_CALLBACK_ARGS(
         connection, on_connection_success, connack.connect_return_code, connack.session_present);
 
+    aws_mqtt311_callback_set_manager_on_connection_success(
+        &connection->callback_manager, connack.connect_return_code, connack.session_present);
+
     AWS_LOGF_TRACE(AWS_LS_MQTT_CLIENT, "id=%p: connection callback completed", (void *)connection);
 
     s_update_next_ping_time(connection);

diff --git a/source/mqtt311_listener.c b/source/mqtt311_listener.c
@@ -266,7 +266,7 @@ void aws_mqtt311_callback_set_manager_on_publish_received(
     }
 }
 
-void aws_mqtt311_callback_set_manager_on_connection_resumed(
+void aws_mqtt311_callback_set_manager_on_connection_success(
     struct aws_mqtt311_callback_set_manager *manager,
     enum aws_mqtt_connect_return_code return_code,
     bool rejoined_session) {
@@ -281,8 +281,8 @@ void aws_mqtt311_callback_set_manager_on_connection_resumed(
         node = aws_linked_list_next(node);
 
         struct aws_mqtt311_callback_set *callback_set = &entry->callbacks;
-        if (callback_set->connection_resumed_handler != NULL) {
-            (*callback_set->connection_resumed_handler)(
+        if (callback_set->connection_success_handler != NULL) {
+            (*callback_set->connection_success_handler)(
                 manager->connection, return_code, rejoined_session, callback_set->user_data);
         }
     }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -459,8 +459,9 @@ add_test_case(request_response_mqtt5_protocol_adapter_session_event_rejoin)
 add_test_case(request_response_mqtt5_protocol_adapter_incoming_publish)
 add_test_case(request_response_mqtt5_protocol_adapter_shutdown_while_pending)
 
-add_test_case(mqtt311_listener_session_events)
-#add_test_case(mqtt311_listener_publish_events)
+add_test_case(mqtt311_listener_connection_success_event_no_session)
+add_test_case(mqtt311_listener_connection_success_event_with_session)
+add_test_case(mqtt311_listener_publish_event)
 
 generate_test_driver(${PROJECT_NAME}-tests)