Supress build warnings

ASSERT_EQ defined at gtest uses if-else without braces
so if we use it with braceless if statement, it will cause
ambiguous else warning. This patch remove warnings by
adding braces at if statements.

Change-Id: Ifdeabf66bf4fc42cc69a9ef43b6557ea794ef87e
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/unit_tests/extensive_smoke_test.cc b/src/unit_tests/extensive_smoke_test.cc
index d0425134d2cd12fb1c4b15416c83c9ad78e6169d..8dc8fae1daf15cd02abbb5a97dc6dad2b66fa33e 100644 (file)
--- a/src/unit_tests/extensive_smoke_test.cc
+++ b/src/unit_tests/extensive_smoke_test.cc
@@ -30,8 +30,9 @@ class SmokeEnvironment : public testing::Environment {
               backup_type_(backup_type) {
   }
   void SetUp() override {
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(AddTestUser(&test_user));
+    }
     if (no_backup_)
       return;
     backups_ = SetupBackupDirectories(test_user.uid);
@@ -49,8 +50,9 @@ class SmokeEnvironment : public testing::Environment {
                 kGlobalUserUid != test_user.uid));
     TpkBackendInterface backend(std::to_string(test_user.uid));
     UninstallAllSmokeApps(request_mode_, test_user.uid, &backend);
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(DeleteTestUser());
+    }
     if (no_backup_)
       return;
     if (backup_type_ == BackupType::MOVE) {

diff --git a/src/unit_tests/recovery_test.cc b/src/unit_tests/recovery_test.cc
index 4d85fd7b078d1cd72e505ccb85896c42f9cba34c..21957b0d2485f52ef1f1dc7fdf99eac936953d60 100644 (file)
--- a/src/unit_tests/recovery_test.cc
+++ b/src/unit_tests/recovery_test.cc
@@ -65,8 +65,9 @@ class SmokeEnvironment : public testing::Environment {
   }
 
   void SetUp() override {
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(AddTestUser(&test_user));
+    }
     if (no_backup_)
       return;
     backups_ = SetupBackupDirectories(test_user.uid);
@@ -93,8 +94,9 @@ class SmokeEnvironment : public testing::Environment {
       ASSERT_EQ(ret, SmokeTestHelperRunner::Result::SUCCESS);
     }
 
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(DeleteTestUser());
+    }
     if (no_backup_)
       return;
     if (backup_type_ == BackupType::MOVE) {

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 07768a9242fb8ea1f4e4ac53d80c73dabe7ec307..e154cac2ccc88d40f4b43d043f3d832bff9c8a25 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -36,8 +36,9 @@ class SmokeEnvironment : public testing::Environment {
               backup_type_(backup_type) {
   }
   void SetUp() override {
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(AddTestUser(&test_user));
+    }
     if (no_backup_)
       return;
     backups_ = SetupBackupDirectories(test_user.uid);
@@ -55,8 +56,9 @@ class SmokeEnvironment : public testing::Environment {
                 kGlobalUserUid != test_user.uid));
     TpkBackendInterface backend(std::to_string(test_user.uid));
     UninstallAllSmokeApps(request_mode_, test_user.uid, &backend);
-    if (request_mode_ == ci::RequestMode::USER)
+    if (request_mode_ == ci::RequestMode::USER) {
       ASSERT_TRUE(DeleteTestUser());
+    }
     if (no_backup_)
       return;
     if (backup_type_ == BackupType::MOVE) {