X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=haltest%2Ftapi_hal_tc.cpp;h=fd570dafdea136cb631bfc2d1c8159e0291cb1ba;hb=867160852aca48bc6581ac46a25c72c2c2db1a49;hp=e7775db8fe242e241149c51b0d333ca47ab57f2a;hpb=af55c6f2adbd769690e884e848546c7f46334008;p=platform%2Fcore%2Ftelephony%2Flibtapi.git

diff --git a/haltest/tapi_hal_tc.cpp b/haltest/tapi_hal_tc.cpp
index e7775db..fd570da 100644
--- 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;
 }