Fix coveriry issue on haltest

Change-Id: Ie73f07a1aa2a52bba8ef3620988e623f01dc7f40

diff --git a/haltest/tapi_hal_tc.cpp b/haltest/tapi_hal_tc.cpp
index e7775db8fe242e241149c51b0d333ca47ab57f2a..fd570dafdea136cb631bfc2d1c8159e0291cb1ba 100644 (file)
--- a/haltest/tapi_hal_tc.cpp
+++ b/haltest/tapi_hal_tc.cpp
@@ -305,7 +305,7 @@ TEST(TAPI_MODEM, tel_get_misc_me_version_sync_P)
 
        TelMiscVersionInformation *info = NULL;
        info = tel_get_misc_me_version_sync(tapi_h);
-       EXPECT_TRUE(NULL != info) << "tel_get_misc_me_version_sync() is failed" << std::endl;
+       ASSERT_TRUE(NULL != info) << "tel_get_misc_me_version_sync() is failed" << std::endl;
 
        std::cout << "  [sw version]: " << info->szSwVersion << std::endl;
        std::cout << "  [hw version]: " << info->szHwVersion << std::endl;
@@ -325,7 +325,7 @@ TEST(TAPI_MODEM, tel_get_misc_me_sn_sync_P)
 
        TelMiscSNInformation *sn;
        sn = tel_get_misc_me_sn_sync(tapi_h);
-       EXPECT_TRUE(NULL != sn) << "tel_get_misc_me_sn_sync() is failed" << std::endl;
+       ASSERT_TRUE(NULL != sn) << "tel_get_misc_me_sn_sync() is failed" << std::endl;
 
 
        std::cout << "  [esn number]: " << sn->szEsn << std::endl;
@@ -343,7 +343,7 @@ TEST(TAPI_MODEM, tel_get_misc_me_imei_sync_P)
 
        char *imei;
        imei = tel_get_misc_me_imei_sync(tapi_h);
-       EXPECT_TRUE(NULL != imei) << "tel_get_misc_me_imei_sync() is failed" << std::endl;
+       ASSERT_TRUE(NULL != imei) << "tel_get_misc_me_imei_sync() is failed" << std::endl;
 
        std::cout << "  [imei number]: " << imei << std::endl;
 
@@ -499,8 +499,20 @@ TEST(TAPI_DEINIT, tel_deinit_P)
        tapi_h = NULL;
 }
 
-int main(int argc, char **argv) {
-  InitGoogleTest(&argc, argv);
+int main(int argc, char **argv)
+{
+       int ret = -1;
 
-  return RUN_ALL_TESTS();
+       try {
+               testing::InitGoogleTest(&argc, argv);
+       } catch(...) {
+               std::cout << "Exception occurred." << std::endl;
+       }
+       try {
+               ret = RUN_ALL_TESTS();
+       } catch (const ::testing::internal::GoogleTestFailureException& e) {
+               ret = -1;
+               std::cout << "GoogleTestFailureException was thrown:" << e.what() << std::endl;
+       }
+       return ret;
 }

diff --git a/packaging/libtapi.spec b/packaging/libtapi.spec
index c03423ba49117040cf2dbc1f7306403bfd8c46d1..9557fd6f4ca144d6111b6bb94676b28d58469966 100644 (file)
--- a/packaging/libtapi.spec
+++ b/packaging/libtapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 8
-%define patchlevel 28
+%define patchlevel 29
 
 Name:           libtapi
 Version:        %{major}.%{minor}.%{patchlevel}