From 092e7cc68de3d4e46505a2931ce266b4e5aabaab Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Thu, 26 Jun 2014 22:14:30 +0200
Subject: Fixed tests

---
 src/app/gamedata.cpp       | 20 ++++++++++++++++++--
 test/unit/ui/edit_test.cpp | 20 +++++++++++++-------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/app/gamedata.cpp b/src/app/gamedata.cpp
index 05c0242..ceeb7b3 100644
--- a/src/app/gamedata.cpp
+++ b/src/app/gamedata.cpp
@@ -101,9 +101,25 @@ std::string CGameData::GetFilePath(DataDir dir, const std::string& subpath)
         }
     }
     
-    GetLogger()->Error("file subpath error\n");
+    if(m_dataDirs.size() > 0) {
+        std::stringstream str;
+        if ( subpath.find("save") == std::string::npos ){ // if its NOT a path to a savefile screenshot
+            str << m_dataDirs[0];
+            str << "/";
+            str << m_standardDataDirs[index];
+            
+            if (dir == DIR_HELP)
+            {
+                str << "/";
+                str << CApplication::GetInstancePointer()->GetLanguageChar();
+            }
+            str << "/";
+        }
+        str << subpath;
+        return str.str();
+    }
     
-    return "";
+    return subpath;
 }
 
 std::string CGameData::GetDataPath(const std::string &subpath)
diff --git a/test/unit/ui/edit_test.cpp b/test/unit/ui/edit_test.cpp
index 4a4063e..34af013 100644
--- a/test/unit/ui/edit_test.cpp
+++ b/test/unit/ui/edit_test.cpp
@@ -1,4 +1,5 @@
 #include "app/app.h"
+#include "app/gamedata.h"
 
 #include "ui/edit.h"
 
@@ -14,6 +15,7 @@ class CEditTest : public testing::Test
 public:
     CEditTest()
      : m_robotMain(nullptr)
+     , m_gameData(nullptr)
      , m_engine(nullptr)
      , m_edit(nullptr)
     {}
@@ -21,21 +23,24 @@ public:
     virtual void SetUp()
     {
         m_robotMain = new CRobotMain(&m_app, false);
-
+        
+        m_gameData = new CGameData();
+        
         m_engine = new Gfx::CEngine(nullptr);
-
+        
         m_edit = new Ui::CEdit;
     }
 
     virtual void TearDown()
     {
-        delete m_robotMain;
-        m_robotMain = nullptr;
-        delete m_engine;
-        m_engine = nullptr;
         delete m_edit;
         m_edit = nullptr;
-
+        delete m_engine;
+        m_engine = nullptr;
+        delete m_gameData;
+        m_gameData = nullptr;
+        delete m_robotMain;
+        m_robotMain = nullptr;
     }
     virtual ~CEditTest()
     {
@@ -45,6 +50,7 @@ public:
 protected:
     CApplication m_app;
     CRobotMain* m_robotMain;
+    CGameData * m_gameData;
     Gfx::CEngine * m_engine;
     Ui::CEdit * m_edit;
     CLogger m_logger;
-- 
cgit v1.2.3-1-g7c22