refactor: extract signal spying to a top-level autotest utility.

2020-08-14 19:07:54 +02:00 · 2020-08-14 19:07:54 +02:00 · e782840847
parent fa4f6f651e
commit e782840847
22 changed files with 33 additions and 26 deletions
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@ -5,6 +5,7 @@
 #
 include_directories(BEFORE ../src)

+add_subdirectory(test-utils)
 add_subdirectory(base32)
 add_subdirectory(hmac)
 add_subdirectory(oath)
--- a/autotests/account/compute-jobs/CMakeLists.txt
+++ b/autotests/account/compute-jobs/CMakeLists.txt
@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 #

-set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib)
+set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib test_lib)

 set(compute_jobs_test_SRCS
    compute-hotp.cpp
--- a/autotests/account/compute-jobs/compute-hotp.cpp
+++ b/autotests/account/compute-jobs/compute-hotp.cpp
@ -5,7 +5,7 @@
 #include "account/actions_p.h"

 #include "../test-utils/secret.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QSignalSpy>
 #include <QTest>
--- a/autotests/account/compute-jobs/compute-totp.cpp
+++ b/autotests/account/compute-jobs/compute-totp.cpp
@ -5,7 +5,7 @@
 #include "account/actions_p.h"

 #include "../test-utils/secret.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QSignalSpy>
 #include <QTest>
--- a/autotests/account/dispatcher/CMakeLists.txt
+++ b/autotests/account/dispatcher/CMakeLists.txt
@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 #

-set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib)
+set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib test_lib)

 set(dispatcher_test_SRCS
    dispatcher-dispatch.cpp
--- a/autotests/account/file-jobs/CMakeLists.txt
+++ b/autotests/account/file-jobs/CMakeLists.txt
@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 #

-set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib secrets_test_lib)
+set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib secrets_test_lib test_lib)
 qt5_add_resources(RCC_SOURCES resources/resources.qrc)

 ecm_add_test(load-accounts.cpp ${RCC_SOURCES} LINK_LIBRARIES ${Test_DEP_LIBS} TEST_NAME load-accounts NAME_PREFIX account-jobs-)
--- a/autotests/account/file-jobs/delete-accounts.cpp
+++ b/autotests/account/file-jobs/delete-accounts.cpp
@ -5,7 +5,7 @@
 #include "account/actions_p.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QFile>
 #include <QSet>
--- a/autotests/account/file-jobs/load-accounts.cpp
+++ b/autotests/account/file-jobs/load-accounts.cpp
@ -6,8 +6,7 @@

 #include "../test-utils/output.h"
 #include "../test-utils/secret.h"
-#include "../test-utils/spy.h"
-
+#include "../../test-utils/spy.h"
 #include "../../secrets/test-utils/random.h"

 #include <QSignalSpy>
--- a/autotests/account/file-jobs/request-account-password.cpp
+++ b/autotests/account/file-jobs/request-account-password.cpp
@ -5,7 +5,7 @@
 #include "account/actions_p.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QSignalSpy>
 #include <QString>
--- a/autotests/account/file-jobs/save-hotp.cpp
+++ b/autotests/account/file-jobs/save-hotp.cpp
@ -6,8 +6,7 @@

 #include "../test-utils/output.h"
 #include "../test-utils/secret.h"
-#include "../test-utils/spy.h"
-
+#include "../../test-utils/spy.h"
 #include "../../secrets/test-utils/random.h"

 #include <QFile>
--- a/autotests/account/file-jobs/save-totp.cpp
+++ b/autotests/account/file-jobs/save-totp.cpp
@ -6,8 +6,7 @@

 #include "../test-utils/output.h"
 #include "../test-utils/secret.h"
-#include "../test-utils/spy.h"
-
+#include "../../test-utils/spy.h"
 #include "../../secrets/test-utils/random.h"

 #include <QFile>
--- a/autotests/account/keys/CMakeLists.txt
+++ b/autotests/account/keys/CMakeLists.txt
@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 #

