Qt: Fix memleaks in tests
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 11 Jul 2016 14:47:30 +0000 (16:47 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 11 Jul 2016 14:51:58 +0000 (16:51 +0200)
* lang/qt/tests/t-keylist.cpp(cleanupTestCase): Ensure that
posted events are handled for autodeletion.
(testSingleKeylistSync): delete job.
* lang/qt/tests/t-ownertrust.cpp(cleanupTestCase): Ditto
* lang/qt/tests/t-ownertrust.cpp(testChangeOwnerTrust): Delete
keylistjobs.
* lang/qt/tests/t-keylocate.cpp(cleanupTestCase): Ditto

lang/qt/tests/t-keylist.cpp
lang/qt/tests/t-keylocate.cpp
lang/qt/tests/t-ownertrust.cpp

index 38d315f..adc997a 100644 (file)
@@ -55,6 +55,7 @@ private Q_SLOTS:
         std::vector<GpgME::Key> keys;
         GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),
                                                 false, keys);
+        delete job;
         Q_ASSERT (!result.error());
         Q_ASSERT (keys.size() == 1);
         const QString kId = QLatin1String(keys.front().keyID());
@@ -104,6 +105,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 };
 
 QTEST_MAIN(KeyListTest)
index 682f722..43aaf1c 100644 (file)
@@ -120,6 +120,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 private:
     QString mTestpattern;
 };
index 9a0c1cd..8784a79 100644 (file)
@@ -55,6 +55,7 @@ private Q_SLOTS:
         std::vector<GpgME::Key> keys;
         GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),
                                                 false, keys);
+        delete job;
         Q_ASSERT (!result.error());
         Q_ASSERT (keys.size() == 1);
         Key key = keys.front();
@@ -76,6 +77,7 @@ private Q_SLOTS:
         job = openpgp()->keyListJob(false, true, true);
         result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),
                            false, keys);
+        delete job;
         key = keys.front();
         Q_ASSERT (key.ownerTrust() == Key::Ultimate);
 
@@ -91,6 +93,8 @@ private Q_SLOTS:
         job = openpgp()->keyListJob(false, true, true);
         result = job->exec(QStringList() << QStringLiteral("alfa@example.net"),
                            false, keys);
+        delete job;
+
         key = keys.front();
         Q_ASSERT (key.ownerTrust() == Key::Unknown);
     }
@@ -100,6 +104,11 @@ private Q_SLOTS:
         const QString gpgHome = qgetenv("GNUPGHOME");
         QVERIFY2(!gpgHome.isEmpty(), "GNUPGHOME environment variable is not set.");
     }
+
+    void cleanupTestCase()
+    {
+        QCoreApplication::sendPostedEvents();
+    }
 };
 
 QTEST_MAIN(ChangeOwnerTrustTest)