diff options
| author | Linus Jahn <lnj@kaidan.im> | 2020-02-04 14:39:32 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-02-04 15:44:30 +0100 |
| commit | 0fef0133420602883b4ace1ae54172870d01a21f (patch) | |
| tree | 1cdac2203866ee67d27143d2d2055f8874b447c6 /tests | |
| parent | 4505076236f9f37d7e6373e3910372319c4be637 (diff) | |
| download | qxmpp-0fef0133420602883b4ace1ae54172870d01a21f.tar.gz | |
Refactor QXmppRegisterIq: Replace registerType by two separate attr.
This can be done without any concerns, because the registerType was not
part of any release yet.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qxmppregisteriq/tst_qxmppregisteriq.cpp | 11 | ||||
| -rw-r--r-- | tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp index 0ea2914e..38a6bb77 100644 --- a/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp +++ b/tests/qxmppregisteriq/tst_qxmppregisteriq.cpp @@ -61,7 +61,8 @@ void tst_QXmppRegisterIq::testGet() QCOMPARE(iq.from(), QString()); QCOMPARE(iq.type(), QXmppIq::Get); QCOMPARE(iq.instructions(), QString()); - QCOMPARE(iq.registerType(), QXmppRegisterIq::None); + QVERIFY(!iq.isRegistered()); + QVERIFY(!iq.isRemove()); QVERIFY(iq.username().isNull()); QVERIFY(iq.password().isNull()); QVERIFY(iq.email().isNull()); @@ -310,14 +311,14 @@ void tst_QXmppRegisterIq::testRegistered() QXmppRegisterIq iq; parsePacket(iq, xml); - QCOMPARE(iq.registerType(), QXmppRegisterIq::Registered); + QVERIFY(iq.isRegistered()); QCOMPARE(iq.username(), QStringLiteral("juliet")); serializePacket(iq, xml); iq = QXmppRegisterIq(); iq.setId(QStringLiteral("")); iq.setType(QXmppIq::Result); - iq.setRegisterType(QXmppRegisterIq::Registered); + iq.setIsRegistered(true); iq.setUsername(QStringLiteral("juliet")); serializePacket(iq, xml); } @@ -334,14 +335,14 @@ void tst_QXmppRegisterIq::testRemove() QXmppRegisterIq iq; parsePacket(iq, xml); - QCOMPARE(iq.registerType(), QXmppRegisterIq::Remove); + QVERIFY(iq.isRemove()); QCOMPARE(iq.username(), QStringLiteral("juliet")); serializePacket(iq, xml); iq = QXmppRegisterIq(); iq.setId(QStringLiteral("")); iq.setType(QXmppIq::Result); - iq.setRegisterType(QXmppRegisterIq::Remove); + iq.setIsRemove(true); iq.setUsername(QStringLiteral("juliet")); serializePacket(iq, xml); } diff --git a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp index 812c77d0..6f180341 100644 --- a/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp +++ b/tests/qxmppregistrationmanager/tst_qxmppregistrationmanager.cpp @@ -147,7 +147,7 @@ void tst_QXmppRegistrationManager::testDeleteAccount() // to address must be the server or empty QVERIFY(iq.to() == QStringLiteral("example.org") || iq.to().isEmpty()); QCOMPARE(iq.type(), QXmppIq::Set); - QCOMPARE(iq.registerType(), QXmppRegisterIq::Remove); + QVERIFY(iq.isRemove()); delete context; // disconnects lambda }); |