[UTC][Wifi][Non-ACR][Fix some bugs]

Change-Id: I1e779099798aadc4f7e209b03588402d38d7c821
Signed-off-by: hyunuktak <hyunuk.tak@samsung.com>

diff --git a/src/utc/wifi/tct-wifi-core_common_iot.h b/src/utc/wifi/tct-wifi-core_common_iot.h
index 17e954f..aaeeb85 100755 (executable)
--- a/src/utc/wifi/tct-wifi-core_common_iot.h
+++ b/src/utc/wifi/tct-wifi-core_common_iot.h
@@ -328,8 +328,6 @@ testcase tc_array[] = {
     {"utc_wifi_ap_get_eap_auth_type_n", utc_wifi_ap_get_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_p", utc_wifi_ap_set_eap_auth_type_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_n", utc_wifi_ap_set_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_p", utc_wifi_ap_destroy_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_n", utc_wifi_ap_destroy_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_config_create_p", utc_wifi_config_create_p, utc_wifi_config_startup, utc_wifi_config_cleanup},
@@ -450,6 +448,8 @@ testcase tc_array[] = {
     {"utc_wifi_connect_n1", utc_wifi_connect_n1, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_n2", utc_wifi_connect_n2, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_p", utc_wifi_connect_p, utc_wifi_startup, utc_wifi_cleanup},
+    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
+    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {NULL, NULL}
 };
 

diff --git a/src/utc/wifi/tct-wifi-core_mobile.h b/src/utc/wifi/tct-wifi-core_mobile.h
index 17e954f..aaeeb85 100755 (executable)
--- a/src/utc/wifi/tct-wifi-core_mobile.h
+++ b/src/utc/wifi/tct-wifi-core_mobile.h
@@ -328,8 +328,6 @@ testcase tc_array[] = {
     {"utc_wifi_ap_get_eap_auth_type_n", utc_wifi_ap_get_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_p", utc_wifi_ap_set_eap_auth_type_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_n", utc_wifi_ap_set_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_p", utc_wifi_ap_destroy_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_n", utc_wifi_ap_destroy_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_config_create_p", utc_wifi_config_create_p, utc_wifi_config_startup, utc_wifi_config_cleanup},
@@ -450,6 +448,8 @@ testcase tc_array[] = {
     {"utc_wifi_connect_n1", utc_wifi_connect_n1, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_n2", utc_wifi_connect_n2, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_p", utc_wifi_connect_p, utc_wifi_startup, utc_wifi_cleanup},
+    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
+    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {NULL, NULL}
 };
 

diff --git a/src/utc/wifi/tct-wifi-core_tv.h b/src/utc/wifi/tct-wifi-core_tv.h
index 17e954f..aaeeb85 100755 (executable)
--- a/src/utc/wifi/tct-wifi-core_tv.h
+++ b/src/utc/wifi/tct-wifi-core_tv.h
@@ -328,8 +328,6 @@ testcase tc_array[] = {
     {"utc_wifi_ap_get_eap_auth_type_n", utc_wifi_ap_get_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_p", utc_wifi_ap_set_eap_auth_type_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_n", utc_wifi_ap_set_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_p", utc_wifi_ap_destroy_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_n", utc_wifi_ap_destroy_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_config_create_p", utc_wifi_config_create_p, utc_wifi_config_startup, utc_wifi_config_cleanup},
@@ -450,6 +448,8 @@ testcase tc_array[] = {
     {"utc_wifi_connect_n1", utc_wifi_connect_n1, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_n2", utc_wifi_connect_n2, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_p", utc_wifi_connect_p, utc_wifi_startup, utc_wifi_cleanup},
+    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
+    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {NULL, NULL}
 };
 

diff --git a/src/utc/wifi/tct-wifi-core_wearable.h b/src/utc/wifi/tct-wifi-core_wearable.h
index 17e954f..aaeeb85 100755 (executable)
--- a/src/utc/wifi/tct-wifi-core_wearable.h
+++ b/src/utc/wifi/tct-wifi-core_wearable.h
@@ -328,8 +328,6 @@ testcase tc_array[] = {
     {"utc_wifi_ap_get_eap_auth_type_n", utc_wifi_ap_get_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_p", utc_wifi_ap_set_eap_auth_type_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_set_eap_auth_type_n", utc_wifi_ap_set_eap_auth_type_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
-    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_p", utc_wifi_ap_destroy_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_ap_destroy_n", utc_wifi_ap_destroy_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {"utc_wifi_config_create_p", utc_wifi_config_create_p, utc_wifi_config_startup, utc_wifi_config_cleanup},
@@ -450,6 +448,8 @@ testcase tc_array[] = {
     {"utc_wifi_connect_n1", utc_wifi_connect_n1, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_n2", utc_wifi_connect_n2, utc_wifi_startup, utc_wifi_cleanup},
     {"utc_wifi_connect_p", utc_wifi_connect_p, utc_wifi_startup, utc_wifi_cleanup},
+    {"utc_wifi_ap_refresh_p", utc_wifi_ap_refresh_p, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
+    {"utc_wifi_ap_refresh_n", utc_wifi_ap_refresh_n, utc_wifi_ap_startup, utc_wifi_ap_cleanup},
     {NULL, NULL}
 };
 

diff --git a/src/utc/wifi/utc-network-wifi-ap.c b/src/utc/wifi/utc-network-wifi-ap.c
index 29ee5bc..98b8edf 100755 (executable)
--- a/src/utc/wifi/utc-network-wifi-ap.c
+++ b/src/utc/wifi/utc-network-wifi-ap.c
@@ -2718,16 +2718,22 @@ int utc_wifi_ap_set_eap_auth_type_n(void)
  */
 int utc_wifi_ap_refresh_p(void)
 {
-    if(g_wifi_ap_supported == false) {
-        int ret = WIFI_ERROR_NONE;
-        ret = wifi_scan(__wifi_scan_callback, NULL);
-        assert_eq(ret, TIZEN_ERROR_NOT_SUPPORTED);
-        return 0;
-    }
+       wifi_ap_h ap_h;
+       int ret = WIFI_ERROR_NONE;
 
-    wifi_scan(__wifi_scan_callback, NULL);
+       if(g_wifi_ap_supported == false) {
+               ret = wifi_ap_refresh(ap_h);
+               assert_eq(ret, TIZEN_ERROR_NOT_SUPPORTED);
+               return 0;
+       }
 
-    return 0;
+       ret = wifi_get_connected_ap(&ap_h);
+       assert_eq(ret, WIFI_ERROR_NONE);
+
+       ret = wifi_ap_refresh(ap_h);
+       assert_eq(ret, WIFI_ERROR_NONE);
+
+       return 0;
 }
 
 /**
@@ -2748,13 +2754,9 @@ int utc_wifi_ap_refresh_n(void)
         return 0;
     }
 
-    wifi_initialize();
-
-    ret = wifi_ap_refresh(ap_inval);
+    ret = wifi_ap_refresh(NULL);
     assert_eq(ret, WIFI_ERROR_INVALID_PARAMETER);
 
-    wifi_deinitialize();
-
     return 0;
 }