unittest: pass_haltests: Remove dangling-else warnings

The ASSERT_EQ() macro internal has 'if' statement, so gcc9 gives
dangling-else build warnings for single 'if' statement without
braces before ASSERT_EQ(). Remove The build warnings by adding
explict braces.

Change-Id: I56d955c71c58d2fbd99a18f0983bb5af88cd430e
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/unittest/pass_haltests.cpp b/unittest/pass_haltests.cpp
index 3ab4827..53dfa40 100644 (file)
--- a/unittest/pass_haltests.cpp
+++ b/unittest/pass_haltests.cpp
@@ -70,8 +70,9 @@ TEST_F(PowerMgntHalTest, GetResourceConfig_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_resource(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetResourceConfig Failed";
+               }
        }
 }
 
@@ -85,8 +86,9 @@ TEST_F(PowerMgntHalTest, GetCurrGovernor_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_curr_governor(res, governor);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetCurrGovernor Failed";
+               }
        }
 }
 
@@ -100,12 +102,14 @@ TEST_F(PowerMgntHalTest, SetCurrGovernor_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_curr_governor(res, governor);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetCurrGovernor Failed";
+               }
 
                ret = pass_set_curr_governor(res, governor);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "SetCurrGovernor Failed";
+               }
        }
 }
 
@@ -118,8 +122,9 @@ TEST_F(PowerMgntHalTest, GetCurrFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_curr_freq(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetCurrFreq Failed";
+               }
        }
 }
 
@@ -132,8 +137,9 @@ TEST_F(PowerMgntHalTest, GetMinFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_min_freq(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetMinFreq Failed";
+               }
        }
 }
 
@@ -147,13 +153,15 @@ TEST_F(PowerMgntHalTest, SetMinFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                min_freq = pass_get_available_min_freq(res);
-               if (haltest_is_failed(res, min_freq))
+               if (haltest_is_failed(res, min_freq)) {
                        ASSERT_EQ(min_freq, 0) << "GetAvailableMinFreq Failed";
+               }
 
                if (min_freq >= 0) {
                        ret = pass_set_min_freq(res, min_freq);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetMinFreq Failed";
+                       }
                }
        }
 }
@@ -167,8 +175,9 @@ TEST_F(PowerMgntHalTest, GetMaxFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_max_freq(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetMaxFreq Failed";
+               }
        }
 }
 
@@ -182,13 +191,15 @@ TEST_F(PowerMgntHalTest, SetMaxFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                max_freq = pass_get_available_max_freq(res);
-               if (haltest_is_failed(res, max_freq))
+               if (haltest_is_failed(res, max_freq)) {
                        ASSERT_EQ(max_freq, 0) << "GetAvailableMaxFreq Failed";
+               }
 
                if (max_freq >= 0) {
                        ret = pass_set_max_freq(res, max_freq);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetMaxFreq Failed";
+                       }
                }
        }
 }
@@ -202,8 +213,9 @@ TEST_F(PowerMgntHalTest, GetAvailableMinFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_available_min_freq(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetAvailableMinFreq Failed";
+               }
        }
 }
 
@@ -216,8 +228,9 @@ TEST_F(PowerMgntHalTest, GetAvailableMaxFreq_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_available_max_freq(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetAvailableMaxFreq Failed";
+               }
        }
 }
 
@@ -231,8 +244,9 @@ TEST_F(PowerMgntHalTest, GetUpThreshold_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_up_threshold(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetUpThreshold Failed";
+               }
        }
 }
 
@@ -246,13 +260,15 @@ TEST_F(PowerMgntHalTest, SetUpThreshold_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                up_threshold = pass_get_up_threshold(res);
-               if (haltest_is_failed(res, up_threshold))
+               if (haltest_is_failed(res, up_threshold)) {
                        ASSERT_EQ(up_threshold, 0) << "GetUpThreshold Failed";
+               }
 
                if (up_threshold >= 0) {
                        ret = pass_set_up_threshold(res, up_threshold);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetUpThreshold Failed";
+                       }
                }
        }
 }
@@ -266,8 +282,9 @@ TEST_F(PowerMgntHalTest, GetTemperature_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_temp(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetTemperature Failed";
+               }
        }
 }
 
