diff options
author | Andre Heinecke <[email protected]> | 2017-01-11 15:20:31 +0000 |
---|---|---|
committer | Andre Heinecke <[email protected]> | 2017-01-11 15:20:31 +0000 |
commit | 56926c9b5012e8135541a933af1d69c5a81f02b3 (patch) | |
tree | 76c854dd686084103c5d35ce4e56c95c23bb544d /lang/qt/tests/t-keylist.cpp | |
parent | qt: Add test for uid functions (diff) | |
download | gpgme-56926c9b5012e8135541a933af1d69c5a81f02b3.tar.gz gpgme-56926c9b5012e8135541a933af1d69c5a81f02b3.zip |
qt: Clean up test dirs on failure
* t-encrypt.cpp,
t-keylist.cpp,
t-keylocate.cpp,
t-ownertrust.cpp,
t-tofuinfo.cpp,
t-various.cpp,
t-verify.cpp,
t-wkspublish.cpp: Use QVERIFY instead of Q_ASSERT
Diffstat (limited to 'lang/qt/tests/t-keylist.cpp')
-rw-r--r-- | lang/qt/tests/t-keylist.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp index 2578576d..5e88a5ea 100644 --- a/lang/qt/tests/t-keylist.cpp +++ b/lang/qt/tests/t-keylist.cpp @@ -61,14 +61,14 @@ private Q_SLOTS: GpgME::KeyListResult result = job->exec(QStringList() << QStringLiteral("[email protected]"), false, keys); delete job; - Q_ASSERT (!result.error()); - Q_ASSERT (keys.size() == 1); + QVERIFY (!result.error()); + QVERIFY (keys.size() == 1); const QString kId = QLatin1String(keys.front().keyID()); - Q_ASSERT (kId == QStringLiteral("2D727CC768697734")); + QVERIFY (kId == QStringLiteral("2D727CC768697734")); - Q_ASSERT (keys[0].subkeys().size() == 2); - Q_ASSERT (keys[0].subkeys()[0].publicKeyAlgorithm() == Subkey::AlgoDSA); - Q_ASSERT (keys[0].subkeys()[1].publicKeyAlgorithm() == Subkey::AlgoELG_E); + QVERIFY (keys[0].subkeys().size() == 2); + QVERIFY (keys[0].subkeys()[0].publicKeyAlgorithm() == Subkey::AlgoDSA); + QVERIFY (keys[0].subkeys()[1].publicKeyAlgorithm() == Subkey::AlgoELG_E); } void testPubkeyAlgoAsString() @@ -87,7 +87,7 @@ private Q_SLOTS: { Subkey::AlgoUnknown, QString() } }; Q_FOREACH (Subkey::PubkeyAlgo algo, expected.keys()) { - Q_ASSERT(QString::fromUtf8(Subkey::publicKeyAlgorithmAsString(algo)) == + QVERIFY(QString::fromUtf8(Subkey::publicKeyAlgorithmAsString(algo)) == expected.value(algo)); } } @@ -97,12 +97,12 @@ private Q_SLOTS: KeyListJob *job = openpgp()->keyListJob(); connect(job, &KeyListJob::result, job, [this, job](KeyListResult, std::vector<Key> keys, QString, Error) { - Q_ASSERT(keys.size() == 1); + QVERIFY(keys.size() == 1); Q_EMIT asyncDone(); }); job->start(QStringList() << "[email protected]"); QSignalSpy spy (this, SIGNAL(asyncDone())); - Q_ASSERT(spy.wait()); + QVERIFY(spy.wait()); } }; |