-set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib)
+set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib test_lib)

 set(account_secret_test_SRCS
    account-secret-password-flow.cpp
--- a/autotests/account/keys/account-secret-password-flow.cpp
+++ b/autotests/account/keys/account-secret-password-flow.cpp
@ -4,7 +4,7 @@
 */
 #include "account/keys.h"

-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QSignalSpy>
 #include <QTest>
--- a/autotests/account/storage/CMakeLists.txt
+++ b/autotests/account/storage/CMakeLists.txt
@ -3,7 +3,7 @@
 # SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 #

-set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib secrets_test_lib)
+set(Test_DEP_LIBS Qt5::Core Qt5::Test account_lib account_test_lib secrets_test_lib test_lib)
 qt5_add_resources(RCC_SOURCES resources/resources.qrc)

 ecm_add_test(storage-object-lifecycles.cpp ${RCC_SOURCES} LINK_LIBRARIES ${Test_DEP_LIBS} TEST_NAME storage-object-lifecycles NAME_PREFIX account-)
--- a/autotests/account/storage/hotp-counter-update.cpp
+++ b/autotests/account/storage/hotp-counter-update.cpp
@ -5,8 +5,7 @@
 #include "account/account.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
-
+#include "../../test-utils/spy.h"
 #include "../../secrets/test-utils/random.h"

 #include <QDateTime>
--- a/autotests/account/storage/storage-aborted-lifecycle.cpp
+++ b/autotests/account/storage/storage-aborted-lifecycle.cpp
@ -5,7 +5,7 @@
 #include "account/account.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QSignalSpy>
 #include <QString>
--- a/autotests/account/storage/storage-default-lifecycle.cpp
+++ b/autotests/account/storage/storage-default-lifecycle.cpp
@ -5,7 +5,7 @@
 #include "account/account.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
+#include "../../test-utils/spy.h"

 #include <QDateTime>
 #include <QFile>
--- a/autotests/account/storage/storage-object-lifecycles.cpp
+++ b/autotests/account/storage/storage-object-lifecycles.cpp
@ -5,8 +5,7 @@
 #include "account/account.h"

 #include "../test-utils/output.h"
-#include "../test-utils/spy.h"
-
+#include "../../test-utils/spy.h"
 #include "../../secrets/test-utils/random.h"

 #include <QDateTime>
--- a/autotests/account/test-utils/CMakeLists.txt
+++ b/autotests/account/test-utils/CMakeLists.txt
@ -7,7 +7,6 @@ set(account_test_lib_SRCS
    job.cpp
    output.cpp
    secret.cpp
-    spy.cpp
 )

 add_library(account_test_lib STATIC ${account_test_lib_SRCS})
--- a/autotests/test-utils/CMakeLists.txt
+++ b/autotests/test-utils/CMakeLists.txt
@ -0,0 +1,12 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+# SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
+#
+
+set(test_lib_SRCS
+    spy.cpp
+)
+
+add_library(test_lib STATIC ${test_lib_SRCS})
+target_link_libraries(test_lib Qt5::Core Qt5::Test)
+
--- a/autotests/account/test-utils/spy.cpp
+++ b/autotests/account/test-utils/spy.cpp
@ -9,7 +9,7 @@ namespace test

    bool signal_eventually_emitted_exactly(QSignalSpy &spy, int times, int timeout)
    {
-        return (spy.count() > (times - 1) || spy.wait(timeout)) && spy.count() == times;
+        return (spy.count() >= times || spy.wait(timeout)) && spy.count() == times;
    }

    bool signal_eventually_emitted_once(QSignalSpy &spy, int timeout)
--- a/autotests/account/test-utils/spy.h
+++ b/autotests/account/test-utils/spy.h
@ -2,8 +2,8 @@
 * SPDX-License-Identifier: GPL-3.0-or-later
 * SPDX-FileCopyrightText: 2020 Johan Ouwerkerk <jm.ouwerkerk@gmail.com>
 */
-#ifndef ACCOUNTS_TEST_UTIL_SPY_H
-#define ACCOUNTS_TEST_UTIL_SPY_H
+#ifndef TEST_UTIL_SPY_H
+#define TEST_UTIL_SPY_H

 #include <QSignalSpy>