Fix unit tests

LMMS · May 4, 2017 · 2077621 · 2077621
1 parent ccd369b
commit 2077621
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/include/ConfigManager.h b/include/ConfigManager.h
@@ -74,6 +74,11 @@ class EXPORT ConfigManager
 		return m_workingDir;
 	}
 
+	const QString & sourceDir() const
+	{
+		return m_srcDir;
+	}
+
 	QString userProjectsDir() const
 	{
 		return workingDir() + PROJECTS_PATH;
@@ -253,6 +258,7 @@ class EXPORT ConfigManager
 
 	QString m_lmmsRcFile;
 	QString m_workingDir;
+	QString m_srcDir;
 	QString m_dataDir;
 	QString m_artworkDir;
 	QString m_vstDir;
@@ -275,7 +281,6 @@ class EXPORT ConfigManager
 
 
 	friend class LmmsCore;
-
 } ;
 
 #endif
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
@@ -63,7 +63,12 @@ ConfigManager::ConfigManager() :
 
 	// If we're in development (lmms is not installed) let's get the source and
 	// binary directories by reading the CMake Cache
-	QFile cmakeCache(qApp->applicationDirPath() + "/CMakeCache.txt");
+	QString appPath = qApp->applicationDirPath();
+	// If in tests, get parent directory
+	if(appPath.endsWith("/tests")) {
+		appPath = QFileInfo(appPath).dir().currentPath();
+	}
+	QFile cmakeCache(appPath + "/CMakeCache.txt");
 	if (cmakeCache.exists()) {
 		cmakeCache.open(QFile::ReadOnly);
 		QTextStream stream(&cmakeCache);
@@ -76,8 +81,8 @@ ConfigManager::ConfigManager() :
 			QString line = stream.readLine();
 
 			if (line.startsWith("lmms_SOURCE_DIR:")) {
-				QString srcDir = line.section('=', -1).trimmed();
-				QDir::addSearchPath("data", srcDir + "/data/");
+				m_srcDir = line.section('=', -1).trimmed();
+				QDir::addSearchPath("data", m_srcDir + "/data/");
 				done++;
 			}
 			if (line.startsWith("lmms_BINARY_DIR:")) {

diff --git a/tests/src/core/RelativePathsTest.cpp b/tests/src/core/RelativePathsTest.cpp
@@ -24,8 +24,11 @@
 
 #include "QTestSuite.h"
 
+#include "ConfigManager.h"
 #include "SampleBuffer.h"
 
+
+
 #include <QDir>
 
 class RelativePathsTest : QTestSuite
@@ -34,8 +37,10 @@ class RelativePathsTest : QTestSuite
 private slots:
 	void RelativePathComparisonTests()
 	{
-		QVERIFY(SampleBuffer::tryToMakeRelative(QDir::currentPath() + "/data/samples/drums/kick01.ogg") == "drums/kick01.ogg");
-		QVERIFY(SampleBuffer::tryToMakeAbsolute("drums/kick01.ogg") == QDir::currentPath() + "/data/samples/drums/kick01.ogg");
+		// Bail if we can't find the source directory
+		QVERIFY(ConfigManager::inst()->sourceDir() != nullptr);
+		QVERIFY(SampleBuffer::tryToMakeRelative(ConfigManager::inst()->sourceDir() + "/data/samples/drums/kick01.ogg") == "drums/kick01.ogg");
+		QVERIFY(SampleBuffer::tryToMakeAbsolute("drums/kick01.ogg") == ConfigManager::inst()->sourceDir() + "/data/samples/drums/kick01.ogg");
 	}
 } RelativePathTests;