summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-05-11 21:29:26 +0300
committerAndrei Karas <akaras@inbox.ru>2016-05-11 21:31:10 +0300
commitb9cb3b1e94a16425025dd251955f57ca7da5f637 (patch)
tree11ea79db51f96a2fe571e9c27aa178766a247302 /src/resources
parent84cdb48df045cae55356b3d6156794c9e0343f54 (diff)
downloadmv-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.gz
mv-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.bz2
mv-b9cb3b1e94a16425025dd251955f57ca7da5f637.tar.xz
mv-b9cb3b1e94a16425025dd251955f57ca7da5f637.zip
Fix issues in tests after adding some asserts.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/db/itemdb.cpp6
-rw-r--r--src/resources/sprite/animatedsprite_unittest.cc5
2 files changed, 9 insertions, 2 deletions
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 88b104db5..934974a5b 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -299,6 +299,12 @@ void ItemDB::load()
void ItemDB::loadXmlFile(const std::string &fileName, int &tagNum)
{
+ if (fileName.empty())
+ {
+ mLoaded = true;
+ return;
+ }
+
XML::Document doc(fileName, UseResman_true, SkipError_false);
const XmlNodePtrConst rootNode = doc.rootNode();
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index 917e53c10..f9b6e65a9 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -55,8 +55,8 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
ResourceManager::init();
resourceManager->addToSearchPath("data", Append_false);
resourceManager->addToSearchPath("../data", Append_false);
- ActorSprite::load();
-
+ theme = new Theme;
+ Theme::selectSkin();
imageHelper = new SDLImageHelper();
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
@@ -65,6 +65,7 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
#else
graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif
+ ActorSprite::load();
SECTION("basic test 1")
{