From 93c35b3f1260f3dfafbc77609fcadb9a40a7b97f Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Thu, 29 Dec 2022 21:44:40 +0100 Subject: StanzaError: Remove optional getter/settters for type/condition The whole QXmppStanza::Error is now used optionally in QXmppStanza, so type and condition of the error don't need to be optionals as well. Part of #512. --- tests/qxmppstanza/tst_qxmppstanza.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/qxmppstanza/tst_qxmppstanza.cpp b/tests/qxmppstanza/tst_qxmppstanza.cpp index 5439262c..598e623d 100644 --- a/tests/qxmppstanza/tst_qxmppstanza.cpp +++ b/tests/qxmppstanza/tst_qxmppstanza.cpp @@ -389,18 +389,17 @@ void tst_QXmppStanza::testErrorRetry() void tst_QXmppStanza::testErrorEnums() { QXmppStanza::Error err; - QVERIFY(!err.conditionOpt().has_value()); - QVERIFY(!err.typeOpt().has_value()); + QCOMPARE(err.condition(), QXmppStanza::Error::NoCondition); + QCOMPARE(err.type(), QXmppStanza::Error::NoType); err.setCondition(QXmppStanza::Error::BadRequest); err.setType(QXmppStanza::Error::Cancel); - QVERIFY(err.conditionOpt().has_value()); - QVERIFY(err.typeOpt().has_value()); err.setCondition(QXmppStanza::Error::Condition(-1)); err.setType(QXmppStanza::Error::Type(-1)); - QVERIFY(!err.conditionOpt().has_value()); - QVERIFY(!err.typeOpt().has_value()); + + QCOMPARE(err.condition(), QXmppStanza::Error::NoCondition); + QCOMPARE(err.type(), QXmppStanza::Error::NoType); } void tst_QXmppStanza::testEncryption() -- cgit v1.2.3