[UTC][d2d-conv-manager][Non-ACR][Enable feature checking routine and remove unnecessa...

- d2d feature is now included in model-config, so enable feature checking routine.
- remote unnecessary comments related to LCOV. ( LCOV_EXCL_START / LCOV_EXCL_STOP )

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: Id92b50bd1d93db6281f66cf6cdc0c7763ce45d28

diff --git a/src/utc/d2d-conv-manager/utc-d2d-conv-manager.c b/src/utc/d2d-conv-manager/utc-d2d-conv-manager.c
index 04d00cc..9c94869 100755 (executable)
--- a/src/utc/d2d-conv-manager/utc-d2d-conv-manager.c
+++ b/src/utc/d2d-conv-manager/utc-d2d-conv-manager.c
@@ -38,15 +38,11 @@ void utc_d2d_conv_manager_startup(void)
 
        g_mainloop = g_main_loop_new(NULL, FALSE);
 
-#if 0
        g_feature = false;
 
        ret = system_info_get_platform_bool("http://tizen.org/feature/convergence.d2d", &g_feature);
        if (ret != SYSTEM_INFO_ERROR_NONE)
                return;
-#else
-       g_feature = true; // temp
-#endif
 }
 
 /**
@@ -67,7 +63,6 @@ void utc_d2d_conv_manager_cleanup(void)
  */
 int utc_d2d_conv_manager_conv_create_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_h handle;
 
@@ -85,7 +80,6 @@ int utc_d2d_conv_manager_conv_create_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -117,7 +111,6 @@ int utc_d2d_conv_manager_conv_create_n(void)
  */
 int utc_d2d_conv_manager_conv_destroy_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_h handle;
 
@@ -135,7 +128,6 @@ int utc_d2d_conv_manager_conv_destroy_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -167,7 +159,6 @@ int utc_d2d_conv_manager_conv_destroy_n(void)
  */
 int utc_d2d_conv_manager_conv_discovery_start_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_h handle;
 
@@ -191,7 +182,6 @@ int utc_d2d_conv_manager_conv_discovery_start_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -259,7 +249,6 @@ int utc_d2d_conv_manager_conv_discovery_start_n2(void)
  */
 int utc_d2d_conv_manager_conv_discovery_stop_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_h handle;
 
@@ -283,7 +272,6 @@ int utc_d2d_conv_manager_conv_discovery_stop_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**

diff --git a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_channel.c b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_channel.c
index 3e91ee2..f127a4d 100755 (executable)
--- a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_channel.c
+++ b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_channel.c
@@ -33,15 +33,11 @@ void utc_d2d_conv_manager_channel_startup(void)
 
        g_mainloop = g_main_loop_new(NULL, FALSE);
 
-#if 0
        g_feature = false;
 
        ret = system_info_get_platform_bool("http://tizen.org/feature/convergence.d2d", &g_feature);
        if (ret != SYSTEM_INFO_ERROR_NONE)
                return;
-#else
-       g_feature = true; // temp
-#endif
 }
 
 /**
@@ -62,7 +58,6 @@ void utc_d2d_conv_manager_channel_cleanup(void)
  */
 int utc_d2d_conv_manager_conv_channel_create_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_channel_h channel_handle;
 
@@ -80,7 +75,6 @@ int utc_d2d_conv_manager_conv_channel_create_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -112,7 +106,6 @@ int utc_d2d_conv_manager_conv_channel_create_n(void)
  */
 int utc_d2d_conv_manager_conv_channel_destroy_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_channel_h channel_handle;
 
@@ -130,7 +123,6 @@ int utc_d2d_conv_manager_conv_channel_destroy_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -162,7 +154,6 @@ int utc_d2d_conv_manager_conv_channel_destroy_n(void)
  */
 int utc_d2d_conv_manager_conv_channel_get_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_channel_h channel_handle;
        char *value = NULL;
@@ -187,7 +178,6 @@ int utc_d2d_conv_manager_conv_channel_get_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -295,7 +285,6 @@ int utc_d2d_conv_manager_conv_channel_get_string_n3(void)
  */
 int utc_d2d_conv_manager_conv_channel_set_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_channel_h channel_handle;
 
