CSyncSqliteTest: Fix test

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f02c9e9a59c8adf15bdcda47f4dd1279d6b29c9..116dca4cc7d8e88e0c8729b846097d284ff9e0f5 100644 (file)
--- 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 c9726d584b9cd3d749712686623e5449a44d5523..ac0f1dca1eaa4dbac258285031a2a234280f3a4c 100644 (file)
--- 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 9d526afeef1f90bab5c17d824872a736e2191470..09dc1528a467d22c23e0d4f631fa7621551ae0df 100644 (file)
--- 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"