From 27f61ab3c20cc645fc12f366ab38734e0e814c69 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 28 May 2020 20:24:47 +0900 Subject: [PATCH] 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 --- src/unit_tests/extensive_smoke_test.cc | 6 ++++-- src/unit_tests/recovery_test.cc | 6 ++++-- src/unit_tests/smoke_test.cc | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/unit_tests/extensive_smoke_test.cc b/src/unit_tests/extensive_smoke_test.cc index d042513..8dc8fae 100644 --- 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 4d85fd7..21957b0 100644 --- 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 07768a9..e154cac 100644 --- 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) { -- 2.34.1