Fixing the cdb removing bug + enable test.-

2 files changed, 7 insertions, 9 deletions

diff --git a/libcontextsubscriber/src/infocdbbackend.cpp b/libcontextsubscriber/src/infocdbbackend.cpp
index 933dfdff..b35a9ed8 100644
--- a/libcontextsubscriber/src/infocdbbackend.cpp
+++ b/libcontextsubscriber/src/infocdbbackend.cpp
@@ -125,10 +125,10 @@ QString InfoCdbBackend::databaseDirectory()
 void InfoCdbBackend::watch()
 {
     if (! watcher.directories().contains(InfoCdbBackend::databaseDirectory()) &&
-        QDir.exists(InfoCdbBackend::databaseDirectory()))
+        QDir(InfoCdbBackend::databaseDirectory()).exists(InfoCdbBackend::databaseDirectory()))
         watcher.addPath(InfoCdbBackend::databaseDirectory());
     if (! watcher.files().contains(InfoCdbBackend::databasePath()) &&
-        QFile.exists(InfoCdbBackend::databasePath()))
+        QFile::exists(InfoCdbBackend::databasePath()))
         watcher.addPath(InfoCdbBackend::databasePath());
 }
 
@@ -167,10 +167,8 @@ void InfoCdbBackend::onDatabaseFileChanged(const QString &path)
 /// directory only when we don't have the cache.db in the first place.
 void InfoCdbBackend::onDatabaseDirectoryChanged(const QString &path)
 {
-    if (reader.isReadable())
-        return;
-
-    onDatabaseFileChanged(path);
+    if (reader.isReadable() != QFile::exists(InfoCdbBackend::databasePath()))
+        onDatabaseFileChanged(path);
 }
 
 const QList<ContextProviderInfo> InfoCdbBackend::providersForKey(QString key) const
diff --git a/libcontextsubscriber/unit-tests/infocdbbackend/infocdbbackendunittest.cpp b/libcontextsubscriber/unit-tests/infocdbbackend/infocdbbackendunittest.cpp
index 0a2108c3..2152bdce 100644
--- a/libcontextsubscriber/unit-tests/infocdbbackend/infocdbbackendunittest.cpp
+++ b/libcontextsubscriber/unit-tests/infocdbbackend/infocdbbackendunittest.cpp
@@ -247,9 +247,9 @@ void InfoCdbBackendUnitTest::removed()
 
     QTest::qWait(DEFAULT_WAIT_PERIOD);
 
-    //QCOMPARE(spy.count(), 1);
-    //QList<QVariant> args = spy.takeFirst();
-    //QCOMPARE(args.at(0).toList().size(), 2);
+    QCOMPARE(spy.count(), 1);
+    QList<QVariant> args = spy.takeFirst();
+    QCOMPARE(args.at(0).toList().size(), 2);
 
     backend->disconnectNotify("-"); // Fake it. Spy does something fishy here.
 }