Fix unit tests names

1 files changed, 27 insertions, 17 deletions

diff --git a/src/components/application_manager/test/resumption/resume_ctrl_test.cc b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
index 5bae980e0d..151860ed15 100644
--- a/src/components/application_manager/test/resumption/resume_ctrl_test.cc
+++ b/src/components/application_manager/test/resumption/resume_ctrl_test.cc
@@ -1229,7 +1229,9 @@ TEST_F(ResumeCtrlTest, GetSavedAppHmiLevel_AskedAppFound_INVALID_ENUM) {
             res_ctrl_->GetSavedAppHmiLevel(kTestPolicyAppId_, kMacAddress_));
 }
 
-TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_Restored) {
+TEST_F(
+    ResumeCtrlTest,
+    ResumptionLowVoltage_AppInFullUnregisteredWithinTimeFrame_HMILevelRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =
@@ -1270,11 +1272,13 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_Restored) {
   res_ctrl_->StartAppHmiStateResumption(mock_app_);
 }
 
-TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_NotRestored) {
+TEST_F(
+    ResumeCtrlTest,
+    ResumptionLowVoltage_AppInFullUnregisteredOnTheBorderOfTimeFrame_HMILevelRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =
-      time(nullptr) - resumption_delay_before_ign_ - time_offset;
+      time(nullptr) - resumption_delay_before_ign_ + time_offset;
   smart_objects::SmartObject saved_app;
   saved_app[application_manager::strings::hmi_level] = restored_test_type;
   saved_app[application_manager::strings::time_stamp] = time_stamp;
@@ -1283,7 +1287,8 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_NotRestored) {
   DataAccessor<application_manager::CommandsMap> data_accessor(
       command, app_set_lock_ptr_);
 
-  EXPECT_CALL(mock_app_mngr_, state_controller()).Times(0);
+  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
+      .Times(AtLeast(1));
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillRepeatedly(Return(kDefaultTestLevel_));
@@ -1292,6 +1297,10 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_NotRestored) {
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
+  EXPECT_CALL(*mock_storage_,
+              RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
+      .WillOnce(Return(true));
+
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
 
@@ -1300,17 +1309,19 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInFull_NotRestored) {
       .WillOnce(ReturnRef(app_mngr_settings_));
 
   EXPECT_CALL(app_mngr_settings_, resumption_delay_before_ign())
-      .WillOnce(Return(resumption_delay_before_ign_));
+      .WillOnce(Return(resumption_delay_before_ign_ + time_offset));
 
   res_ctrl_->SaveLowVoltageTime();
   res_ctrl_->StartAppHmiStateResumption(mock_app_);
 }
 
-TEST_F(ResumeCtrlTest, LowVoltage_AppInFull_Restored2) {
+TEST_F(
+    ResumeCtrlTest,
+    ResumptionLowVoltage_AppInFullUnregisteredBeyondTimeFrame_HMILevelNotRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_FULL;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =
-      time(nullptr) - resumption_delay_before_ign_ + time_offset;
+      time(nullptr) - resumption_delay_before_ign_ - time_offset;
   smart_objects::SmartObject saved_app;
   saved_app[application_manager::strings::hmi_level] = restored_test_type;
   saved_app[application_manager::strings::time_stamp] = time_stamp;
@@ -1319,8 +1330,7 @@ TEST_F(ResumeCtrlTest, LowVoltage_AppInFull_Restored2) {
   DataAccessor<application_manager::CommandsMap> data_accessor(
       command, app_set_lock_ptr_);
 
-  EXPECT_CALL(mock_state_controller_, SetRegularState(_, restored_test_type))
-      .Times(AtLeast(1));
+  EXPECT_CALL(mock_app_mngr_, state_controller()).Times(0);
   GetInfoFromApp();
   EXPECT_CALL(mock_app_mngr_, GetDefaultHmiLevel(const_app_))
       .WillRepeatedly(Return(kDefaultTestLevel_));
@@ -1329,10 +1339,6 @@ TEST_F(ResumeCtrlTest, LowVoltage_AppInFull_Restored2) {
           GetSavedApplication(kTestPolicyAppId_, kMacAddress_, _))
       .WillByDefault(DoAll(SetArgReferee<2>(saved_app), Return(true)));
 
-  EXPECT_CALL(*mock_storage_,
-              RemoveApplicationFromSaved(kTestPolicyAppId_, kMacAddress_))
-      .WillOnce(Return(true));
-
   ON_CALL(mock_app_mngr_, GetUserConsentForDevice("12345"))
       .WillByDefault(Return(policy::kDeviceAllowed));
 
@@ -1341,13 +1347,13 @@ TEST_F(ResumeCtrlTest, LowVoltage_AppInFull_Restored2) {
       .WillOnce(ReturnRef(app_mngr_settings_));
 
   EXPECT_CALL(app_mngr_settings_, resumption_delay_before_ign())
-      .WillOnce(Return(resumption_delay_before_ign_ + time_offset));
+      .WillOnce(Return(resumption_delay_before_ign_));
 
   res_ctrl_->SaveLowVoltageTime();
   res_ctrl_->StartAppHmiStateResumption(mock_app_);
 }
 
-TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInBackground_Restored) {
+TEST_F(ResumeCtrlTest, ResumptionLowVoltage_AppInBackground_NotRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_BACKGROUND;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =
@@ -1373,7 +1379,9 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInBackground_Restored) {
   res_ctrl_->StartAppHmiStateResumption(mock_app_);
 }
 
-TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInLimited_Restored) {
+TEST_F(
+    ResumeCtrlTest,
+    ResumptionLowVoltage_AppInLimitedlUnregisteredWithinTimeFrame_HMILevelRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_LIMITED;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =
@@ -1414,7 +1422,9 @@ TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInLimited_Restored) {
   res_ctrl_->StartAppHmiStateResumption(mock_app_);
 }
 
-TEST_F(ResumeCtrlTest, ResumptiLowVoltage_AppInLimited_NotRestored) {
+TEST_F(
+    ResumeCtrlTest,
+    ResumptionLowVoltage_AppInLimitedlUnregisteredBeyondTimeFrame_HMILevelNotRestored) {
   const mobile_apis::HMILevel::eType restored_test_type = eType::HMI_LIMITED;
   const uint32_t time_offset = 5;
   const uint32_t time_stamp =