Make storage manager test more generic

5 files changed, 26 insertions, 33 deletions

diff --git a/tests/tests.pro b/tests/tests.pro
index d31cd160..14c96710 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -19,7 +19,7 @@ SUBDIRS = \
       tst_qmail_listmodels \
       tst_qmaillog \
       tst_qcop \
-      tst_qmfstoragemanager \
+      tst_storagemanager \
       tst_qmaildisconnected \
       tst_qmailnamespace \
 
diff --git a/tests/tst_qmaillog/tst_qmaillog.cpp b/tests/tst_qmaillog/tst_qmaillog.cpp
index a2953e99..c49a822e 100644
--- a/tests/tst_qmaillog/tst_qmaillog.cpp
+++ b/tests/tst_qmaillog/tst_qmaillog.cpp
@@ -72,7 +72,7 @@ void tst_QMailLog::test_qmaillog()
 
     qMailLoggersRecreate(settings.organizationName(), settings.applicationName(), 0);
 
-    char *newmod = "NewModule";
+    char const* newmod = "NewModule";
     qmf_registerLoggingFlag(newmod); // no way to verify if it is registered
 
     QDebug dbg = QLogBase::log(newmod);
diff --git a/tests/tst_qmfstoragemanager/tst_qmfstoragemanager.pro b/tests/tst_qmfstoragemanager/tst_qmfstoragemanager.pro
deleted file mode 100644
index 2097edae..00000000
--- a/tests/tst_qmfstoragemanager/tst_qmfstoragemanager.pro
+++ /dev/null
@@ -1,15 +0,0 @@
-TEMPLATE = app
-TARGET = tst_qmfstoragemanager
-CONFIG += unitest qmfclient qtestlib
-
-QMF_STORAGEMANAGER_PATH = ../../src/plugins/contentmanagers/qmfstoragemanager
-
-SOURCES += tst_qmfstoragemanager.cpp
-INCLUDEPATH += $$QMF_STORAGEMANAGER_PATH
-
-LIBS += -L$$QMF_STORAGEMANAGER_PATH/build
-macx:LIBS += -F$$QMF_STORAGEMANAGER_PATH/build
-
-qtAddLibrary(qmfstoragemanager)
-
-include(../tests.pri)
diff --git a/tests/tst_qmfstoragemanager/tst_qmfstoragemanager.cpp b/tests/tst_storagemanager/tst_storagemanager.cpp
index d36d3a6a..42d3a70e 100644
--- a/tests/tst_qmfstoragemanager/tst_qmfstoragemanager.cpp
+++ b/tests/tst_storagemanager/tst_storagemanager.cpp
@@ -43,15 +43,15 @@
 #include <QTest>
 #include <ctype.h>
 #include "qmailstore.h"
-#include "qmfstoragemanager.h"
+#include "qmailcontentmanager.h"
 
-class tst_QmfStorageManager : public QObject
+class tst_StorageManager : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QmfStorageManager() {}
-    virtual ~tst_QmfStorageManager() {}
+    tst_StorageManager() {}
+    virtual ~tst_StorageManager() {}
 
 private slots:
     void initTestCase();
@@ -72,13 +72,12 @@ private:
 
 };
 
-QTEST_MAIN(tst_QmfStorageManager)
-
-#include "tst_qmfstoragemanager.moc"
+QTEST_MAIN(tst_StorageManager)
+#include "tst_storagemanager.moc"
 
 #define CRLF "\015\012"
 
-QMailAccountConfiguration tst_QmfStorageManager::makeConfig(const QString &accountName)
+QMailAccountConfiguration tst_StorageManager::makeConfig(const QString &accountName)
 {
     QMailAccountConfiguration config;
     config.addServiceConfiguration("imap4");
@@ -94,7 +93,7 @@ QMailAccountConfiguration tst_QmfStorageManager::makeConfig(const QString &accou
     return config;
 }
 
-void tst_QmfStorageManager::initTestCase()
+void tst_StorageManager::initTestCase()
 {
     QByteArray mime1("From: aperson@domain.example" CRLF
                 "To: bperson@domain.example" CRLF
@@ -199,7 +198,7 @@ void tst_QmfStorageManager::initTestCase()
 
 }
 
-void tst_QmfStorageManager::cleanupTestCase()
+void tst_StorageManager::cleanupTestCase()
 {
     QMailStore::instance()->removeAccounts(QMailAccountKey::customField("verified"));
     QMailStore::instance()->removeMessages(QMailMessageKey::customField("present"));
@@ -213,14 +212,14 @@ void tst_QmfStorageManager::cleanupTestCase()
 //    }
 //}
 
-void tst_QmfStorageManager::test_init()
+void tst_StorageManager::test_init()
 {
-    QmfStorageManager mgr;
+    QMailContentManager *mgr = QMailContentManagerFactory::create(QMailContentManagerFactory::defaultScheme());
 
-    QVERIFY(mgr.init());
+    QVERIFY(mgr->init());
 }
 
-void tst_QmfStorageManager::test_add()
+void tst_StorageManager::test_add()
 {
     // also tested in initTestCase()
 
@@ -247,11 +246,12 @@ void tst_QmfStorageManager::test_add()
     QVERIFY(QMailStore::instance()->addMessage(&msg3));
 }
 
-void tst_QmfStorageManager::test_remove()
+void tst_StorageManager::test_remove()
 {
 }
 
-void tst_QmfStorageManager::test_update()
+void tst_StorageManager::test_update()
 {
 
 }
+
diff --git a/tests/tst_storagemanager/tst_storagemanager.pro b/tests/tst_storagemanager/tst_storagemanager.pro
new file mode 100644
index 00000000..f7c07ff0
--- /dev/null
+++ b/tests/tst_storagemanager/tst_storagemanager.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+CONFIG += qtestlib unittest qmfclient
+TARGET = tst_storagemanager
+
+
+SOURCES += tst_storagemanager.cpp
+
+include(../tests.pri)