From: Anupam Roy <anupam.r@samsung.com>
Date: Wed, 29 Jul 2020 06:43:30 +0000 (+0530)
Subject: Mesh: Apply Minor refactoring
X-Git-Tag: submit/tizen/20200731.001830~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c24f8f34d166f64bfb5ddb4edbf654f1590fff90;p=platform%2Fcore%2Fapi%2Fbluetooth.git

Mesh: Apply Minor refactoring

Accept user input of group handle instead of
using fixed group

Change-Id: Ifc7b92fb2c3558ca9f6aa5bb882323980e0c97ba
Signed-off-by: Anupam Roy <anupam.r@samsung.com>
---

diff --git a/tests/test/bt_mesh_unit_test.c b/tests/test/bt_mesh_unit_test.c
index 49e1442..50eb4b2 100644
--- a/tests/test/bt_mesh_unit_test.c
+++ b/tests/test/bt_mesh_unit_test.c
@@ -47,7 +47,6 @@ static char *device_uuid;
 
 static bt_mesh_netkey_h netkey;
 
-static  bt_mesh_group_h group;
 static char *token;
 static bt_mesh_authentication_type_e request_type = BT_MESH_AUTH_ALPHANUMERIC_DISPLAY;
 
@@ -351,11 +350,10 @@ void print_group_handle(bt_mesh_group_h group)
 		return;
 	bt_mesh_group_s* group_info = (bt_mesh_group_s*) group;
 	TC_PRT("group_handle = [%p]", (void*)group_info);
-	TC_PRT("group->parent_network->name  [%s]", group_info->parent->name);
-	TC_PRT("group->addr                  [%d]", group_info->addr);
-	TC_PRT("group->label_uuid            [%s]", group_info->label_uuid);
-	TC_PRT("group->is_virtual            [%d]", group_info->is_virtual);
-	TC_PRT("group->ref_count             [%d]", group_info->ref_count);
+	TC_PRT("group Parent Network Name  [%s]", group_info->parent->name);
+	TC_PRT("group Address              [0x%2.2x]", group_info->addr);
+	TC_PRT("group Label UUID           [%s]", group_info->label_uuid);
+	TC_PRT("group Is Virtual ? [%s]", group_info->is_virtual ? "YES" : "NO");
 }
 
 bool __bt_mesh_network_device_info_cb(int result, bt_mesh_network_h network, int total,
@@ -374,13 +372,14 @@ bool __bt_mesh_network_group_info_cb(int result, bt_mesh_network_h network, int
 		bt_mesh_group_h group, void *user_data)
 {
 	bt_mesh_group_s* grp = (bt_mesh_group_s*) group;
-	TC_PRT("bt_mesh_network_group_info_cb");
+	TC_PRT("bt_mesh_network_group_info_cb: Total groups present in network [%d]", total);
 	TC_PRT("result: %s", __bt_get_error_message(result));
 
 	if (result == BT_ERROR_NONE) {
 		print_group_handle(grp);
-	}
-	return true;
+		return true;
+	} else
+		return false;
 }
 
 void __bt_mesh_node_discover_status_cb(int result, bt_mesh_network_h network, bt_mesh_node_h node_param,
@@ -519,7 +518,6 @@ static bool __bt_mesh_node_foreach_appkeys_cb(int result, bt_mesh_node_h node, i
 
 	if (result == BT_ERROR_NONE) {
 		TC_PRT("Total Appkeys in node [%d]", total);
-		print_node_handle(node);
 		print_netkey_handle(netkey);
 		print_appkey_handle(appkey);
 		return true;
@@ -799,6 +797,10 @@ int test_set_params(int test_id, char *param){
 			param_count = 1;
 			TC_PRT("Input param(%d) (group address)\n" ,param_index + 1);
 			break;
+		case BT_MESH_UNIT_TEST_FUNCTION_NETWORK_REMOVE_GROUP:
+			param_count = 1;
+			TC_PRT("Input param(%d) (group handle)\n" ,param_index + 1);
+			break;
 		case BT_MESH_UNIT_TEST_FUNCTION_NETWORK_UNPROVISIONED_DEVICE_SCAN:
 			param_count = 1;
 			TC_PRT("Input param(%d) (Seconds)\n" ,param_index + 1);
@@ -1454,7 +1456,13 @@ int test_input_callback(void *data)
 			break;
 		}
 		case BT_MESH_UNIT_TEST_FUNCTION_NETWORK_REMOVE_GROUP: {
-			ret = bt_mesh_network_remove_group(group);
+			bt_mesh_group_h group_h;
+			if (g_test_param.param_count != 1) {
+				TC_PRT("Enter parameter first!!\n");
+				break;
+			}
+			group_h = GUINT_TO_POINTER(strtoul(g_test_param.params[0], NULL, 16));
+			ret = bt_mesh_network_remove_group(group_h);
 			TC_PRT("return %s\n", __bt_get_error_message(ret));
 			break;
 		}
@@ -1813,7 +1821,7 @@ int test_input_callback(void *data)
 			ret = bt_mesh_appkey_get_netkey(appkey_h, &netkey_h);
 			TC_PRT("return %s\n", __bt_get_error_message(ret));
 			if (ret == BT_ERROR_NONE)
-				print_network_handle(netkey_h);
+				print_netkey_handle(netkey_h);
 			break;
 		}
 		case BT_MESH_UNIT_TEST_FUNCTION_ACTIVATE_FLAG_TO_SET_PARAMETERS: {