X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fblackbox%2Frun_blackbox_tests%2Ftest_cases_channel_conn.c;h=9bed91bb6335c6f4a0d38b2c7f2bae233746379e;hb=11d4da4957cb576abe9ee79c9893809a34f1f3d9;hp=a2145cc15bb8d27fdf66a7ff64eafe5fac48917b;hpb=da91f765ca8df6bad527f22b0261bd7c13748151;p=meshlink

diff --git a/test/blackbox/run_blackbox_tests/test_cases_channel_conn.c b/test/blackbox/run_blackbox_tests/test_cases_channel_conn.c
index a2145cc1..9bed91bb 100644
--- a/test/blackbox/run_blackbox_tests/test_cases_channel_conn.c
+++ b/test/blackbox/run_blackbox_tests/test_cases_channel_conn.c
@@ -17,6 +17,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -105,7 +109,7 @@ static bool node_reachable;
 static bool node_unreachable;
 
 /* Callback function for handling channel connection test cases mesh events */
-static void channel_conn_cb(mesh_event_payload_t payload) {
+static bool channel_conn_cb(mesh_event_payload_t payload) {
 	switch(payload.mesh_event) {
 	case NODE_JOINED            :
 		joined = true;
@@ -139,7 +143,7 @@ static void channel_conn_cb(mesh_event_payload_t payload) {
 		PRINT_TEST_CASE_MSG("Undefined event occurred\n");
 	}
 
-	return;
+	return true;
 }
 
 /* Execute channel connections Test Case # 1 - simulate a temporary network
@@ -205,10 +209,13 @@ static bool test_steps_channel_conn_01(void) {
 	// Wait for peer node to receive data via channel from NUT
 
 	wait_for_event(channel_conn_cb, 60);
-	assert_int_equal(channel_received, true);
 
+	mesh_event_destroy();
 	free(invite_nut);
 	free(import);
+
+	assert_int_equal(channel_received, true);
+
 	return true;
 }
 
@@ -275,10 +282,13 @@ static bool test_steps_channel_conn_02(void) {
 	// Wait for peer node to send the event about the channel error occurred with length = 0
 
 	wait_for_event(channel_conn_cb, 90);
-	assert_int_equal(received_error, true);
 
+	mesh_event_destroy();
 	free(invite_nut);
 	free(import);
+
+	assert_int_equal(received_error, true);
+
 	return true;
 }
 
@@ -356,10 +366,13 @@ static bool test_steps_channel_conn_03(void) {
 	// Wait for data to be received at peer via channel from NUT after restoring n/w
 
 	wait_for_event(channel_conn_cb, 90);
-	assert_int_equal(channel_received, true);
 
+	mesh_event_destroy();
 	free(invite_nut);
 	free(import);
+
+	assert_int_equal(channel_received, true);
+
 	return true;
 }
 
@@ -414,6 +427,12 @@ static bool test_steps_channel_conn_04(void) {
 	// After 1 min the channel between NUT and peer should result in error
 
 	wait_for_event(channel_conn_cb, 10);
+
+
+	mesh_event_destroy();
+	free(invite_nut);
+	free(import);
+
 	assert_int_equal(received_error, true);
 
 	return true;
@@ -485,11 +504,14 @@ static bool test_steps_channel_conn_05(void) {
 	// Wait for peer to get data from NUT node via channel after restoring network in < 60 secs
 
 	wait_for_event(channel_conn_cb, 60);
-	assert_int_equal(channel_received, true);
 
-	free(invite_nut);
+	mesh_event_destroy();
 	free(invite_peer);
+	free(invite_nut);
 	free(import);
+
+	assert_int_equal(channel_received, true);
+
 	return true;
 }
 
@@ -560,11 +582,14 @@ static bool test_steps_channel_conn_06(void) {
 	// Wait for channel to receive error and receive the event
 
 	wait_for_event(channel_conn_cb, 90);
-	assert_int_equal(received_error, true);
 
-	free(invite_nut);
+	mesh_event_destroy();
 	free(invite_peer);
+	free(invite_nut);
 	free(import);
+
+	assert_int_equal(received_error, true);
+
 	return true;
 }
 
@@ -646,11 +671,14 @@ static bool test_steps_channel_conn_07(void) {
 	// Wait for peer node to receive data via channel without any error
 
 	wait_for_event(channel_conn_cb, 90);
-	assert_int_equal(channel_received, true);
 
-	free(invite_nut);
+	mesh_event_destroy();
 	free(invite_peer);
+	free(invite_nut);
 	free(import);
+
+	assert_int_equal(channel_received, true);
+
 	return true;
 }
 
@@ -716,15 +744,20 @@ static bool test_steps_channel_conn_08(void) {
 	// Wait for peer to receive channel error
 
 	wait_for_event(channel_conn_cb, 10);
-	assert_int_equal(received_error, true);
 
-	free(invite_nut);
+	mesh_event_destroy();
 	free(invite_peer);
+	free(invite_nut);
 	free(import);
+
+	assert_int_equal(received_error, true);
+
 	return true;
 }
 
 static int black_box_group_setup(void **state) {
+	(void)state;
+
 	const char *nodes[] = { "peer", "nut", "relay" };
 	int num_nodes = sizeof(nodes) / sizeof(nodes[0]);
 
@@ -736,6 +769,8 @@ static int black_box_group_setup(void **state) {
 }
 
 static int black_box_group_teardown(void **state) {
+	(void)state;
+
 	printf("Destroying Containers\n");
 	destroy_containers();
 
@@ -759,7 +794,7 @@ int test_meshlink_channel_conn(void) {
 		cmocka_unit_test_prestate_setup_teardown(test_case_channel_conn_07, setup_test, teardown_test,
 		                (void *)&test_case_channel_conn_07_state),
 		cmocka_unit_test_prestate_setup_teardown(test_case_channel_conn_08, setup_test, teardown_test,
-		                (void *)&test_case_channel_conn_08_state)
+		                (void *)&test_case_channel_conn_08_state),
 	};
 	total_tests += sizeof(blackbox_group0_tests) / sizeof(blackbox_group0_tests[0]);