From 7f87ccbec9ddcfb923d8ae9840a2c7ebe885ebe2 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Wed, 1 Apr 2020 16:46:36 +0200 Subject: tests: Fix build with Qt 5.9 QCOMPARE(QString(), "") doesn't work there. --- tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp | 6 +++--- tests/qxmpprostermanager/tst_qxmpprostermanager.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp index f45c0333..c6ac23f7 100644 --- a/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp +++ b/tests/qxmpppushenableiq/tst_qxmpppushenableiq.cpp @@ -48,8 +48,8 @@ void tst_QXmppPushEnableIq::testPushEnable() QXmppPushEnableIq iq; parsePacket(iq, xml); QCOMPARE(iq.mode(), QXmppPushEnableIq::Enable); - QCOMPARE(iq.jid(), "push-5.client.example"); - QCOMPARE(iq.node(), "yxs32uqsflafdk3iuqo"); + QCOMPARE(iq.jid(), QStringLiteral("push-5.client.example")); + QCOMPARE(iq.node(), QStringLiteral("yxs32uqsflafdk3iuqo")); serializePacket(iq, xml); @@ -73,7 +73,7 @@ void tst_QXmppPushEnableIq::testPushDisable() QXmppPushEnableIq iq; parsePacket(iq, xml); QCOMPARE(iq.mode(), QXmppPushEnableIq::Disable); - QCOMPARE(iq.jid(), "push-5.client.example"); + QCOMPARE(iq.jid(), QStringLiteral("push-5.client.example")); serializePacket(iq, xml); diff --git a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp index f8a62aa7..30feeb20 100644 --- a/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp +++ b/tests/qxmpprostermanager/tst_qxmpprostermanager.cpp @@ -84,7 +84,7 @@ void tst_QXmppRosterManager::testRenameItem() bobAsk.addItem(createItem("bob@qxmpp.org", "subscribe")); QVERIFY(manager->handleStanza(writePacketToDom(bobAsk))); - QCOMPARE(manager->getRosterEntry("bob@qxmpp.org").subscriptionStatus(), "subscribe"); + QCOMPARE(manager->getRosterEntry("bob@qxmpp.org").subscriptionStatus(), QStringLiteral("subscribe")); // rename bob bool requestSent = false; @@ -95,8 +95,8 @@ void tst_QXmppRosterManager::testRenameItem() QXmppRosterIq renameRequest; parsePacket(renameRequest, text.toUtf8()); QCOMPARE(renameRequest.items().size(), 1); - QCOMPARE(renameRequest.items().first().bareJid(), "bob@qxmpp.org"); - QCOMPARE(renameRequest.items().first().name(), "Bob"); + QCOMPARE(renameRequest.items().first().bareJid(), QStringLiteral("bob@qxmpp.org")); + QCOMPARE(renameRequest.items().first().name(), QStringLiteral("Bob")); // check that subscription state ('ask') for bob is not included QVERIFY(renameRequest.items().first().subscriptionStatus().isNull()); } -- cgit v1.2.3