luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Fix media overriding regression (#12602)

Browse Source
This commit is contained in:
Lars Müller
2022-07-29 10:19:36 +02:00
committed by GitHub
parent 6611d7e1ee
commit 99c8295e71
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/unittest/test_servermodmanager.cpp
View File

@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "server/mods.h"
#include "settings.h"
#include "test_config.h"
#include "util/string.h"
class TestServerModManager : public TestBase
{
@@ -190,4 +191,11 @@ void TestServerModManager::testGetModMediaPaths()
std::vector<std::string> result;
sm.getModsMediaPaths(result);
UASSERTEQ(bool, result.empty(), false);
// Test media overriding:
// unittests depends on basenodes to override default_dirt.png,
// thus the unittests texture path must come first in the returned media paths to take priority
auto it = std::find(result.begin(), result.end(), sm.getModSpec("unittests")->path + DIR_DELIM + "textures");
UASSERT(it != result.end());
UASSERT(std::find(++it, result.end(), sm.getModSpec("basenodes")->path + DIR_DELIM + "textures") != result.end());
}