Changed QJsonDbWatcher to change its status to Inactive later.

QJsonDbWatcher was setting its status to Inactive before the deactivation
request was processed by the server (and hence it was possible to receive
notifications and emit notificationsAvailable() signal even though the status
== Inactive). Fixed it to deactive asynchronously so that the status changes
when the server replies to deactivation request.

Change-Id: If2940e7afb9d1cb75d0579657f6f2c95e2c50099
Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp b/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
index e1cdb47..bfe6faa 100644
--- a/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
+++ b/tests/auto/qjsondbwatcher/testqjsondbwatcher.cpp
@@ -93,6 +93,7 @@ private slots:
     void invalid();
     void privatePartition();
     void addAndRemove();
+    void removeWatcherStatus();
 };
 
 TestQJsonDbWatcher::TestQJsonDbWatcher()
@@ -821,6 +822,26 @@ void TestQJsonDbWatcher::addAndRemove()
     QVERIFY(waitForResponse(&read));
 }
 
+void TestQJsonDbWatcher::removeWatcherStatus()
+{
+    {
+        QJsonDbWatcher watcher;
+        watcher.setQuery("[?_type=\"Foo\"]");
+        QVERIFY(mConnection->addWatcher(&watcher));
+        QVERIFY(waitForStatus(&watcher, QJsonDbWatcher::Active));
+        QVERIFY(mConnection->removeWatcher(&watcher));
+        QVERIFY(waitForStatus(&watcher, QJsonDbWatcher::Inactive));
+    }
+
+    {
+        QJsonDbWatcher watcher;
+        watcher.setQuery("[?_type=\"Foo\"]");
+        QVERIFY(mConnection->addWatcher(&watcher));
+        QVERIFY(mConnection->removeWatcher(&watcher));
+        QVERIFY(waitForStatus(&watcher, QJsonDbWatcher::Inactive));
+    }
+}
+
 QTEST_MAIN(TestQJsonDbWatcher)
 
 #include "testqjsondbwatcher.moc"