unittest: pass_haltests: Remove unreached return statement and unneeded if statement

ASSERT_EQ() macro is able to check the 'return value' and then if 'return value'
is less than zero, print error message and exit the unittest. It means that
the separate 'if statement' for checking 'return value' is not neeeded
when using ASSERT_EQ().

Also, when using ASSERT_EQ() macro, the unittest don't need to call
'return statement' because ASSERT_EQ() return right now if 'return value'
is error. So, remove unreached return statement.

Change-Id: I2808d033e669a021a5b53226bf44c91241640c9a
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/unittest/pass_haltests.cpp b/unittest/pass_haltests.cpp
index db068f1..3efc070 100644 (file)
--- a/unittest/pass_haltests.cpp
+++ b/unittest/pass_haltests.cpp
@@ -64,19 +64,14 @@ TEST_F(PowerMgntHalTest, GetResourceConfig_HandlesValidInput)
        ASSERT_EQ(ret, 0) << "PassServieStop Faield";
 
        ret = pass_get_resource_config(&g_pass, path);
-       if (ret < 0)
-               return;
-
        ASSERT_EQ(ret, 0) << "GetResourceConfig Failed";
 
        for (i = 0; i < g_pass.num_resources; i++) {
                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";
-                       return;
-               }
        }
 }
 
@@ -90,10 +85,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -107,16 +100,12 @@ 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";
-                       return;
-               }
 
                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";
-                       return;
-               }
        }
 }
 
@@ -129,10 +118,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -145,10 +132,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -162,17 +147,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -186,10 +167,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -203,17 +182,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -227,10 +202,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -243,10 +216,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -260,10 +231,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -277,17 +246,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -301,10 +266,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -318,10 +281,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -335,16 +296,12 @@ 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";
-                               return;
-                       }
                }
 
-               if (haltest_is_failed(res, ret)) {
+               if (haltest_is_failed(res, ret))
                        ASSERT_EQ(ret, 0) << "GetOnlineState Failed";
-                       return;
-               }
        }
 }
 
@@ -359,17 +316,13 @@ 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";
-                               return;
-                       }
 
                        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";
-                                       return;
-                               }
                        }
                }
        }
@@ -385,10 +338,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -402,17 +353,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -426,10 +373,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -443,17 +388,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -467,10 +408,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -484,17 +423,13 @@ 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";
-                       return;
-               }
 
                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";
-                               return;
-                       }
                }
        }
 }
@@ -509,10 +444,8 @@ 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";
-                       return;
-               }
        }
 }
 
@@ -528,7 +461,6 @@ TEST_F(PowerMgntHalTest, PutResourceConfig_HandlesValidInput)
                if (ret < 0) {
                        pass_put_resource_config(&g_pass);
                        ASSERT_EQ(ret, 0) << "PutResourceConfig Failed";
-                       return;
                }
        }