[UTC][capi-network-ua][Non-ACR] Remove init check logic

Because this init check function, each testcase can't run
the feature supported logic. So we remove this.

Change-Id: If65669e59a4f6ab05ae87005656c87b6401d18f6
Signed-off-by: dh79pyun <dh79.pyun@samsung.com>

diff --git a/src/utc/ua/utc-ua-device.c b/src/utc/ua/utc-ua-device.c
index d4f1dd0810df3bb42f548697adeed35ae20059d0..2ad53eccf0c6555821a731ffa592b2218f1ae520 100755 (executable)
--- a/src/utc/ua/utc-ua-device.c
+++ b/src/utc/ua/utc-ua-device.c
@@ -36,8 +36,6 @@ int utc_ua_device_create_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_create(0, NULL, NULL, NULL);
                CHECK_RETURN("ua_device_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -54,8 +52,6 @@ int utc_ua_device_create_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_create(0, NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -73,8 +69,6 @@ int utc_ua_device_destroy_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_destroy(NULL);
                CHECK_RETURN("ua_device_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -94,8 +88,6 @@ int utc_ua_device_destroy_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_destroy(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -114,8 +106,6 @@ int utc_ua_device_get_mac_type_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        ua_mac_type_e mac_type = UA_MAC_TYPE_INVALID;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_mac_type(NULL, NULL);
                CHECK_RETURN("ua_device_get_mac_type", ret, UA_ERROR_NOT_SUPPORTED);
@@ -138,8 +128,6 @@ int utc_ua_device_get_mac_type_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_mac_type(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_mac_type", ret, UA_ERROR_NOT_SUPPORTED);
@@ -157,8 +145,6 @@ int utc_ua_device_set_os_info_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_set_os_info(NULL, 0);
                CHECK_RETURN("ua_device_set_os_info", ret, UA_ERROR_NOT_SUPPORTED);
@@ -181,8 +167,6 @@ int utc_ua_device_set_os_info_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_set_os_info(NULL, 0);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_set_os_info", ret, UA_ERROR_NOT_SUPPORTED);
@@ -201,8 +185,6 @@ int utc_ua_device_get_os_info_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        ua_os_type_e ostype = UA_OS_TYPE_NOT_DEFINED;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_os_info(NULL, NULL);
                CHECK_RETURN("ua_device_get_os_info", ret, UA_ERROR_NOT_SUPPORTED);
@@ -225,8 +207,6 @@ int utc_ua_device_get_os_info_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_os_info(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_os_info", ret, UA_ERROR_NOT_SUPPORTED);
@@ -245,8 +225,6 @@ int utc_ua_device_get_mac_address_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char *mac = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_mac_address(NULL, NULL);
                CHECK_RETURN("ua_device_get_mac_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -270,8 +248,6 @@ int utc_ua_device_get_mac_address_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_mac_address(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_mac_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -290,8 +266,6 @@ int utc_ua_device_get_device_id_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char *device_id = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_device_id(NULL, NULL);
                CHECK_RETURN("ua_device_get_device_id", ret, UA_ERROR_NOT_SUPPORTED);
@@ -315,8 +289,6 @@ int utc_ua_device_get_device_id_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_device_id(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_device_id", ret, UA_ERROR_NOT_SUPPORTED);
@@ -335,8 +307,6 @@ int utc_ua_device_set_wifi_bssid_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char wifi_bssid[] = {"30:AB:6A:09:1B:4C"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_set_wifi_bssid(NULL, NULL);
                CHECK_RETURN("ua_device_set_wifi_bssid", ret, UA_ERROR_NOT_SUPPORTED);
@@ -359,8 +329,6 @@ int utc_ua_device_set_wifi_bssid_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_set_wifi_bssid(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_set_wifi_bssid", ret, UA_ERROR_NOT_SUPPORTED);
@@ -379,8 +347,6 @@ int utc_ua_device_get_wifi_bssid_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char *wifi_bssid = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_wifi_bssid(NULL, NULL);
                CHECK_RETURN("ua_device_get_wifi_bssid", ret, UA_ERROR_NOT_SUPPORTED);
@@ -404,8 +370,6 @@ int utc_ua_device_get_wifi_bssid_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_wifi_bssid(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_wifi_bssid", ret, UA_ERROR_NOT_SUPPORTED);
@@ -424,8 +388,6 @@ int utc_ua_device_set_wifi_ipv4_address_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char ipv4_address[] = {"192.168.107.10"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_set_wifi_ipv4_address(NULL, NULL);
                CHECK_RETURN("ua_device_set_wifi_ipv4_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -448,8 +410,6 @@ int utc_ua_device_set_wifi_ipv4_address_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_set_wifi_ipv4_address(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_set_wifi_ipv4_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -468,8 +428,6 @@ int utc_ua_device_get_wifi_ipv4_address_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        char *ipv4_address = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_wifi_ipv4_address(NULL, NULL);
                CHECK_RETURN("ua_device_get_wifi_ipv4_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -493,8 +451,6 @@ int utc_ua_device_get_wifi_ipv4_address_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_wifi_ipv4_address(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_wifi_ipv4_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -513,8 +469,6 @@ int utc_ua_device_get_last_presence_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        unsigned long long last_seen = 0;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_last_presence(NULL, NULL);
                CHECK_RETURN("ua_device_get_last_presence", ret, UA_ERROR_NOT_SUPPORTED);
@@ -537,8 +491,6 @@ int utc_ua_device_get_last_presence_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_last_presence(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_last_presence", ret, UA_ERROR_NOT_SUPPORTED);
@@ -557,8 +509,6 @@ int utc_ua_device_get_pairing_required_p(void)
        char device_id_str[] = {"18:54:CF:06:37:FE"};
        bool required = false;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_pairing_required(NULL, NULL);
                CHECK_RETURN("ua_device_get_last_presence", ret, UA_ERROR_NOT_SUPPORTED);
@@ -581,8 +531,6 @@ int utc_ua_device_get_pairing_required_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_pairing_required(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_pairing_required", ret, UA_ERROR_NOT_SUPPORTED);
@@ -603,8 +551,6 @@ int utc_ua_device_update_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_update(NULL);
                CHECK_RETURN("ua_device_update", ret, UA_ERROR_NOT_SUPPORTED);
@@ -640,8 +586,6 @@ int utc_ua_device_update_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_update(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_update", ret, UA_ERROR_NOT_SUPPORTED);
@@ -660,8 +604,6 @@ int utc_ua_device_get_by_mac_address_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_by_mac_address(NULL, NULL);
                CHECK_RETURN("ua_device_get_by_mac_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -684,8 +626,6 @@ int utc_ua_device_get_by_mac_address_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_by_mac_address(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_by_mac_address", ret, UA_ERROR_NOT_SUPPORTED);
@@ -704,8 +644,6 @@ int utc_ua_device_get_by_device_id_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_device_get_by_device_id(NULL, 0, NULL);
                CHECK_RETURN("ua_device_get_by_device_id", ret, UA_ERROR_NOT_SUPPORTED);
@@ -728,8 +666,6 @@ int utc_ua_device_get_by_device_id_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_device_get_by_device_id(NULL, 0, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_device_get_by_device_id", ret, UA_ERROR_NOT_SUPPORTED);

diff --git a/src/utc/ua/utc-ua-monitor.c b/src/utc/ua/utc-ua-monitor.c
index d8f1b44baebdc76fbca7416c5265f1d3adddfee7..31ba295e089adf854f805deaee2a5b7b3ad30631 100755 (executable)
--- a/src/utc/ua/utc-ua-monitor.c
+++ b/src/utc/ua/utc-ua-monitor.c
@@ -58,8 +58,6 @@ int utc_ua_monitor_create_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_create(NULL);
                CHECK_RETURN("ua_monitor_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -76,8 +74,6 @@ int utc_ua_monitor_create_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_create(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -93,8 +89,6 @@ int utc_ua_monitor_destroy_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_destroy(NULL);
                CHECK_RETURN("ua_monitor_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -114,8 +108,6 @@ int utc_ua_monitor_destroy_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_destroy(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -131,8 +123,6 @@ int utc_ua_monitor_add_sensor_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_add_sensor(NULL, UA_SENSOR_WIFI);
                CHECK_RETURN("ua_monitor_add_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -155,8 +145,6 @@ int utc_ua_monitor_add_sensor_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_add_sensor(NULL, UA_SENSOR_WIFI);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_add_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -172,8 +160,6 @@ int utc_ua_monitor_remove_sensor_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_remove_sensor(NULL, UA_SENSOR_WIFI);
                CHECK_RETURN("ua_monitor_remove_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -199,8 +185,6 @@ int utc_ua_monitor_remove_sensor_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_remove_sensor(NULL, UA_SENSOR_WIFI);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_remove_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -216,8 +200,6 @@ int utc_ua_monitor_foreach_sensor_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_foreach_sensor(NULL, NULL, NULL);
                CHECK_RETURN("ua_monitor_foreach_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -247,8 +229,6 @@ int utc_ua_monitor_foreach_sensor_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_foreach_sensor(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_foreach_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -265,8 +245,6 @@ int utc_ua_monitor_is_sensor_available_p(void)
        ua_monitor_h ua_mon_h = NULL;
        bool available = false;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_is_sensor_available(UA_SENSOR_WIFI, NULL);
                CHECK_RETURN("ua_monitor_foreach_sensor", ret, UA_ERROR_NOT_SUPPORTED);
@@ -289,8 +267,6 @@ int utc_ua_monitor_is_sensor_available_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_is_sensor_available(UA_SENSOR_WIFI, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_is_sensor_available", ret, UA_ERROR_NOT_SUPPORTED);
@@ -306,8 +282,6 @@ int utc_ua_monitor_set_sensor_status_changed_cb_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_set_sensor_status_changed_cb(NULL, NULL, NULL);
                CHECK_RETURN("ua_monitor_set_sensor_status_changed_cb", ret, UA_ERROR_NOT_SUPPORTED);
@@ -330,8 +304,6 @@ int utc_ua_monitor_set_sensor_status_changed_cb_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_set_sensor_status_changed_cb(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_set_sensor_status_changed_cb", ret, UA_ERROR_NOT_SUPPORTED);
@@ -347,8 +319,6 @@ int utc_ua_monitor_unset_sensor_status_changed_cb_p(void)
        int ret = UA_ERROR_NONE;
        ua_monitor_h ua_mon_h = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_unset_sensor_status_changed_cb(NULL);
                CHECK_RETURN("ua_monitor_unset_sensor_status_changed_cb", ret, UA_ERROR_NOT_SUPPORTED);
@@ -371,8 +341,6 @@ int utc_ua_monitor_unset_sensor_status_changed_cb_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_unset_sensor_status_changed_cb(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_unset_sensor_status_changed_cb", ret, UA_ERROR_NOT_SUPPORTED);
@@ -387,8 +355,6 @@ int utc_ua_monitor_start_scan_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_start_scan(NULL, 0, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_start_scan", ret, UA_ERROR_NOT_SUPPORTED);
@@ -403,8 +369,6 @@ int utc_ua_monitor_stop_scan_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_stop_scan(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_stop_scan", ret, UA_ERROR_NOT_SUPPORTED);
@@ -424,8 +388,6 @@ int utc_ua_monitor_start_presence_detection_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_start_presence_detection(NULL, NULL, 0, NULL, NULL);
                CHECK_RETURN("ua_monitor_start_presence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -481,8 +443,6 @@ int utc_ua_monitor_start_presence_detection_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_start_presence_detection(NULL, NULL, 0, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_start_presence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -502,8 +462,6 @@ int utc_ua_monitor_stop_presence_detection_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_stop_presence_detection(NULL);
                CHECK_RETURN("ua_monitor_stop_presence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -560,8 +518,6 @@ int utc_ua_monitor_stop_presence_detection_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_stop_presence_detection(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_stop_presence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -581,8 +537,6 @@ int utc_ua_monitor_start_absence_detection_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_start_absence_detection(NULL, NULL, 0, NULL, NULL);
                CHECK_RETURN("ua_monitor_start_absence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -636,8 +590,6 @@ int utc_ua_monitor_start_absence_detection_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_start_absence_detection(NULL, NULL, 0, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_start_absence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -657,8 +609,6 @@ int utc_ua_monitor_stop_absence_detection_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_monitor_stop_absence_detection(NULL);
                CHECK_RETURN("ua_monitor_stop_absence_detection", ret, UA_ERROR_NOT_SUPPORTED);
@@ -712,8 +662,6 @@ int utc_ua_monitor_stop_absence_detection_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_monitor_stop_absence_detection(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_monitor_stop_absence_detection", ret, UA_ERROR_NOT_SUPPORTED);

diff --git a/src/utc/ua/utc-ua-sensor.c b/src/utc/ua/utc-ua-sensor.c
index 9c64629656847413c4c683f650c627deb46255f5..30eeda4b3b898de94b40933dd89af3bbd952a756 100755 (executable)
--- a/src/utc/ua/utc-ua-sensor.c
+++ b/src/utc/ua/utc-ua-sensor.c
@@ -26,8 +26,6 @@ int utc_ua_sensor_get_status_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_sensor_get_status(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_sensor_get_status", ret, UA_ERROR_NOT_SUPPORTED);
@@ -42,8 +40,6 @@ int utc_ua_sensor_get_timestamp_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_sensor_get_timestamp(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_sensor_get_timestamp", ret, UA_ERROR_NOT_SUPPORTED);
@@ -58,8 +54,6 @@ int utc_ua_sensor_get_type_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_sensor_get_type(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_sensor_get_type", ret, UA_ERROR_NOT_SUPPORTED);

diff --git a/src/utc/ua/utc-ua-service.c b/src/utc/ua/utc-ua-service.c
index 04ae51e7bda89398707d08173faebbed03d6a69d..d3c025c1122a28b071e7fa71b8c38670b0e67923 100755 (executable)
--- a/src/utc/ua/utc-ua-service.c
+++ b/src/utc/ua/utc-ua-service.c
@@ -45,8 +45,6 @@ int utc_ua_service_create_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_create(NULL, NULL);
                CHECK_RETURN("ua_service_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -63,8 +61,6 @@ int utc_ua_service_create_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_create(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -81,8 +77,6 @@ int utc_ua_service_destroy_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_destroy(NULL);
                CHECK_RETURN("ua_service_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -102,8 +96,6 @@ int utc_ua_service_destroy_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_destroy(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -120,8 +112,6 @@ int utc_ua_service_add_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_add(NULL);
                CHECK_RETURN("ua_service_add", ret, UA_ERROR_NOT_SUPPORTED);
@@ -147,8 +137,6 @@ int utc_ua_service_add_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_add(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_add", ret, UA_ERROR_NOT_SUPPORTED);
@@ -167,8 +155,6 @@ int utc_ua_service_update_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_update(NULL);
                CHECK_RETURN("ua_service_update", ret, UA_ERROR_NOT_SUPPORTED);
@@ -206,8 +192,6 @@ int utc_ua_service_update_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_update(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_update", ret, UA_ERROR_NOT_SUPPORTED);
@@ -224,8 +208,6 @@ int utc_ua_service_remove_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_remove(NULL);
                CHECK_RETURN("ua_service_remove", ret, UA_ERROR_NOT_SUPPORTED);
@@ -251,8 +233,6 @@ int utc_ua_service_remove_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_remove(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_remove", ret, UA_ERROR_NOT_SUPPORTED);
@@ -270,8 +250,6 @@ int utc_ua_service_get_name_p(void)
        char service_str[] = {"ua.service.default"};
        char *service_name = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_get_name(NULL, NULL);
                CHECK_RETURN("ua_service_get_name", ret, UA_ERROR_NOT_SUPPORTED);
@@ -295,8 +273,6 @@ int utc_ua_service_get_name_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_get_name(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_get_name", ret, UA_ERROR_NOT_SUPPORTED);
@@ -313,8 +289,6 @@ int utc_ua_service_set_detection_threshold_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_set_detection_threshold(NULL, 0, 0);
                CHECK_RETURN("ua_service_set_detection_threshold", ret, UA_ERROR_NOT_SUPPORTED);
@@ -337,8 +311,6 @@ int utc_ua_service_set_detection_threshold_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_set_detection_threshold(NULL, 0, 0);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_set_detection_threshold", ret, UA_ERROR_NOT_SUPPORTED);
@@ -357,8 +329,6 @@ int utc_ua_service_get_detection_threshold_p(void)
        unsigned int presence_threshold = 0;
        unsigned int absence_threshold = 0;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_get_detection_threshold(NULL, NULL, NULL);
                CHECK_RETURN("ua_service_get_detection_threshold", ret, UA_ERROR_NOT_SUPPORTED);
@@ -381,8 +351,6 @@ int utc_ua_service_get_detection_threshold_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_get_detection_threshold(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_get_detection_threshold", ret, UA_ERROR_NOT_SUPPORTED);
@@ -404,8 +372,6 @@ int utc_ua_service_get_user_by_account_p(void)
        char service_str[] = {"ua.service.default"};
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_get_user_by_account(NULL, NULL, NULL);
                CHECK_RETURN("ua_service_get_detection_threshold", ret, UA_ERROR_NOT_SUPPORTED);
@@ -458,8 +424,6 @@ int utc_ua_service_get_user_by_account_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_get_user_by_account(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_get_user_by_account", ret, UA_ERROR_NOT_SUPPORTED);
@@ -480,8 +444,6 @@ int utc_ua_service_add_user_p(void)
        char service_str[] = {"ua.service.default"};
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_add_user(NULL, NULL);
                CHECK_RETURN("ua_service_add_user", ret, UA_ERROR_NOT_SUPPORTED);
@@ -531,8 +493,6 @@ int utc_ua_service_add_user_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_add_user(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_add_user", ret, UA_ERROR_NOT_SUPPORTED);
@@ -553,8 +513,6 @@ int utc_ua_service_remove_user_p(void)
        char service_str[] = {"ua.service.default"};
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_remove_user(NULL, NULL);
                CHECK_RETURN("ua_service_remove_user", ret, UA_ERROR_NOT_SUPPORTED);
@@ -604,8 +562,6 @@ int utc_ua_service_remove_user_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_remove_user(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_remove_user", ret, UA_ERROR_NOT_SUPPORTED);
@@ -624,8 +580,6 @@ int utc_ua_service_foreach_users_p(void)
        ua_service_h service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_service_foreach_users(NULL, NULL, NULL);
                CHECK_RETURN("ua_service_foreach_users", ret, UA_ERROR_NOT_SUPPORTED);
@@ -663,8 +617,6 @@ int utc_ua_service_foreach_users_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_service_foreach_users(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_service_foreach_users", ret, UA_ERROR_NOT_SUPPORTED);

diff --git a/src/utc/ua/utc-ua-user.c b/src/utc/ua/utc-ua-user.c
index 8b58bc353448754a7507deb27c3efa2ea4fc1384..243d0696d7294260e589d0faaff25d34f962b44c 100755 (executable)
--- a/src/utc/ua/utc-ua-user.c
+++ b/src/utc/ua/utc-ua-user.c
@@ -41,8 +41,6 @@ int utc_ua_user_create_p(void)
        ua_user_h user_h = NULL;
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_create(NULL, NULL);
                CHECK_RETURN("ua_user_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -59,8 +57,6 @@ int utc_ua_user_create_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_create(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_create", ret, UA_ERROR_NOT_SUPPORTED);
@@ -77,8 +73,6 @@ int utc_ua_user_destroy_p(void)
        ua_user_h user_h = NULL;
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_destroy(NULL);
                CHECK_RETURN("ua_user_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -98,8 +92,6 @@ int utc_ua_user_destroy_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_destroy(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_destroy", ret, UA_ERROR_NOT_SUPPORTED);
@@ -116,8 +108,6 @@ int utc_ua_user_add_p(void)
        ua_user_h user_h = NULL;
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_add(NULL);
                CHECK_RETURN("ua_user_add", ret, UA_ERROR_NOT_SUPPORTED);
@@ -143,8 +133,6 @@ int utc_ua_user_add_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_add(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_add", ret, UA_ERROR_NOT_SUPPORTED);
@@ -161,8 +149,6 @@ int utc_ua_user_remove_p(void)
        ua_user_h user_h = NULL;
        char user_account_str[] = {"default@default.com"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_remove(NULL);
                CHECK_RETURN("ua_user_remove", ret, UA_ERROR_NOT_SUPPORTED);
@@ -188,8 +174,6 @@ int utc_ua_user_remove_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_remove(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_remove", ret, UA_ERROR_NOT_SUPPORTED);
@@ -207,8 +191,6 @@ int utc_ua_user_get_account_p(void)
        char user_account_str[] = {"default@default.com"};
        char *account = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_get_account(NULL, NULL);
                CHECK_RETURN("ua_user_get_account", ret, UA_ERROR_NOT_SUPPORTED);
@@ -232,8 +214,6 @@ int utc_ua_user_get_account_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_get_account(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_get_account", ret, UA_ERROR_NOT_SUPPORTED);
@@ -254,8 +234,6 @@ int utc_ua_user_add_device_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_add_device(NULL, NULL, NULL, NULL);
                CHECK_RETURN("ua_user_add_device", ret, UA_ERROR_NOT_SUPPORTED);
@@ -294,8 +272,6 @@ int utc_ua_user_add_device_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_add_device(NULL, NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_add_device", ret, UA_ERROR_NOT_SUPPORTED);
@@ -316,8 +292,6 @@ int utc_ua_user_remove_device_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_remove_device(NULL, NULL);
                CHECK_RETURN("ua_user_remove_device", ret, UA_ERROR_NOT_SUPPORTED);
@@ -356,8 +330,6 @@ int utc_ua_user_remove_device_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_remove_device(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_remove_device", ret, UA_ERROR_NOT_SUPPORTED);
@@ -378,8 +350,6 @@ int utc_ua_user_foreach_devices_p(void)
        char mac_addr_str[] = {"30:AB:6A:09:1B:4C"};
        char device_id_str[] = {"18:54:CF:06:37:FE"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_user_foreach_devices(NULL, NULL, NULL);
                CHECK_RETURN("ua_user_foreach_devices", ret, UA_ERROR_NOT_SUPPORTED);
@@ -421,8 +391,6 @@ int utc_ua_user_foreach_devices_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_user_foreach_devices(NULL, NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_user_foreach_devices", ret, UA_ERROR_NOT_SUPPORTED);

diff --git a/src/utc/ua/utc-ua.c b/src/utc/ua/utc-ua.c
index 378e76dfc3deb49f2541ba338709e5b7fd042650..9e913fad8ede0a783eda76c96e00b944dc1f3c04 100755 (executable)
--- a/src/utc/ua/utc-ua.c
+++ b/src/utc/ua/utc-ua.c
@@ -47,8 +47,6 @@ int utc_ua_foreach_service_p(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_foreach_service(NULL, NULL);
                CHECK_RETURN("ua_foreach_service", ret, UA_ERROR_NOT_SUPPORTED);
@@ -67,8 +65,6 @@ int utc_ua_foreach_service_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_foreach_service(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_foreach_service", ret, UA_ERROR_NOT_SUPPORTED);
@@ -85,8 +81,6 @@ int utc_ua_get_default_service_p(void)
        ua_service_h service_h = NULL;
        char *name = NULL;
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_get_default_service(NULL);
                CHECK_RETURN("ua_get_default_service", ret, UA_ERROR_NOT_SUPPORTED);
@@ -109,8 +103,6 @@ int utc_ua_get_default_service_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_get_default_service(NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_get_default_service", ret, UA_ERROR_NOT_SUPPORTED);
@@ -128,8 +120,6 @@ int utc_ua_get_service_by_name_p(void)
        ua_service_h get_service_h = NULL;
        char service_str[] = {"ua.service.default"};
 
-       CHECK_INIT_RETURN();
-
        if (!ua_is_feature_supported()) {
                ret = ua_get_service_by_name(NULL, NULL);
                CHECK_RETURN("ua_get_service_by_name", ret, UA_ERROR_NOT_SUPPORTED);
@@ -152,8 +142,6 @@ int utc_ua_get_service_by_name_n(void)
 {
        int ret = UA_ERROR_NONE;
 
-       CHECK_INIT_RETURN();
-
        ret = ua_get_service_by_name(NULL, NULL);
        if (!ua_is_feature_supported()) {
                CHECK_RETURN("ua_get_service_by_name", ret, UA_ERROR_NOT_SUPPORTED);