Add feature not supported handling

Change-Id: I75af3f579d9b5f398d833ebe00ca94e728fe828e

diff --git a/haltest/tapi_hal_tc.cpp b/haltest/tapi_hal_tc.cpp
index fd570dafdea136cb631bfc2d1c8159e0291cb1ba..3ac90276d45bf9f5389f95214257f9eaeeaa66f6 100644 (file)
--- a/haltest/tapi_hal_tc.cpp
+++ b/haltest/tapi_hal_tc.cpp
@@ -187,7 +187,10 @@ static void _get_sim_msisdn_callback(TapiHandle *handle, int result, void *data,
 TEST(TAPI_INIT, tel_get_cp_name_list)
 {
        g_bFeatureTelephony = __check_telephony_feature_supported();
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
 
        cp_list = tel_get_cp_name_list();
        ASSERT_TRUE(cp_list != NULL) << "cp_list is null" << std::endl;
@@ -204,7 +207,11 @@ TEST(TAPI_INIT, tel_get_cp_name_list)
 
 TEST(TAPI_INIT, tel_init_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(cp_list != NULL && cp_count > 0);
 
        tapi_h = tel_init(cp_list[0]);
@@ -214,7 +221,11 @@ TEST(TAPI_INIT, tel_init_P)
 
 TEST(TAPI_INIT, tel_get_ready_state_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int state = 0;
@@ -227,7 +238,11 @@ TEST(TAPI_INIT, tel_get_ready_state_P)
 
 TEST(TAPI_INIT, tel_register_noti_event_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = 0;
@@ -241,7 +256,11 @@ TEST(TAPI_INIT, tel_register_noti_event_P)
 
 TEST(TAPI_NETWORK, tel_get_property_int_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int svc_type = -1, act = -1, cs = -1, ps = -1;
@@ -265,7 +284,11 @@ TEST(TAPI_NETWORK, tel_get_property_int_P)
 
 TEST(TAPI_NETWORK, tel_get_property_string_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        char *plmn = NULL, *n_name = NULL, *s_name = NULL;
@@ -288,7 +311,11 @@ TEST(TAPI_NETWORK, tel_get_property_string_P)
 
 TEST(TAPI_MODEM, telephony_modem_get_power_status_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int modem_status = -1;
@@ -300,7 +327,11 @@ TEST(TAPI_MODEM, telephony_modem_get_power_status_P)
 
 TEST(TAPI_MODEM, tel_get_misc_me_version_sync_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        TelMiscVersionInformation *info = NULL;
@@ -320,7 +351,11 @@ TEST(TAPI_MODEM, tel_get_misc_me_version_sync_P)
 
 TEST(TAPI_MODEM, tel_get_misc_me_sn_sync_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        TelMiscSNInformation *sn;
@@ -338,7 +373,11 @@ TEST(TAPI_MODEM, tel_get_misc_me_sn_sync_P)
 
 TEST(TAPI_MODEM, tel_get_misc_me_imei_sync_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        char *imei;
@@ -352,7 +391,11 @@ TEST(TAPI_MODEM, tel_get_misc_me_imei_sync_P)
 
 TEST(TAPI_MODEM, tel_get_flight_mode_P1)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_get_flight_mode(tapi_h, _get_flight_mode_callback, NULL);
@@ -366,7 +409,11 @@ TEST(TAPI_MODEM, tel_get_flight_mode_P1)
 
 TEST(TAPI_MODEM, tel_set_flight_mode_on)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_set_flight_mode(tapi_h, TAPI_POWER_FLIGHT_MODE_ENTER, _set_flight_mode_callback, NULL);
@@ -380,7 +427,11 @@ TEST(TAPI_MODEM, tel_set_flight_mode_on)
 
 TEST(TAPI_MODEM, tel_get_flight_mode_P2)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_get_flight_mode(tapi_h, _get_flight_mode_callback, NULL);
@@ -394,7 +445,11 @@ TEST(TAPI_MODEM, tel_get_flight_mode_P2)
 
 TEST(TAPI_MODEM, tel_set_flight_mode_off)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_set_flight_mode(tapi_h, TAPI_POWER_FLIGHT_MODE_LEAVE, _set_flight_mode_callback, NULL);
@@ -408,7 +463,11 @@ TEST(TAPI_MODEM, tel_set_flight_mode_off)
 
 TEST(TAPI_SIM, tel_get_sim_init_info_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = 0;
@@ -429,7 +488,11 @@ TEST(TAPI_SIM, tel_get_sim_init_info_P)
 
 TEST(TAPI_SIM, tel_get_sim_imsi_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = 0;
@@ -448,7 +511,11 @@ TEST(TAPI_SIM, tel_get_sim_imsi_P)
 
 TEST(TAPI_SIM, tel_get_sim_iccid_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_get_sim_iccid(tapi_h, _get_sim_iccid_callback, NULL);
@@ -464,7 +531,11 @@ TEST(TAPI_SIM, tel_get_sim_iccid_P)
 
 TEST(TAPI_SIM, tel_get_sim_msisdn_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_get_sim_msisdn(tapi_h, _get_sim_msisdn_callback, NULL);
@@ -478,7 +549,11 @@ TEST(TAPI_SIM, tel_get_sim_msisdn_P)
 
 TEST(TAPI_DEINIT, tel_deregister_noti_event_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = 0;
@@ -491,7 +566,11 @@ TEST(TAPI_DEINIT, tel_deregister_noti_event_P)
 
 TEST(TAPI_DEINIT, tel_deinit_P)
 {
-       ASSERT_EQ(true, g_bFeatureTelephony) << FEATRE_NOT_SUPPORT << std::endl;
+       if(!g_bFeatureTelephony) {
+               std::cout << FEATRE_NOT_SUPPORT << std::endl;
+               return;
+       }
+
        ASSERT_TRUE(tapi_h != NULL) << "tapi_h is NULL" << std::endl;
 
        int ret = tel_deinit(tapi_h);

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index 82f9f5d09ab207a43a53c5c099f4628d47edb37e..79758b375d413d1d03f97898fb5d01cad906ce70 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 8
-%define patchlevel 31
+%define patchlevel 32
 
 Name:           libtapi
 Version:        %{major}.%{minor}.%{patchlevel}