@@ -316,7 +305,6 @@ int utc_d2d_conv_manager_conv_channel_set_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**

diff --git a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_device.c b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_device.c
index bbae287..fbc6db1 100755 (executable)
--- a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_device.c
+++ b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_device.c
@@ -38,15 +38,11 @@ void utc_d2d_conv_manager_device_startup(void)
 
        g_mainloop = g_main_loop_new(NULL, FALSE);
 
-#if 0
        g_feature = false;
 
        ret = system_info_get_platform_bool("http://tizen.org/feature/convergence.d2d", &g_feature);
        if (ret != SYSTEM_INFO_ERROR_NONE)
                return;
-#else
-       g_feature = true; // temp
-#endif
 }
 
 /**

diff --git a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_payload.c b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_payload.c
index 85079e7..cc78dda 100755 (executable)
--- a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_payload.c
+++ b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_payload.c
@@ -33,15 +33,11 @@ void utc_d2d_conv_manager_payload_startup(void)
 
        g_mainloop = g_main_loop_new(NULL, FALSE);
 
-#if 0
        g_feature = false;
 
        ret = system_info_get_platform_bool("http://tizen.org/feature/convergence.d2d", &g_feature);
        if (ret != SYSTEM_INFO_ERROR_NONE)
                return;
-#else
-       g_feature = true; // temp
-#endif
 }
 
 /**
@@ -62,7 +58,6 @@ void utc_d2d_conv_manager_payload_cleanup(void)
  */
 int utc_d2d_conv_manager_conv_payload_create_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
 
@@ -80,7 +75,6 @@ int utc_d2d_conv_manager_conv_payload_create_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -112,7 +106,6 @@ int utc_d2d_conv_manager_conv_payload_create_n(void)
  */
 int utc_d2d_conv_manager_conv_payload_destroy_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
 
@@ -130,7 +123,6 @@ int utc_d2d_conv_manager_conv_payload_destroy_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -162,7 +154,6 @@ int utc_d2d_conv_manager_conv_payload_destroy_n(void)
  */
 int utc_d2d_conv_manager_conv_payload_set_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
 
@@ -183,7 +174,6 @@ int utc_d2d_conv_manager_conv_payload_set_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -280,7 +270,6 @@ int utc_d2d_conv_manager_conv_payload_set_string_n3(void)
  */
 int utc_d2d_conv_manager_conv_payload_get_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
        char *value;
@@ -305,7 +294,6 @@ int utc_d2d_conv_manager_conv_payload_get_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -413,7 +401,6 @@ int utc_d2d_conv_manager_conv_payload_get_string_n3(void)
  */
 int utc_d2d_conv_manager_conv_payload_set_app_control_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
        app_control_h app_control = NULL;
@@ -439,7 +426,6 @@ int utc_d2d_conv_manager_conv_payload_set_app_control_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -546,7 +532,6 @@ int utc_d2d_conv_manager_conv_payload_set_app_control_n3(void)
  */
 int utc_d2d_conv_manager_conv_payload_get_app_control_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
        app_control_h app_control = NULL;
@@ -576,7 +561,6 @@ int utc_d2d_conv_manager_conv_payload_get_app_control_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -699,7 +683,6 @@ int utc_d2d_conv_manager_conv_payload_get_app_control_n3(void)
  */
 int utc_d2d_conv_manager_conv_payload_set_byte_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
        unsigned char *value = (unsigned char *)"test_byte";
@@ -721,7 +704,6 @@ int utc_d2d_conv_manager_conv_payload_set_byte_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -821,7 +803,6 @@ int utc_d2d_conv_manager_conv_payload_set_byte_n3(void)
  */
 int utc_d2d_conv_manager_conv_payload_get_byte_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_payload_h handle;
        unsigned char *value = (unsigned char *)"test_byte";
@@ -848,7 +829,6 @@ int utc_d2d_conv_manager_conv_payload_get_byte_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**

