Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / unittest / test.cpp

diff --git a/src/unittest/test.cpp b/src/unittest/test.cpp
index d4841d5593598f8c6b941f5e5486930f0546ce02..4fd4b930b65f148bd77ffb46f025e6829b87760f 100644 (file)
--- a/src/unittest/test.cpp
+++ b/src/unittest/test.cpp
@@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "modchannels.h"
 #include "content/mods.h"
+#include "database/database-dummy.h"
 #include "util/numeric.h"
 #include "porting.h"
 
@@ -57,6 +58,7 @@ class TestGameDef : public IGameDef {
        scene::ISceneManager *getSceneManager() { return m_scenemgr; }
        IRollbackManager *getRollbackManager() { return m_rollbackmgr; }
        EmergeManager *getEmergeManager() { return m_emergemgr; }
+       ModMetadataDatabase *getModStorageDatabase() { return m_mod_storage_database; }
 
        scene::IAnimatedMesh *getMesh(const std::string &filename) { return NULL; }
        bool checkLocalPrivilege(const std::string &priv) { return false; }
@@ -70,7 +72,6 @@ class TestGameDef : public IGameDef {
                return testmodspec;
        }
        virtual const ModSpec* getModSpec(const std::string &modname) const { return NULL; }
-       virtual std::string getModStoragePath() const { return "."; }
        virtual bool registerModStorage(ModMetadata *meta) { return true; }
        virtual void unregisterModStorage(const std::string &name) {}
        bool joinModChannel(const std::string &channel);
@@ -91,11 +92,13 @@ class TestGameDef : public IGameDef {
        scene::ISceneManager *m_scenemgr = nullptr;
        IRollbackManager *m_rollbackmgr = nullptr;
        EmergeManager *m_emergemgr = nullptr;
+       ModMetadataDatabase *m_mod_storage_database = nullptr;
        std::unique_ptr<ModChannelMgr> m_modchannel_mgr;
 };
 
 
 TestGameDef::TestGameDef() :
+       m_mod_storage_database(new Database_Dummy()),
        m_modchannel_mgr(new ModChannelMgr())
 {
        m_itemdef = createItemDefManager();
@@ -109,6 +112,7 @@ TestGameDef::~TestGameDef()
 {
        delete m_itemdef;
        delete m_nodedef;
+       delete m_mod_storage_database;
 }