aboutsummaryrefslogtreecommitdiff
path: root/autotests/testolmaccount.cpp
diff options
context:
space:
mode:
authorAlexey Rusakov <Kitsune-Ral@users.sf.net>2022-09-12 22:02:18 +0200
committerGitHub <noreply@github.com>2022-09-12 22:02:18 +0200
commit95d3f0607556e66666b3974486b061fc4372ede0 (patch)
treecb9d8f9c8465b11f0f4c71ea9d54eb6216be360f /autotests/testolmaccount.cpp
parent0d0a91b4438d68c833f480f45017847829bf6088 (diff)
parent79f995da07ca240c768281bf1d040eb94c07583e (diff)
downloadlibquotient-95d3f0607556e66666b3974486b061fc4372ede0.tar.gz
libquotient-95d3f0607556e66666b3974486b061fc4372ede0.zip
Merge #568: Add autotest for key verification and fix several edge-cases
Diffstat (limited to 'autotests/testolmaccount.cpp')
-rw-r--r--autotests/testolmaccount.cpp22
1 files changed, 2 insertions, 20 deletions
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index 4b32393d..280705d0 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -14,6 +14,8 @@
#include <networkaccessmanager.h>
#include <room.h>
+#include "testutils.h"
+
using namespace Quotient;
void TestOlmAccount::pickleUnpickledTest()
@@ -168,26 +170,6 @@ void TestOlmAccount::encryptedFile()
QCOMPARE(file.key.kty, "oct");
}
-#define CREATE_CONNECTION(VAR, USERNAME, SECRET, DEVICE_NAME) \
- NetworkAccessManager::instance()->ignoreSslErrors(true); \
- auto VAR = std::make_shared<Connection>(); \
- (VAR)->resolveServer("@" USERNAME ":localhost:1234"); \
- connect((VAR).get(), &Connection::loginFlowsChanged, this, [=] { \
- (VAR)->loginWithPassword((USERNAME), SECRET, DEVICE_NAME, ""); \
- }); \
- connect((VAR).get(), &Connection::networkError, [](const QString& error) { \
- QWARN(qUtf8Printable(error)); \
- QFAIL("Network error: make sure synapse is running"); \
- }); \
- connect((VAR).get(), &Connection::loginError, [](const QString& error) { \
- QWARN(qUtf8Printable(error)); \
- QFAIL("Login failed"); \
- }); \
- QSignalSpy spy##VAR((VAR).get(), &Connection::loginFlowsChanged); \
- QSignalSpy spy2##VAR((VAR).get(), &Connection::connected); \
- QVERIFY(spy##VAR.wait(10000)); \
- QVERIFY(spy2##VAR.wait(10000));
-
void TestOlmAccount::uploadIdentityKey()
{
CREATE_CONNECTION(conn, "alice1", "secret", "AlicePhone")