Remove service depricated api from ua-test

- ua_service_add_device()
- ua_service_remove_device()

Change-Id: I31c85aab253d96b1a404be1235ffef65dc7c537a

diff --git a/tests/test/uat-scenarios.c b/tests/test/uat-scenarios.c
index e29a153e53bba6b313540f174a407fe4208e04f0..0cfcfccbfd977b0aedc788eb7f94f6ce2d3e5be3 100755 (executable)
--- a/tests/test/uat-scenarios.c
+++ b/tests/test/uat-scenarios.c
@@ -164,6 +164,11 @@ static int run_ua_scenario_startup(MManager *mm, struct menu_data *menu)
        retv_if(!(ret == UA_ERROR_NONE || ret == UA_ERROR_ALREADY_DONE
                                || UA_ERROR_ALREADY_REGISTERED), RET_SUCCESS);
 
+       /*add user to service*/
+       ret = ua_service_add_user(g_service_h, g_user_h);
+       msg(" - ua_service_add_user() ret: [0x%X] [%s]",
+                       ret, uat_get_error_str(ret));
+
        /* monitor startup */
        ret = __uat_scenario_monitor_startup();
        retv_if(ret != UA_ERROR_NONE, RET_SUCCESS);
@@ -256,13 +261,10 @@ static void __device_added_cb(int result,
        if (UA_ERROR_NONE != result)
                return;
 
-       /* Add device to service */
-       ret = ua_service_add_device(g_service_h, handle);
-       msg(" - ua_service_add_device() ret: [0x%X] [%s]",
-                       ret, uat_get_error_str(ret));
-
        ua_mac_type_e device_type = UA_MAC_TYPE_INVALID;
        ret = ua_device_get_mac_type(handle, &device_type);
+       msg(" - ua_device_get_mac_type() ret: [0x%X] [%s]",
+                       ret, uat_get_error_str(ret));
 }
 
 static int __create_add_device(int device_type, int ostype,

diff --git a/tests/test/uat-service.c b/tests/test/uat-service.c
index 95fecd02528400a9fd3881dea1fb775591bc2d48..be731f2f2fa0573f781a7430043d662d9c8b0518 100755 (executable)
--- a/tests/test/uat-service.c
+++ b/tests/test/uat-service.c
@@ -448,42 +448,6 @@ static int run_ua_foreach_service(
        return RET_SUCCESS;
 }
 
-static int run_ua_service_add_device(
-       MManager *mm, struct menu_data *menu)
-{
-       int ret = UA_ERROR_NONE;
-
-       msg("ua_service_add_device");
-
-       check_if(NULL == g_service_h);
-       check_if(NULL == g_device_h);
-
-       ret = ua_service_add_device(g_service_h, g_device_h);
-
-       msg(" - ua_service_add_device() ret: [0x%X] [%s]",
-                       ret, uat_get_error_str(ret));
-
-       return RET_SUCCESS;
-}
-
-static int run_ua_service_remove_device(
-       MManager *mm, struct menu_data *menu)
-{
-       int ret = UA_ERROR_NONE;
-
-       msg("ua_service_remove_device");
-
-       check_if(NULL == g_service_h);
-       check_if(NULL == g_device_h);
-
-       ret = ua_service_remove_device(g_service_h, g_device_h);
-
-       msg(" - ua_service_remove_device() ret: [0x%X] [%s]",
-                       ret, uat_get_error_str(ret));
-
-       return RET_SUCCESS;
-}
-
 static int run_ua_service_set_device_discriminant(
        MManager *mm, struct menu_data *menu)
 {
@@ -713,10 +677,6 @@ struct menu_data menu_ua_services[] = {
                menu_ua_get_service_by_name, NULL, NULL },
        { "9", ANSI_COLOR_LIGHTMAGENTA "ua_foreach_service" ANSI_COLOR_NORMAL,
                menu_sel_service, NULL, NULL },
-       { "21", ANSI_COLOR_LIGHTGREEN "ua_service_add_device" ANSI_COLOR_NORMAL,
-               NULL, run_ua_service_add_device, NULL },
-       { "22", ANSI_COLOR_LIGHTRED "ua_service_remove_device" ANSI_COLOR_NORMAL,
-               NULL, run_ua_service_remove_device, NULL },
        { "23", "ua_service_set_device_discriminant",
                menu_ua_service_set_device_discriminant, NULL, NULL },
        { "24", "ua_service_get_device_discriminant",