Fix affected unit testsfix/fix_iap_device_switching_sequence_test

1 files changed, 14 insertions, 15 deletions

diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
index df1b0a0105..636175c56f 100644
--- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
+++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/test/commands/mobile/register_app_interface_request_test.cc
@@ -305,6 +305,8 @@ TEST_F(RegisterAppInterfaceRequestTest, Run_MinimalData_SUCCESS) {
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
   MockAppPtr mock_app = CreateBasicMockedApp();
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
   EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
       .WillRepeatedly(Return(ApplicationSharedPtr()));
 
@@ -387,6 +389,8 @@ TEST_F(RegisterAppInterfaceRequestTest,
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
   MockAppPtr mock_app = CreateBasicMockedApp();
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
   EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
       .WillRepeatedly(Return(ApplicationSharedPtr()));
 
@@ -485,8 +489,8 @@ TEST_F(RegisterAppInterfaceRequestTest,
 
   MockAppPtr mock_app = CreateBasicMockedApp();
   app_set_.insert(mock_app);
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId1))
-      .WillRepeatedly(Return(mock_app));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
 
   connection_handler::DeviceHandle device_id = 1;
   ON_CALL(mock_connection_handler_,
@@ -496,9 +500,6 @@ TEST_F(RegisterAppInterfaceRequestTest,
   ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
-  ON_CALL(app_mngr_, IsAppInReconnectMode(kDeviceHandle, kAppId1))
-      .WillByDefault(Return(true));
-
   EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
@@ -542,13 +543,10 @@ TEST_F(RegisterAppInterfaceRequestTest,
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
   MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId1))
-      .WillRepeatedly(Return(mock_app));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
   EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
-  ON_CALL(app_mngr_, IsAppInReconnectMode(kDeviceHandle, kAppId1))
-      .WillByDefault(Return(true));
-
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
 
   EXPECT_CALL(
@@ -588,13 +586,10 @@ TEST_F(RegisterAppInterfaceRequestTest,
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
   MockAppPtr mock_app = CreateBasicMockedApp();
-  EXPECT_CALL(app_mngr_, application_by_policy_id(kAppId1))
-      .WillRepeatedly(Return(mock_app));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(mock_app));
   EXPECT_CALL(*mock_app, device()).WillOnce(Return(kDeviceHandle));
 
-  EXPECT_CALL(app_mngr_, IsAppInReconnectMode(kDeviceHandle, kAppId1))
-      .WillOnce(Return(true));
-
   EXPECT_CALL(app_mngr_, ProcessReconnection(_, kConnectionKey));
 
   EXPECT_CALL(
@@ -638,6 +633,8 @@ TEST_F(RegisterAppInterfaceRequestTest,
   ON_CALL(mock_session_observer_, GetDataOnDeviceID(device_id, _, _, _, _))
       .WillByDefault(DoAll(SetArgPointee<3>(kMacAddress1), Return(0)));
 
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
   EXPECT_CALL(app_mngr_, application(kMacAddress1, kAppId1))
       .WillOnce(Return(mock_app1));
 
@@ -688,6 +685,8 @@ TEST_F(RegisterAppInterfaceRequestTest,
   ON_CALL(*mock_app2, mac_address()).WillByDefault(ReturnRef(kMacAddress2));
   EXPECT_CALL(app_mngr_, application(kMacAddress2, kAppId1))
       .WillRepeatedly(Return(ApplicationSharedPtr()));
+  EXPECT_CALL(app_mngr_, reregister_application_by_policy_id(kAppId1))
+      .WillOnce(Return(ApplicationSharedPtr()));
 
   EXPECT_CALL(app_mngr_, application(kConnectionKey2))
       .WillOnce(Return(mock_app2));