[Pkg-gnupg-commit] [gpgme] 32/103: qt, tests: Don't use internal API
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Thu Dec 14 18:53:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch master
in repository gpgme.
commit b56f398eff4e3e70dea714c3174a5512dd9bcf33
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed May 10 10:18:41 2017 +0200
qt, tests: Don't use internal API
* lang/qt/tests/t-encrypt.cpp, lang/qt/tests/t-tofuinfo.cpp:
Only use exported API.
--
With the Job::Context hack we no longer need to use internal API.
---
lang/qt/tests/t-encrypt.cpp | 29 +++++++++++++++--------------
lang/qt/tests/t-tofuinfo.cpp | 7 ++++---
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index 65fe735..5bd472a 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -42,10 +42,10 @@
#include "encryptjob.h"
#include "signencryptjob.h"
#include "signingresult.h"
-#include "qgpgmeencryptjob.h"
+#include "encryptjob.h"
#include "encryptionresult.h"
#include "decryptionresult.h"
-#include "qgpgmedecryptjob.h"
+#include "decryptjob.h"
#include "qgpgmebackend.h"
#include "keylistresult.h"
#include "engineinfo.h"
@@ -106,11 +106,11 @@ private Q_SLOTS:
if (!decryptSupported()) {
return;
}
- auto ctx = Context::createForProtocol(OpenPGP);
+ auto decJob = openpgp()->decryptJob();
+ auto ctx = Job::context(decJob);
TestPassphraseProvider provider;
ctx->setPassphraseProvider(&provider);
ctx->setPinentryMode(Context::PinentryLoopback);
- auto decJob = new QGpgMEDecryptJob(ctx);
QByteArray plainText;
auto decResult = decJob->exec(cipherText, plainText);
QVERIFY(!decResult.error());
@@ -177,13 +177,13 @@ private Q_SLOTS:
if (!decryptSupported()) {
return;
}
- auto ctx = Context::createForProtocol(OpenPGP);
+ auto job = openpgp()->encryptJob();
+ auto ctx = Job::context(job);
TestPassphraseProvider provider;
ctx->setPassphraseProvider(&provider);
ctx->setPinentryMode(Context::PinentryLoopback);
ctx->setArmor(true);
ctx->setTextMode(true);
- auto job = new QGpgMEEncryptJob(ctx);
QByteArray cipherText;
auto result = job->exec(std::vector<Key>(), QStringLiteral("Hello symmetric World").toUtf8(), Context::AlwaysTrust, cipherText);
delete job;
@@ -193,10 +193,10 @@ private Q_SLOTS:
killAgent(mDir.path());
- auto ctx2 = Context::createForProtocol(OpenPGP);
+ auto decJob = openpgp()->decryptJob();
+ auto ctx2 = Job::context(decJob);
ctx2->setPassphraseProvider(&provider);
ctx2->setPinentryMode(Context::PinentryLoopback);
- auto decJob = new QGpgMEDecryptJob(ctx2);
QByteArray plainText;
auto decResult = decJob->exec(cipherText, plainText);
QVERIFY(!result.error());
@@ -238,13 +238,14 @@ private Q_SLOTS:
if (!decryptSupported()) {
return;
}
- auto ctx = Context::createForProtocol(OpenPGP);
+
+ auto decJob = openpgp()->decryptJob();
+ auto ctx = Job::context(decJob);
TestPassphraseProvider provider;
ctx->setPassphraseProvider(&provider);
ctx->setPinentryMode(Context::PinentryLoopback);
ctx->setDecryptionFlags(Context::DecryptUnwrap);
- auto decJob = new QGpgMEDecryptJob(ctx);
QByteArray plainText;
auto decResult = decJob->exec(cipherText, plainText);
@@ -282,12 +283,12 @@ private:
QVERIFY(keys.size() == 1);
delete listjob;
- auto ctx = Context::createForProtocol(OpenPGP);
+ auto job = openpgp()->encryptJob();
+ auto ctx = Job::context(job);
ctx->setPassphraseProvider(new TestPassphraseProvider);
ctx->setPinentryMode(Context::PinentryLoopback);
ctx->setArmor(true);
ctx->setTextMode(true);
- auto job = new QGpgMEEncryptJob(ctx);
QByteArray cipherText;
printf("Before exec, flags: %x\n", Context::Symmetric | Context::AlwaysTrust);
auto result = job->exec(keys, QStringLiteral("Hello symmetric World").toUtf8(),
@@ -310,11 +311,11 @@ private:
agentConf.write("allow-loopback-pinentry");
agentConf.close();
- auto ctx2 = Context::createForProtocol(OpenPGP);
+ auto decJob = openpgp()->decryptJob();
+ auto ctx2 = Job::context(decJob);
ctx2->setPassphraseProvider(new TestPassphraseProvider);
ctx2->setPinentryMode(Context::PinentryLoopback);
ctx2->setTextMode(true);
- auto decJob = new QGpgMEDecryptJob(ctx2);
QByteArray plainText;
auto decResult = decJob->exec(cipherText, plainText);
QVERIFY(!decResult.error());
diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
index 926728d..b716102 100644
--- a/lang/qt/tests/t-tofuinfo.cpp
+++ b/lang/qt/tests/t-tofuinfo.cpp
@@ -48,10 +48,11 @@
#include "importresult.h"
#include "keylistjob.h"
#include "keylistresult.h"
-#include "qgpgmesignjob.h"
+#include "signjob.h"
#include "key.h"
#include "t-support.h"
#include "engineinfo.h"
+#include "context.h"
#include <iostream>
using namespace QGpgME;
@@ -151,11 +152,11 @@ private:
void signAndVerify(const QString &what, const GpgME::Key &key, int expected)
{
- Context *ctx = Context::createForProtocol(OpenPGP);
+ auto job = openpgp()->signJob();
+ auto ctx = Job::context(job);
TestPassphraseProvider provider;
ctx->setPassphraseProvider(&provider);
ctx->setPinentryMode(Context::PinentryLoopback);
- auto *job = new QGpgMESignJob(ctx);
std::vector<Key> keys;
keys.push_back(key);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list