Focus received savegame path test

Author: DevOpsOfChaos

tests/s25Main/network/testGameClient.cpp

@@ -79,27 +79,6 @@ class CustomUserMapFolderFixture
     }
 };
 
-void AdvanceClientToMapInfoRequest(GameClient& client, GameMessageInterface& clientMsgInterface,
-                                   MockClientInterface& callbacks, const std::string& password,
-                                   ServerType serverType, int serverPort)
-{
-    mock::sequence s;
-    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::Initiated).once();
-    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::VerifyServer).once();
-    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::QueryPw).once();
-    MOCK_EXPECT(callbacks.CI_NextConnectState).in(s).with(ConnectState::QueryMapInfo).once();
-
-    BOOST_TEST_REQUIRE(client.Connect("localhost", password, serverType, serverPort, false, false));
-    clientMsgInterface.OnGameMessage(GameMessage_Player_Id(1));
-    client.GetMainPlayer().sendQueue.clear();
-
-    clientMsgInterface.OnGameMessage(GameMessage_Server_TypeOK(GameMessage_Server_TypeOK::StatusCode::Ok, ""));
-    client.GetMainPlayer().sendQueue.clear();
-
-    clientMsgInterface.OnGameMessage(GameMessage_Server_Password("true"));
-    client.GetMainPlayer().sendQueue.clear();
-}
-
 } // namespace
 
 BOOST_FIXTURE_TEST_SUITE(GameClientTests, CustomUserMapFolderFixture)
@@ -269,46 +248,42 @@ BOOST_AUTO_TEST_CASE(ClientStoresReceivedSavegamesInSaveFolder)
 {
     rttr::test::TmpFolder testUserData;
     rttr::test::ConfigOverride userDataOverride("USERDATA", testUserData);
+    const boost::filesystem::path testMapPath =
+      rttr::test::rttrBaseDir / "tests" / "testData" / "maps" / "LuaFunctions.SWD";
+    MapInfo mapInfo;
+    mapInfo.mapData.CompressFromFile(testMapPath, &mapInfo.mapChecksum);
+    const auto mapDataSize = mapInfo.mapData.data.size();
 
     GameClient client;
     GameMessageInterface& clientMsgInterface = client;
-    MockClientInterface callbacks;
-    client.SetInterface(&callbacks);
     TestServer server;
     const auto serverPort = server.tryListen();
     BOOST_TEST_REQUIRE(serverPort >= 0);
-    const auto pw = rttr::test::randString(10);
-    const auto serverType = rttr::test::randomEnum<ServerType>();
-
-    MOCK_EXPECT(callbacks.CI_NextConnectState).with(ConnectState::ReceiveMap).once();
-    AdvanceClientToMapInfoRequest(client, clientMsgInterface, callbacks, pw, serverType, serverPort);
-
-    const boost::filesystem::path testMapPath =
-      rttr::test::rttrBaseDir / "tests" / "testData" / "maps" / "LuaFunctions.SWD";
-    MapInfo mapInfo;
-    mapInfo.mapData.CompressFromFile(testMapPath, &mapInfo.mapChecksum);
-    const auto mapDataSize = mapInfo.mapData.data.size();
 
-    clientMsgInterface.OnGameMessage(GameMessage_Map_Info("received.sav", MapType::Savegame,
-                                                          mapInfo.mapData.uncompressedLength, mapDataSize, 0, 0));
+    // Map info is ignored unless the client has reached QueryMapInfo; keep this setup minimal.
+    BOOST_TEST_REQUIRE(client.Connect("localhost", rttr::test::randString(10), rttr::test::randomEnum<ServerType>(),
+                                      serverPort, false, false));
+    clientMsgInterface.OnGameMessage(GameMessage_Player_Id(1));
+    client.GetMainPlayer().sendQueue.clear();
+    clientMsgInterface.OnGameMessage(GameMessage_Server_TypeOK(GameMessage_Server_TypeOK::StatusCode::Ok, ""));
+    client.GetMainPlayer().sendQueue.clear();
+    clientMsgInterface.OnGameMessage(GameMessage_Server_Password("true"));
+    client.GetMainPlayer().sendQueue.clear();
 
     const auto expectedSavePath = RTTRCONFIG.ExpandPath(s25::folders::save) / "received.sav";
     const auto unexpectedMapsPath = RTTRCONFIG.ExpandPath(s25::folders::mapsPlayed) / "received.sav";
     BOOST_TEST(expectedSavePath.parent_path() == testUserData / "SAVE");
     BOOST_TEST(unexpectedMapsPath.parent_path() == testUserData / "MAPS");
+
+    clientMsgInterface.OnGameMessage(
+      GameMessage_Map_Info("received.sav", MapType::Savegame, mapInfo.mapData.uncompressedLength, mapDataSize, 0, 0));
+    const auto msg = boost::dynamic_pointer_cast<GameMessage_MapRequest>(client.GetMainPlayer().sendQueue.pop());
+    BOOST_TEST_REQUIRE(msg);
+    BOOST_TEST(!msg->requestInfo);
     BOOST_TEST(client.GetMapType() == MapType::Savegame);
     BOOST_TEST(client.GetMapPath() == expectedSavePath);
-    BOOST_TEST(client.GetMapPath() != unexpectedMapsPath);
 
-    const auto transferRequest =
-      boost::dynamic_pointer_cast<GameMessage_MapRequest>(client.GetMainPlayer().sendQueue.pop());
-    BOOST_TEST_REQUIRE(transferRequest);
-    BOOST_TEST(!transferRequest->requestInfo);
-
-    MOCK_EXPECT(callbacks.CI_MapPartReceived).with(mapDataSize, mapDataSize).once();
-    MOCK_EXPECT(callbacks.CI_Error).once();
     clientMsgInterface.OnGameMessage(GameMessage_Map_Data(true, 0, mapInfo.mapData.data.data(), mapDataSize));
-
     BOOST_TEST(bfs::exists(expectedSavePath));
     BOOST_TEST(!bfs::exists(unexpectedMapsPath));
 }