Added exception handling for unsupported features in HAL TC

Change-Id: I3144d40e4c2801d798c9563c468157001c74d222
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/haltests/haltests.h b/haltests/haltests.h
index 7c56f1d..495602e 100755 (executable)
--- a/haltests/haltests.h
+++ b/haltests/haltests.h
@@ -53,6 +53,13 @@ bool g_bFeatureP2P;
                g_main_loop_quit(g_pMainLoop);\
 }
 
+#define SKIP_NOT_SUPPORTED(bFeature) {\
+       if (!bFeature) {\
+               printf("Feature is not support\n");\
+               return;\
+       } \
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/haltests/net-config-haltests.cpp b/haltests/net-config-haltests.cpp
index 11ae2a7..29dd521 100755 (executable)
--- a/haltests/net-config-haltests.cpp
+++ b/haltests/net-config-haltests.cpp
@@ -144,7 +144,7 @@ static bool __found_ap_callback(wifi_manager_ap_h ap, void *user_data)
 TEST(Hal_wifi, Init_p)
 {
        g_bFeatureWifi = __check_feature_supported((char*)FEATURE_WIFI);
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv = wifi_manager_initialize(&wifi);
        EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Initialization failure";
@@ -152,7 +152,7 @@ TEST(Hal_wifi, Init_p)
 
 TEST(Hal_wifi, Activate_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv;
        bool activated;
@@ -178,7 +178,7 @@ done:
 
 TEST(Hal_wifi, Scan_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv = wifi_manager_scan(wifi, __test_callback, NULL);
        ASSERT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Failed to scan";
@@ -191,7 +191,7 @@ TEST(Hal_wifi, Scan_p)
 
 TEST(Hal_wifi, Connect_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        wifi_manager_connection_state_e connection_state;
        int ret = WIFI_MANAGER_ERROR_NONE;
@@ -220,7 +220,7 @@ TEST(Hal_wifi, Connect_p)
 
 TEST(Hal_wifi, Disconnect_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int ret = WIFI_MANAGER_ERROR_NONE;
        wifi_manager_ap_h hAP = NULL;
@@ -244,7 +244,7 @@ TEST(Hal_wifi, Disconnect_p)
 
 TEST(Hal_wifi, Deactivate_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv = wifi_manager_deactivate(wifi, __test_callback, NULL);
        ASSERT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Failed to deactivate Wi-Fi device";
@@ -260,7 +260,7 @@ TEST(Hal_wifi, Deactivate_p)
 
 TEST(Hal_wifi, Deinit_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int rv = wifi_manager_deinitialize(wifi);
        EXPECT_EQ(WIFI_MANAGER_ERROR_NONE, rv) << "Deinitialization failure";
@@ -269,7 +269,7 @@ TEST(Hal_wifi, Deinit_p)
 TEST(Hal_wifi_direct, Init_p)
 {
        g_bFeatureP2P = __check_feature_supported((char*)WIFIDIRECT_FEATURE);
-       ASSERT_EQ(true, g_bFeatureP2P) << WIFIDIRECT_FEATURE << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
        int rv = wifi_direct_initialize();
        EXPECT_EQ(WIFI_DIRECT_ERROR_NONE, rv) << "Initialization failure";
@@ -277,7 +277,7 @@ TEST(Hal_wifi_direct, Init_p)
 
 TEST(Hal_wifi_direct, Activate_p)
 {
-       ASSERT_EQ(true, g_bFeatureP2P) << WIFIDIRECT_FEATURE << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
        int rv;
        wifi_direct_state_e state = WIFI_DIRECT_STATE_ACTIVATED;
@@ -313,7 +313,7 @@ done:
 
 TEST(Hal_wifi_direct, Deactivate_p)
 {
-       ASSERT_EQ(true, g_bFeatureP2P) << WIFIDIRECT_FEATURE << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
        int rv;
 
@@ -343,7 +343,7 @@ TEST(Hal_wifi_direct, Deactivate_p)
 
 TEST(Hal_wifi_direct, Deinit_p)
 {
-       ASSERT_EQ(true, g_bFeatureP2P) << WIFIDIRECT_FEATURE << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureP2P);
 
        int rv = wifi_direct_deinitialize();
        EXPECT_EQ(WIFI_DIRECT_ERROR_NONE, rv) << "Deinitialization failure";
@@ -352,7 +352,7 @@ TEST(Hal_wifi_direct, Deinit_p)
 TEST(Hal_softap, Init_p)
 {
        g_bFeatureWifi = __check_feature_supported((char*)FEATURE_WIFI);
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int ret = SOFTAP_ERROR_NONE;
 
@@ -368,7 +368,7 @@ TEST(Hal_softap, Init_p)
 
 TEST(Hal_softap, Activate_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int ret = SOFTAP_ERROR_NONE;
        bool enabled = false;
@@ -394,7 +394,7 @@ done:
 
 TEST(Hal_softap, Deactivate_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int ret = SOFTAP_ERROR_NONE;
 
@@ -411,7 +411,7 @@ TEST(Hal_softap, Deactivate_p)
 
 TEST(Hal_softap, Deinit_p)
 {
-       ASSERT_EQ(true, g_bFeatureWifi) << FEATURE_WIFI << " feature is not supported";
+       SKIP_NOT_SUPPORTED(g_bFeatureWifi);
 
        int ret = SOFTAP_ERROR_NONE;