Proper handling of incoming message for I2C

Author: nicklasb

test/tst_i2c_message_receiving.c

@@ -11,7 +11,7 @@
 #include "tst_defs.h"
 
 static bool async_receive_flag = false;
-static incoming_queue_item_t *incoming_item = NULL;
+static robusto_message_t *incoming_message = NULL;
 
 static robusto_peer_t *incoming_peer = NULL;
 static uint8_t *reply_msg = NULL;
@@ -141,7 +141,8 @@ void tst_i2c_message_receive_presentation(void)
 
 void i2c_tst_do_on_work(incoming_queue_item_t *_incoming_item) {
     ROB_LOGI("TEST", "In i2c_tst_do_on_work");
-    incoming_item = _incoming_item;
+    incoming_message= _incoming_item->message;
+    _incoming_item->recipient_frees_message = true;
     async_receive_flag = true;   
 
 }
@@ -151,19 +152,20 @@ void tst_i2c_message_receive_string_message(void) {
     // Register the on work callback
     robusto_register_handler(i2c_tst_do_on_work);
     async_receive_flag = false;
-    incoming_item = NULL;	
+    incoming_message = NULL;	
 
     if (robusto_waitfor_bool(&async_receive_flag, 30000)) {
         ROB_LOGI("Test", "Async receive flag was set to true.");
     } else {
         TEST_FAIL_MESSAGE("Test failed, timed out.");
     }
-    if (incoming_item == NULL) {
+    if (incoming_message == NULL) {
         TEST_FAIL_MESSAGE("Test failed, incoming_item NULL.");
     }
-    TEST_ASSERT_EQUAL_INT_MESSAGE(2, incoming_item->message->string_count, "The string count is wrong.");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE(&tst_strings, incoming_item->message->strings[0], "First string did not match");
-    TEST_ASSERT_EQUAL_STRING_MESSAGE((char *)&(tst_strings[4]), incoming_item->message->strings[1], "Second string did not match");
+    TEST_ASSERT_EQUAL_INT_MESSAGE(2, incoming_message->string_count, "The string count is wrong.");
+    TEST_ASSERT_EQUAL_STRING_MESSAGE(&tst_strings, incoming_message->strings[0], "First string did not match");
+    TEST_ASSERT_EQUAL_STRING_MESSAGE((char *)&(tst_strings[4]), incoming_message->strings[1], "Second string did not match");
+    robusto_message_free(incoming_message);
 
 
 }

test/tst_i2c_message_receiving.h

@@ -5,5 +5,4 @@ void tst_i2c_message_receive_string_message(void);
 void tst_message_receive_binary_message_mock(void);
 void tst_message_receive_multi_message_mock(void);
 void tst_message_receive_binary_message_restricted_mock(void);
-void tst_i2c_message_receive_presentation(void);
-void tst_i2c_message_receive_string_message(void);
+void tst_i2c_message_receive_presentation(void);