From a6789697b5c6940c27bcba78dacf61adadbcd8fb Mon Sep 17 00:00:00 2001 From: Oliver Hamlet Date: Fri, 28 Jun 2024 18:10:22 +0100 Subject: [PATCH] Update libloadorder to v17.0.0 --- CMakeLists.txt | 4 ++-- src/tests/api/interface/game_interface_test.h | 2 +- src/tests/api/internals/game/game_test.h | 11 +++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a614ab4..7605a12c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,8 +98,8 @@ else() endif() if(NOT DEFINED LIBLOADORDER_URL) - set(LIBLOADORDER_URL "https://github.com/Ortham/libloadorder/archive/16.0.0.tar.gz") - set(LIBLOADORDER_HASH "SHA256=920d1f1f52b204ef70d726d50c6c7d03ce206b5f28f642aceeb7bad578d0635c") + set(LIBLOADORDER_URL "https://github.com/Ortham/libloadorder/archive/refs/tags/17.0.0.tar.gz") + set(LIBLOADORDER_HASH "SHA256=8a495df8a20b242bb7cd5263064f0c16a1d207a3512a902188db8f68df28d4a9") endif() ExternalProject_Add(libloadorder diff --git a/src/tests/api/interface/game_interface_test.h b/src/tests/api/interface/game_interface_test.h index f56be290..d3c104b7 100644 --- a/src/tests/api/interface/game_interface_test.h +++ b/src/tests/api/interface/game_interface_test.h @@ -302,7 +302,7 @@ TEST_P(GameInterfaceTest, setLoadOrderShouldSetTheLoadOrder) { EXPECT_EQ(loadOrder, handle_->GetLoadOrder()); - if (gameSupportsEsl) { + if (gameSupportsEsl && GetParam() != GameType::starfield) { loadOrder.erase(std::begin(loadOrder)); } diff --git a/src/tests/api/internals/game/game_test.h b/src/tests/api/internals/game/game_test.h index a76a266b..e584c2f4 100644 --- a/src/tests/api/internals/game/game_test.h +++ b/src/tests/api/internals/game/game_test.h @@ -179,12 +179,19 @@ TEST_P(GameTest, game.LoadCurrentLoadOrderState(); auto loadOrder = game.GetLoadOrder(); + const auto filename = "plugin.esp"; const auto dataFilePath = - dataPath.parent_path().parent_path() / "Data" / "plugin.esp"; + dataPath.parent_path().parent_path() / "Data" / filename; std::filesystem::create_directories(dataFilePath.parent_path()); std::filesystem::copy_file(getSourcePluginsPath() / blankEsp, dataFilePath); ASSERT_TRUE(std::filesystem::exists(dataFilePath)); + if (GetParam() == GameType::starfield) { + std::filesystem::copy_file(getSourcePluginsPath() / blankEsp, + dataPath / filename); + ASSERT_TRUE(std::filesystem::exists(dataPath / filename)); + } + std::filesystem::last_write_time( dataFilePath, std::filesystem::file_time_type::clock().now() + std::chrono::hours(1)); @@ -192,7 +199,7 @@ TEST_P(GameTest, game.SetAdditionalDataPaths({dataFilePath.parent_path()}); game.LoadCurrentLoadOrderState(); - loadOrder.push_back("plugin.esp"); + loadOrder.push_back(filename); EXPECT_EQ(loadOrder, game.GetLoadOrder()); }