@@ -281,8 +298,9 @@ TEST_F(PowerMgntHalTest, GetTmuPolicy_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_tmu_policy(res, policy);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetTmuPolicy Failed";
+               }
        }
 }
 
@@ -296,12 +314,14 @@ TEST_F(PowerMgntHalTest, GetOnlineState_HandlesValidInput)
 
                for (j = 0; j < res->config_data.num_cpus; j++) {
                        ret = pass_get_online_state(res, j);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "GetOnlineState Failed";
+                       }
                }
 
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetOnlineState Failed";
+               }
        }
 }
 
@@ -316,13 +336,15 @@ TEST_F(PowerMgntHalTest, SetOnlineState_HandlesValidInput)
 
                for (j = 0; j < res->config_data.num_cpus; j++) {
                        online_state = pass_get_online_state(res, j);
-                       if (haltest_is_failed(res, online_state))
+                       if (haltest_is_failed(res, online_state)) {
                                ASSERT_EQ(online_state, 0) << "GetOnlineState Failed";
+                       }
 
                        if (online_state >= 0) {
                                ret = pass_set_online_state(res, j, online_state);
-                               if (haltest_is_failed(res, ret))
+                               if (haltest_is_failed(res, ret)) {
                                        ASSERT_EQ(ret, 0) << "SetOnlineState Failed";
+                               }
                        }
                }
        }
@@ -338,8 +360,9 @@ TEST_F(PowerMgntHalTest, GetOnlineMinNum_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_online_min_num(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetOnlineMinNum Failed";
+               }
        }
 }
 
@@ -353,13 +376,15 @@ TEST_F(PowerMgntHalTest, SetOnlineMinNum_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                online_min_num = pass_get_online_min_num(res);
-               if (haltest_is_failed(res, online_min_num))
+               if (haltest_is_failed(res, online_min_num)) {
                        ASSERT_EQ(online_min_num, 0) << "GetOnlineMinNum Failed";
+               }
 
                if (online_min_num >= 0) {
                        ret = pass_set_online_min_num(res, online_min_num);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetOnlineMinNum Failed";
+                       }
                }
        }
 }
@@ -373,8 +398,9 @@ TEST_F(PowerMgntHalTest, GetOnlineMaxNum_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_online_max_num(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetOnlineMaxNum Failed";
+               }
        }
 }
 
@@ -388,13 +414,15 @@ TEST_F(PowerMgntHalTest, SetOnlineMaxNum_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                online_max_num = pass_get_online_max_num(res);
-               if (haltest_is_failed(res, online_max_num))
+               if (haltest_is_failed(res, online_max_num)) {
                        ASSERT_EQ(online_max_num, 0) << "GetOnlineMaxNum Failed";
+               }
 
                if (online_max_num >= 0) {
                        ret = pass_set_online_max_num(res, online_max_num);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetOnlineMaxNum Failed";
+                       }
                }
        }
 }
@@ -408,8 +436,9 @@ TEST_F(PowerMgntHalTest, GetFaultAroundBytes_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_get_fault_around_bytes(res);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "GetFaultAroundBytes Failed";
+               }
        }
 }
 
@@ -423,13 +452,15 @@ TEST_F(PowerMgntHalTest, SetFaultAroundBytes_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                fault_around_bytes = pass_get_fault_around_bytes(res);
-               if (haltest_is_failed(res, fault_around_bytes))
+               if (haltest_is_failed(res, fault_around_bytes)) {
                        ASSERT_EQ(fault_around_bytes, 0) << "GetFaultAroundBytes Failed";
+               }
 
                if (fault_around_bytes >= 0) {
                        ret = pass_set_fault_around_bytes(res, fault_around_bytes);
-                       if (haltest_is_failed(res, ret))
+                       if (haltest_is_failed(res, ret)) {
                                ASSERT_EQ(ret, 0) << "SetFaultAroundBytes Failed";
+                       }
                }
        }
 }
@@ -444,8 +475,9 @@ TEST_F(PowerMgntHalTest, SetPmqosData_HandlesValidInput)
                struct pass_resource *res = &g_pass.res[i];
 
                ret = pass_set_pmqos_data(res, applaunch_scenario);
-               if (haltest_is_failed(res, ret))
+               if (haltest_is_failed(res, ret)) {
                        ASSERT_EQ(ret, 0) << "SetPmqosData Failed";
+               }
        }
 }