Fix static analysis 69/240969/1
authorJunghyun Yeon <jungh.yeon@samsung.com>
Thu, 13 Aug 2020 07:29:48 +0000 (16:29 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Thu, 13 Aug 2020 07:30:02 +0000 (16:30 +0900)
Add try-catch to catch exception.

Change-Id: I91a25addfaae8f125ba904afa0e7a1b329b440de
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
unit-tests/lib/test_lib.cc
unit-tests/server/test_server.cc

index 5b5d5c8..14a26ae 100644 (file)
@@ -351,7 +351,12 @@ class App2sdEnvironment : public ::testing::Environment {
 } // namespace app2sd
 
 int main(int argc, char* argv[]) {
-  ::testing::InitGoogleTest(&argc, argv);
-  ::env = testing::AddGlobalTestEnvironment(new app2sd::App2sdEnvironment);
-  return RUN_ALL_TESTS();
+  try {
+    ::testing::InitGoogleTest(&argc, argv);
+    ::env = testing::AddGlobalTestEnvironment(new app2sd::App2sdEnvironment);
+    return RUN_ALL_TESTS();
+  } catch (...) {
+    std::cerr << "Exception occurred" << std::endl;
+    return -1;
+  }
 }
index bb2ff3f..468ddc6 100644 (file)
@@ -250,7 +250,12 @@ TEST_F(App2sdServerTest, ForceClean) {
 } // namespace
 
 int main(int argc, char* argv[]) {
-  ::testing::InitGoogleTest(&argc, argv);
-  ::env = testing::AddGlobalTestEnvironment(new app2sd::App2sdEnvironment);
-  return RUN_ALL_TESTS();
+  try {
+    ::testing::InitGoogleTest(&argc, argv);
+    ::env = testing::AddGlobalTestEnvironment(new app2sd::App2sdEnvironment);
+    return RUN_ALL_TESTS();
+  } catch (...) {
+    std::cerr << "Exception occurred" << std::endl;
+    return -1;
+  }
 }