diff --git a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_service.c b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_service.c
index 8c3de75..8f06656 100755 (executable)
--- a/src/utc/d2d-conv-manager/utc-d2d-conv-manager_service.c
+++ b/src/utc/d2d-conv-manager/utc-d2d-conv-manager_service.c
@@ -43,15 +43,11 @@ void utc_d2d_conv_manager_service_startup(void)
 
        g_mainloop = g_main_loop_new(NULL, FALSE);
 
-#if 0
        g_feature = false;
 
        ret = system_info_get_platform_bool("http://tizen.org/feature/convergence.d2d", &g_feature);
        if (ret != SYSTEM_INFO_ERROR_NONE)
                return;
-#else
-       g_feature = true; // temp
-#endif
 }
 
 /**
@@ -74,7 +70,6 @@ void utc_d2d_conv_manager_service_cleanup(void)
  */
 int utc_d2d_conv_manager_conv_service_create_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
 
@@ -92,7 +87,6 @@ int utc_d2d_conv_manager_conv_service_create_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -128,7 +122,6 @@ int utc_d2d_conv_manager_conv_service_create_n(void)
  */
 int utc_d2d_conv_manager_conv_service_clone_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h original_handle;
        conv_service_h target_handle;
@@ -150,7 +143,6 @@ int utc_d2d_conv_manager_conv_service_clone_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -225,7 +217,6 @@ int utc_d2d_conv_manager_conv_service_clone_n2(void)
  */
 int utc_d2d_conv_manager_conv_service_destroy_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
 
@@ -243,7 +234,6 @@ int utc_d2d_conv_manager_conv_service_destroy_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -279,7 +269,6 @@ int utc_d2d_conv_manager_conv_service_destroy_n(void)
  */
 int utc_d2d_conv_manager_conv_service_get_property_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        char *value;
@@ -304,7 +293,6 @@ int utc_d2d_conv_manager_conv_service_get_property_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -420,7 +408,6 @@ int utc_d2d_conv_manager_conv_service_get_property_string_n3(void)
  */
 int utc_d2d_conv_manager_conv_service_set_property_string_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
 
@@ -441,7 +428,6 @@ int utc_d2d_conv_manager_conv_service_set_property_string_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -546,7 +532,6 @@ int utc_d2d_conv_manager_conv_service_set_property_string_n3(void)
  */
 int utc_d2d_conv_manager_conv_service_get_connection_state_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        conv_service_connection_state_e state;
@@ -568,7 +553,6 @@ int utc_d2d_conv_manager_conv_service_get_connection_state_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -643,7 +627,6 @@ int utc_d2d_conv_manager_conv_service_get_connection_state_n2(void)
  */
 int utc_d2d_conv_manager_conv_service_get_type_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        conv_service_e value = CONV_SERVICE_APP_TO_APP_COMMUNICATION;
@@ -669,7 +652,6 @@ int utc_d2d_conv_manager_conv_service_get_type_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -752,7 +734,6 @@ int utc_d2d_conv_manager_conv_service_get_type_n2(void)
  */
 int utc_d2d_conv_manager_conv_service_set_type_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        conv_service_e value = CONV_SERVICE_APP_TO_APP_COMMUNICATION;
@@ -774,7 +755,6 @@ int utc_d2d_conv_manager_conv_service_set_type_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -1096,7 +1076,6 @@ int utc_d2d_conv_manager_conv_service_stop_n(void)
  */
 int utc_d2d_conv_manager_conv_service_set_listener_cb_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        void *user_data = NULL;
@@ -1125,7 +1104,6 @@ int utc_d2d_conv_manager_conv_service_set_listener_cb_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**
@@ -1201,7 +1179,6 @@ int utc_d2d_conv_manager_conv_service_set_listener_cb_n2(void)
  */
 int utc_d2d_conv_manager_conv_service_unset_listener_cb_p(void)
 {
-       //LCOV_EXCL_START
        int ret = CONV_ERROR_NONE;
        conv_service_h handle;
        void *user_data = NULL;
@@ -1230,7 +1207,6 @@ int utc_d2d_conv_manager_conv_service_unset_listener_cb_p(void)
        assert_eq(ret, CONV_ERROR_NONE);
 
        return 0;
-       //LCOV_EXCL_STOP
 }
 
 /**