aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJeremy Lainé <jeremy.laine@m4x.org>2014-07-19 10:23:40 +0200
committerJeremy Lainé <jeremy.laine@m4x.org>2014-07-19 10:23:40 +0200
commit70e7b6005de3e4a2e0237f18196825d96f4ee4d3 (patch)
tree1b017e68025534d194362a6dc206f04a2ca8f553 /tests
parent68f89992207c592cf0be8567d5c3d5e43157f9b6 (diff)
parent07ae4a63307928e1af97b75b3de23530c74beb3f (diff)
downloadqxmpp-70e7b6005de3e4a2e0237f18196825d96f4ee4d3.tar.gz
Merge branch 'master' of github.com:qxmpp-project/qxmpp
Diffstat (limited to 'tests')
-rw-r--r--tests/qxmppmessage/tst_qxmppmessage.cpp187
-rw-r--r--tests/qxmpputils/tst_qxmpputils.cpp2
-rw-r--r--tests/qxmppvcardiq/tst_qxmppvcardiq.cpp34
3 files changed, 210 insertions, 13 deletions
diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp
index 218ff962..1ec4f18b 100644
--- a/tests/qxmppmessage/tst_qxmppmessage.cpp
+++ b/tests/qxmppmessage/tst_qxmppmessage.cpp
@@ -43,6 +43,7 @@ private slots:
void testState();
void testXhtml();
void testSubextensions();
+ void testChatMarkers();
};
void tst_QXmppMessage::testBasic_data()
@@ -331,5 +332,191 @@ void tst_QXmppMessage::testSubextensions()
serializePacket(message, xml);
}
+void tst_QXmppMessage::testChatMarkers()
+{
+ const QByteArray markableXml(
+ "<message "
+ "from='northumberland@shakespeare.lit/westminster' "
+ "id='message-1' "
+ "to='ingrichard@royalty.england.lit/throne'>"
+ "<thread>sleeping</thread>"
+ "<body>My lord, dispatch; read o'er these articles.</body>"
+ "<markable xmlns='urn:xmpp:chat-markers:0'/>"
+ "</message>");
+
+ QXmppMessage markableMessage;
+ parsePacket(markableMessage, markableXml);
+ QCOMPARE(markableMessage.isMarkable(), true);
+ QCOMPARE(markableMessage.marker(), QXmppMessage::NoMarker);
+ QCOMPARE(markableMessage.id(), QString("message-1"));
+ QCOMPARE(markableMessage.markedId(), QString());
+ QCOMPARE(markableMessage.thread(), QString("sleeping"));
+ QCOMPARE(markableMessage.markedThread(), QString());
+
+ const QByteArray receivedXml(
+ "<message "
+ "from='kingrichard@royalty.england.lit/throne' "
+ "id='message-2' "
+ "to='northumberland@shakespeare.lit/westminster'>"
+ "<received xmlns='urn:xmpp:chat-markers:0' "
+ "id='message-1' "
+ "thread='sleeping'/>"
+ "</message>");
+
+ QXmppMessage receivedMessage;
+ parsePacket(receivedMessage, receivedXml);
+ QCOMPARE(receivedMessage.isMarkable(), false);
+ QCOMPARE(receivedMessage.marker(), QXmppMessage::Received);
+ QCOMPARE(receivedMessage.id(), QString("message-2"));
+ QCOMPARE(receivedMessage.markedId(), QString("message-1"));
+ QCOMPARE(receivedMessage.thread(), QString());
+ QCOMPARE(receivedMessage.markedThread(), QString("sleeping"));
+
+ const QByteArray displayedXml(
+ "<message "
+ "from='kingrichard@royalty.england.lit/throne' "
+ "id='message-2' "
+ "to='northumberland@shakespeare.lit/westminster'>"
+ "<displayed xmlns='urn:xmpp:chat-markers:0' "
+ "id='message-1' "
+ "thread='sleeping'/>"
+ "</message>");
+
+ QXmppMessage displayedMessage;
+ parsePacket(displayedMessage, displayedXml);
+ QCOMPARE(displayedMessage.isMarkable(), false);
+ QCOMPARE(displayedMessage.marker(), QXmppMessage::Displayed);
+ QCOMPARE(displayedMessage.id(), QString("message-2"));
+ QCOMPARE(displayedMessage.markedId(), QString("message-1"));
+ QCOMPARE(displayedMessage.thread(), QString());
+ QCOMPARE(displayedMessage.markedThread(), QString("sleeping"));
+
+ const QByteArray acknowledgedXml(
+ "<message "
+ "from='kingrichard@royalty.england.lit/throne' "
+ "id='message-2' "
+ "to='northumberland@shakespeare.lit/westminster'>"
+ "<acknowledged xmlns='urn:xmpp:chat-markers:0' "
+ "id='message-1' "
+ "thread='sleeping'/>"
+ "</message>");
+
+ QXmppMessage acknowledgedMessage;
+ parsePacket(acknowledgedMessage, acknowledgedXml);
+ QCOMPARE(acknowledgedMessage.isMarkable(), false);
+ QCOMPARE(acknowledgedMessage.marker(), QXmppMessage::Acknowledged);
+ QCOMPARE(acknowledgedMessage.id(), QString("message-2"));
+ QCOMPARE(acknowledgedMessage.markedId(), QString("message-1"));
+ QCOMPARE(acknowledgedMessage.thread(), QString());
+ QCOMPARE(acknowledgedMessage.markedThread(), QString("sleeping"));
+
+ const QByteArray emptyThreadXml(
+ "<message "
+ "from='kingrichard@royalty.england.lit/throne' "
+ "id='message-2' "
+ "to='northumberland@shakespeare.lit/westminster'>"
+ "<received xmlns='urn:xmpp:chat-markers:0' "
+ "id='message-1'/>"
+ "</message>");
+
+ QXmppMessage emptyThreadMessage;
+ parsePacket(emptyThreadMessage, emptyThreadXml);
+ QCOMPARE(emptyThreadMessage.isMarkable(), false);
+ QCOMPARE(emptyThreadMessage.marker(), QXmppMessage::Received);
+ QCOMPARE(emptyThreadMessage.id(), QString("message-2"));
+ QCOMPARE(emptyThreadMessage.markedId(), QString("message-1"));
+ QCOMPARE(emptyThreadMessage.thread(), QString());
+ QCOMPARE(emptyThreadMessage.markedThread(), QString());
+
+ const QByteArray notMarkableSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\"/>");
+
+ QXmppMessage serialisationMessage;
+ serialisationMessage.setFrom("kingrichard@royalty.england.lit/throne");
+ serialisationMessage.setTo("northumberland@shakespeare.lit/westminster");
+ serialisationMessage.setId("message-3");
+ serialisationMessage.setMarkable(false);
+ serializePacket(serialisationMessage, notMarkableSerialisation);
+
+ const QByteArray markableSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\">"
+ "<markable xmlns=\"urn:xmpp:chat-markers:0\"/>"
+ "</message>");
+
+ serialisationMessage.setMarkable(true);
+ serializePacket(serialisationMessage, markableSerialisation);
+
+ const QByteArray receivedSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\">"
+ "<received xmlns=\"urn:xmpp:chat-markers:0\" "
+ "id=\"message-2\"/>"
+ "</message>");
+
+ serialisationMessage.setMarkable(false);
+ serialisationMessage.setMarker(QXmppMessage::Received);
+ serialisationMessage.setMarkerId("message-2");
+ serializePacket(serialisationMessage, receivedSerialisation);
+
+ const QByteArray receivedThreadSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\">"
+ "<received xmlns=\"urn:xmpp:chat-markers:0\" "
+ "id=\"message-2\" "
+ "thread=\"sleeping\"/>"
+ "</message>");
+
+ serialisationMessage.setMarker(QXmppMessage::Received);
+ serialisationMessage.setMarkerId("message-2");
+ serialisationMessage.setMarkedThread("sleeping");
+ serializePacket(serialisationMessage, receivedThreadSerialisation);
+
+ const QByteArray displayedThreadSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\">"
+ "<displayed xmlns=\"urn:xmpp:chat-markers:0\" "
+ "id=\"message-2\" "
+ "thread=\"sleeping\"/>"
+ "</message>");
+
+ serialisationMessage.setMarker(QXmppMessage::Displayed);
+ serialisationMessage.setMarkerId("message-2");
+ serialisationMessage.setMarkedThread("sleeping");
+ serializePacket(serialisationMessage, displayedThreadSerialisation);
+
+ const QByteArray acknowledgedThreadSerialisation(
+ "<message "
+ "id=\"message-3\" "
+ "to=\"northumberland@shakespeare.lit/westminster\" "
+ "from=\"kingrichard@royalty.england.lit/throne\" "
+ "type=\"chat\">"
+ "<acknowledged xmlns=\"urn:xmpp:chat-markers:0\" "
+ "id=\"message-2\" "
+ "thread=\"sleeping\"/>"
+ "</message>");
+
+ serialisationMessage.setMarker(QXmppMessage::Acknowledged);
+ serialisationMessage.setMarkerId("message-2");
+ serialisationMessage.setMarkedThread("sleeping");
+ serializePacket(serialisationMessage, acknowledgedThreadSerialisation);
+}
+
QTEST_MAIN(tst_QXmppMessage)
#include "tst_qxmppmessage.moc"
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index d725a738..3c15938e 100644
--- a/tests/qxmpputils/tst_qxmpputils.cpp
+++ b/tests/qxmpputils/tst_qxmpputils.cpp
@@ -114,7 +114,7 @@ void tst_QXmppUtils::testMime()
void tst_QXmppUtils::testLibVersion()
{
- QCOMPARE(QXmppVersion(), QString("0.8.0"));
+ QCOMPARE(QXmppVersion(), QString("0.8.1"));
}
void tst_QXmppUtils::testTimezoneOffset()
diff --git a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
index f24c71df..5d12c1d1 100644
--- a/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
+++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
@@ -48,18 +48,19 @@ void tst_QXmppVCardIq::testAddress_data()
QTest::addColumn<QString>("postcode");
QTest::addColumn<QString>("region");
QTest::addColumn<QString>("street");
-
- QTest::newRow("none") << QByteArray("<ADR/>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << "";
- QTest::newRow("HOME") << QByteArray("<ADR><HOME/></ADR>") << int(QXmppVCardAddress::Home) << "" << "" << "" << "" << "";
- QTest::newRow("WORK") << QByteArray("<ADR><WORK/></ADR>") << int(QXmppVCardAddress::Work) << "" << "" << "" << "" << "";
- QTest::newRow("POSTAL") << QByteArray("<ADR><POSTAL/></ADR>") << int(QXmppVCardAddress::Postal) << "" << "" << "" << "" << "";
- QTest::newRow("PREF") << QByteArray("<ADR><PREF/></ADR>") << int(QXmppVCardAddress::Preferred) << "" << "" << "" << "" << "";
-
- QTest::newRow("country") << QByteArray("<ADR><CTRY>France</CTRY></ADR>") << int(QXmppVCardAddress::None) << "France" << "" << "" << "" << "";
- QTest::newRow("locality") << QByteArray("<ADR><LOCALITY>Paris</LOCALITY></ADR>") << int(QXmppVCardAddress::None) << "" << "Paris" << "" << "" << "";
- QTest::newRow("postcode") << QByteArray("<ADR><PCODE>75008</PCODE></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "75008" << "" << "";
- QTest::newRow("region") << QByteArray("<ADR><REGION>Ile de France</REGION></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "Ile de France" << "";
- QTest::newRow("street") << QByteArray("<ADR><STREET>55 rue du faubourg Saint-Honoré</STREET></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << QString::fromUtf8("55 rue du faubourg Saint-Honoré");
+ QTest::addColumn<bool>("equalsEmpty");
+
+ QTest::newRow("none") << QByteArray("<ADR/>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << "" << true;
+ QTest::newRow("HOME") << QByteArray("<ADR><HOME/></ADR>") << int(QXmppVCardAddress::Home) << "" << "" << "" << "" << "" << false;
+ QTest::newRow("WORK") << QByteArray("<ADR><WORK/></ADR>") << int(QXmppVCardAddress::Work) << "" << "" << "" << "" << "" << false;
+ QTest::newRow("POSTAL") << QByteArray("<ADR><POSTAL/></ADR>") << int(QXmppVCardAddress::Postal) << "" << "" << "" << "" << "" << false;
+ QTest::newRow("PREF") << QByteArray("<ADR><PREF/></ADR>") << int(QXmppVCardAddress::Preferred) << "" << "" << "" << "" << "" << false;
+
+ QTest::newRow("country") << QByteArray("<ADR><CTRY>France</CTRY></ADR>") << int(QXmppVCardAddress::None) << "France" << "" << "" << "" << "" << false;
+ QTest::newRow("locality") << QByteArray("<ADR><LOCALITY>Paris</LOCALITY></ADR>") << int(QXmppVCardAddress::None) << "" << "Paris" << "" << "" << "" << false;
+ QTest::newRow("postcode") << QByteArray("<ADR><PCODE>75008</PCODE></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "75008" << "" << "" << false;
+ QTest::newRow("region") << QByteArray("<ADR><REGION>Ile de France</REGION></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "Ile de France" << "" << false;
+ QTest::newRow("street") << QByteArray("<ADR><STREET>55 rue du faubourg Saint-Honoré</STREET></ADR>") << int(QXmppVCardAddress::None) << "" << "" << "" << "" << QString::fromUtf8("55 rue du faubourg Saint-Honoré") << false;
}
void tst_QXmppVCardIq::testAddress()
@@ -71,6 +72,7 @@ void tst_QXmppVCardIq::testAddress()
QFETCH(QString, postcode);
QFETCH(QString, region);
QFETCH(QString, street);
+ QFETCH(bool, equalsEmpty);
QXmppVCardAddress address;
parsePacket(address, xml);
@@ -81,6 +83,14 @@ void tst_QXmppVCardIq::testAddress()
QCOMPARE(address.region(), region);
QCOMPARE(address.street(), street);
serializePacket(address, xml);
+
+ QXmppVCardAddress addressCopy = address;
+ QVERIFY2(addressCopy == address, "QXmppVCardAddres::operator==() fails");
+ QVERIFY2(!(addressCopy != address), "QXmppVCardAddres::operator!=() fails");
+
+ QXmppVCardAddress emptyAddress;
+ QCOMPARE(emptyAddress == address, equalsEmpty);
+ QCOMPARE(emptyAddress != address, !equalsEmpty);
}
void tst_QXmppVCardIq::testEmail_data()
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-12 03:45:21 +0000