From: Markus Goetz <markus@woboq.com>
Date: Thu, 22 Jun 2017 13:11:27 +0000 (+0200)
Subject: CSyncSqliteTest: Fix test
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~710^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1e98ba27c65defc9d626c1249381ccb92122e43e;p=nextcloud-desktop.git

CSyncSqliteTest: Fix test
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f02c9e9a..116dca4cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,8 +182,6 @@ endif()
 
 configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
-configure_file(test/test_journal.db "${CMAKE_BINARY_DIR}/test/test_journal.db" COPYONLY)
-
 include(OwnCloudCPack.cmake)
 
 add_definitions(-DUNICODE)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c9726d584..ac0f1dca1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -59,3 +59,4 @@ list(APPEND FolderMan_SRC ${FolderWatcher_SRC})
 list(APPEND FolderMan_SRC stub.cpp )
 owncloud_add_test(FolderMan "${FolderMan_SRC}")
 
+configure_file(test_journal.db "${PROJECT_BINARY_DIR}/bin/test_journal.db" COPYONLY)
diff --git a/test/testcsyncsqlite.cpp b/test/testcsyncsqlite.cpp
index 9d526afee..09dc1528a 100644
--- a/test/testcsyncsqlite.cpp
+++ b/test/testcsyncsqlite.cpp
@@ -21,10 +21,11 @@ private slots:
 
         memset(&_ctx, 0, sizeof(CSYNC));
 
-        _ctx.statedb.file = c_strdup("./test_journal.db");
+        QString db = QCoreApplication::applicationDirPath() + "/test_journal.db";
+        _ctx.statedb.file = c_strdup(db.toLocal8Bit());
 
         rc = csync_statedb_load((CSYNC*)(&_ctx), _ctx.statedb.file, &(_ctx.statedb.db));
-        Q_ASSERT(rc == 0);
+        QVERIFY(rc == 0);
     }
 
     void testFullResult() {
@@ -85,5 +86,5 @@ private slots:
 
 };
 
-QTEST_APPLESS_MAIN(TestCSyncSqlite)
+QTEST_GUILESS_MAIN(TestCSyncSqlite)
 #include "testcsyncsqlite.moc"