diff options
| author | saerome kim <saerome.kim@samsung.com> | 2019-07-01 21:29:17 +0900 |
|---|---|---|
| committer | saerome kim <saerome.kim@samsung.com> | 2019-07-02 09:54:42 +0900 |
| commit | 5824a00cafdc86d9026020b2f02ee69379c2d645 (patch) | |
| tree | 522da330207c95f90403c0097bc5593dadd4e976 | |
| parent | 77767a9e3b42b01932e74b74f304a8f671cf2a61 (diff) | |
| download | user-awareness-5824a00cafdc86d9026020b2f02ee69379c2d645.tar.gz user-awareness-5824a00cafdc86d9026020b2f02ee69379c2d645.tar.bz2 user-awareness-5824a00cafdc86d9026020b2f02ee69379c2d645.zip | |
Fixed a bug that can't add device to a user.
Change-Id: I7a94502093fa0b517ba27cdec7b8de8624f42e7d
Signed-off-by: saerome kim <saerome.kim@samsung.com>
| -rw-r--r-- | test/uat-detections.c | 4 | ||||
| -rw-r--r-- | test/uat-devices.c | 12 | ||||
| -rw-r--r-- | test/uat-service.c | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/test/uat-detections.c b/test/uat-detections.c index 2f856e7..c1430b0 100644 --- a/test/uat-detections.c +++ b/test/uat-detections.c @@ -177,7 +177,7 @@ static int run_ua_monitor_start_scan_devices( if (strlen(g_scan_time_multiplier)) scantimemultiplier = (unsigned int)strtol(g_scan_time_multiplier, NULL, 10); - ret = ua_monitor_start_scan_devices(g_ua_mon_h, scantimemultiplier + ret = ua_monitor_start_scan_devices(g_ua_mon_h, scantimemultiplier, ua_test_scan_completed_cb, NULL); msg(" - ua_monitor_stop_absence_detection() ret: [0x%X] [%s]", @@ -207,7 +207,7 @@ static struct menu_data menu_start_device_scan[] = { { "1", "Device scan time multiplier", NULL, NULL, g_scan_time_multiplier}, { "2", "run", NULL, - run_ua_monitor_start_device_scan, NULL }, + run_ua_monitor_start_scan_devices, NULL }, { NULL, NULL, }, }; diff --git a/test/uat-devices.c b/test/uat-devices.c index ec8d5e0..08ab78a 100644 --- a/test/uat-devices.c +++ b/test/uat-devices.c @@ -310,12 +310,17 @@ static int run_ua_device_set_os_info( else if (ostype < UA_OS_TYPE_NOT_DEFINE) ostype = UA_OS_TYPE_TIZEN; + snprintf(g_os_type_str, MENU_DATA_SIZE, "%s", + ostype == 1 ? "Tizen" : + ostype == 2 ? "Android" : + ostype == 3 ? "iOS" : "N/A"); + ret = ua_device_set_os_info(g_device_h, ostype); msg(" - ua_device_set_os_info() ret: [0x%X] [%s]", ret, uat_get_error_str(ret)); - update_device_info(); + //update_device_info(); return RET_SUCCESS; } @@ -332,7 +337,7 @@ static int run_ua_device_set_mobile_id( msg(" - ua_device_set_mobile_id() ret: [0x%X] [%s]", ret, uat_get_error_str(ret)); - update_device_info(); + //update_device_info(); return RET_SUCCESS; } @@ -349,7 +354,7 @@ static int run_ua_device_set_mac_address( msg(" - ua_device_set_mac_address() ret: [0x%X] [%s]", ret, uat_get_error_str(ret)); - update_device_info(); + //update_device_info(); return RET_SUCCESS; } @@ -542,7 +547,6 @@ static int run_ua_user_add_device( msg("ua_user_add_device"); - check_if(NULL == g_user_h); check_if(NULL == g_device_h); ret = ua_user_add_device(g_user_h, g_device_h, __device_added_cb, NULL); diff --git a/test/uat-service.c b/test/uat-service.c index 1f28224..19d8343 100644 --- a/test/uat-service.c +++ b/test/uat-service.c @@ -76,7 +76,7 @@ static bool __foreach_added_service_cb( int ret = UA_ERROR_NONE; char *name = NULL; - check_If(NULL == service_handle) + check_if(NULL == service_handle); ua_service_get_name(service_handle, &name); if (UA_ERROR_NONE != ret) { |