aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Klöcker <[email protected]>2022-01-13 10:36:35 +0000
committerIngo Klöcker <[email protected]>2022-01-13 10:36:35 +0000
commita54402fc2d1c1364843d3c88b5b07dbb7fc007d1 (patch)
tree3f0bc1f57400b8e0a122a1160e04b6bd5cb353d7
parentcpp: Add interactor to add existing subkeys to other keys (diff)
downloadgpgme-a54402fc2d1c1364843d3c88b5b07dbb7fc007d1.tar.gz
gpgme-a54402fc2d1c1364843d3c88b5b07dbb7fc007d1.zip
qt,tests: Add asyncDone signal to base class of all tests
* lang/qt/tests/t-support.h (class QGpgMETest): Add signal asyncDone. * lang/qt/tests/t-changeexpiryjob.cpp, lang/qt/tests/t-encrypt.cpp, lang/qt/tests/t-import.cpp, lang/qt/tests/t-keylist.cpp, lang/qt/tests/t-keylocate.cpp, lang/qt/tests/t-ownertrust.cpp, lang/qt/tests/t-remarks.cpp, lang/qt/tests/t-tofuinfo.cpp, lang/qt/tests/t-trustsignatures.cpp, lang/qt/tests/t-various.cpp, lang/qt/tests/t-wkdlookup.cpp, lang/qt/tests/t-wkspublish.cpp: Remove signal asyncDone from the test classes. -- This reduces duplication and makes it possible to use the signal in the base class. GnuPG-bug-id: 5770
-rw-r--r--lang/qt/tests/t-changeexpiryjob.cpp3
-rw-r--r--lang/qt/tests/t-encrypt.cpp3
-rw-r--r--lang/qt/tests/t-import.cpp3
-rw-r--r--lang/qt/tests/t-keylist.cpp3
-rw-r--r--lang/qt/tests/t-keylocate.cpp3
-rw-r--r--lang/qt/tests/t-ownertrust.cpp3
-rw-r--r--lang/qt/tests/t-remarks.cpp3
-rw-r--r--lang/qt/tests/t-support.h4
-rw-r--r--lang/qt/tests/t-tofuinfo.cpp2
-rw-r--r--lang/qt/tests/t-trustsignatures.cpp3
-rw-r--r--lang/qt/tests/t-various.cpp3
-rw-r--r--lang/qt/tests/t-wkdlookup.cpp3
-rw-r--r--lang/qt/tests/t-wkspublish.cpp3
13 files changed, 4 insertions, 35 deletions
diff --git a/lang/qt/tests/t-changeexpiryjob.cpp b/lang/qt/tests/t-changeexpiryjob.cpp
index 590a60bf..e20d1be2 100644
--- a/lang/qt/tests/t-changeexpiryjob.cpp
+++ b/lang/qt/tests/t-changeexpiryjob.cpp
@@ -52,9 +52,6 @@ class TestChangeExpiryJob: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void test_change_expiration_default_without_subkeys()
{
diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp
index 9ad10331..2249de3b 100644
--- a/lang/qt/tests/t-encrypt.cpp
+++ b/lang/qt/tests/t-encrypt.cpp
@@ -63,9 +63,6 @@ class EncryptionTest : public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testSimpleEncryptDecrypt()
diff --git a/lang/qt/tests/t-import.cpp b/lang/qt/tests/t-import.cpp
index 06786bc0..456d7d64 100644
--- a/lang/qt/tests/t-import.cpp
+++ b/lang/qt/tests/t-import.cpp
@@ -58,9 +58,6 @@ class ImportTest : public QGpgMETest
private:
QTemporaryDir tempGpgHome;
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void initTestCase()
{
diff --git a/lang/qt/tests/t-keylist.cpp b/lang/qt/tests/t-keylist.cpp
index dddcb738..e481dfea 100644
--- a/lang/qt/tests/t-keylist.cpp
+++ b/lang/qt/tests/t-keylist.cpp
@@ -57,9 +57,6 @@ class KeyListTest : public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testSingleKeyListSync()
{
diff --git a/lang/qt/tests/t-keylocate.cpp b/lang/qt/tests/t-keylocate.cpp
index 6d00da3a..d84249c2 100644
--- a/lang/qt/tests/t-keylocate.cpp
+++ b/lang/qt/tests/t-keylocate.cpp
@@ -51,9 +51,6 @@ class KeyLocateTest : public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
#ifdef DO_ONLINE_TESTS
diff --git a/lang/qt/tests/t-ownertrust.cpp b/lang/qt/tests/t-ownertrust.cpp
index 093c21e4..31d22479 100644
--- a/lang/qt/tests/t-ownertrust.cpp
+++ b/lang/qt/tests/t-ownertrust.cpp
@@ -51,9 +51,6 @@ class ChangeOwnerTrustTest: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testChangeOwnerTrust()
diff --git a/lang/qt/tests/t-remarks.cpp b/lang/qt/tests/t-remarks.cpp
index c1880a7d..bba14ce9 100644
--- a/lang/qt/tests/t-remarks.cpp
+++ b/lang/qt/tests/t-remarks.cpp
@@ -54,9 +54,6 @@ class TestRemarks: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
public:
// This test is disabled (no slot) because the behavior
// is not clearly defined. Better to prevent that
diff --git a/lang/qt/tests/t-support.h b/lang/qt/tests/t-support.h
index 8435de5b..0cff0c17 100644
--- a/lang/qt/tests/t-support.h
+++ b/lang/qt/tests/t-support.h
@@ -69,6 +69,10 @@ bool loopbackSupported();
class QGpgMETest : public QObject
{
Q_OBJECT
+
+Q_SIGNALS:
+ void asyncDone();
+
protected:
static bool doOnlineTests();
diff --git a/lang/qt/tests/t-tofuinfo.cpp b/lang/qt/tests/t-tofuinfo.cpp
index 2d881069..61543056 100644
--- a/lang/qt/tests/t-tofuinfo.cpp
+++ b/lang/qt/tests/t-tofuinfo.cpp
@@ -116,8 +116,6 @@ static const char conflictMsg2[] = "-----BEGIN PGP MESSAGE-----\n"
class TofuInfoTest: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
private:
bool testSupported()
diff --git a/lang/qt/tests/t-trustsignatures.cpp b/lang/qt/tests/t-trustsignatures.cpp
index 14f8d9a9..f908c674 100644
--- a/lang/qt/tests/t-trustsignatures.cpp
+++ b/lang/qt/tests/t-trustsignatures.cpp
@@ -52,9 +52,6 @@ class TestTrustSignatures: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void test_tsign_single_uid_key_and_then_tsign_it_again()
{
diff --git a/lang/qt/tests/t-various.cpp b/lang/qt/tests/t-various.cpp
index dca34d30..1bb490f5 100644
--- a/lang/qt/tests/t-various.cpp
+++ b/lang/qt/tests/t-various.cpp
@@ -71,9 +71,6 @@ class TestVarious: public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testDN()
{
diff --git a/lang/qt/tests/t-wkdlookup.cpp b/lang/qt/tests/t-wkdlookup.cpp
index a09591cb..5c2816cf 100644
--- a/lang/qt/tests/t-wkdlookup.cpp
+++ b/lang/qt/tests/t-wkdlookup.cpp
@@ -70,9 +70,6 @@ class WKDLookupTest : public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testWKDLookupAsync()
diff --git a/lang/qt/tests/t-wkspublish.cpp b/lang/qt/tests/t-wkspublish.cpp
index b3891945..618f0b48 100644
--- a/lang/qt/tests/t-wkspublish.cpp
+++ b/lang/qt/tests/t-wkspublish.cpp
@@ -118,9 +118,6 @@ class WKSPublishTest : public QGpgMETest
{
Q_OBJECT
-Q_SIGNALS:
- void asyncDone();
-
private Q_SLOTS:
void testUnsupported()
{