diff options
Diffstat (limited to 'lang/qt/tests/t-trustsignatures.cpp')
| -rw-r--r-- | lang/qt/tests/t-trustsignatures.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/lang/qt/tests/t-trustsignatures.cpp b/lang/qt/tests/t-trustsignatures.cpp index 356b49b7..6d575dff 100644 --- a/lang/qt/tests/t-trustsignatures.cpp +++ b/lang/qt/tests/t-trustsignatures.cpp @@ -40,6 +40,7 @@ #include <gpgme++/engineinfo.h> #include "protocol.h" #include "signkeyjob.h" +#include "util.h" #include <QRegularExpression> #include <QSignalSpy> @@ -94,9 +95,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -138,9 +139,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -205,9 +206,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -249,9 +250,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -317,9 +318,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -361,9 +362,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -428,9 +429,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); @@ -473,9 +474,9 @@ private Q_SLOTS: if (err2) { if (err2.code() == GPG_ERR_GENERAL) { QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.\n" - "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(err2.asString()))); + "Hint: Run with GPGMEPP_INTERACTOR_DEBUG=stderr to debug the edit interaction.").arg(errorAsString(err2)))); } else { - QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(err2.asString()))); + QFAIL(qPrintable(QString("The SignKeyJob failed with '%1'.").arg(errorAsString(err2)))); } } }); |