From 0e7d4c92db0a0dd9c9fbd0a0705c74dc35a40e2c Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Tue, 17 Jul 2012 10:38:51 +0200
Subject: add tests without rsm for archive list/retrieve IQs

---
 tests/tests.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++--------
 tests/tests.h   |  2 ++
 2 files changed, 44 insertions(+), 8 deletions(-)

(limited to 'tests')

diff --git a/tests/tests.cpp b/tests/tests.cpp
index 9338aa3f..501ec184 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -189,9 +189,20 @@ static void serializePacket(T &packet, const QByteArray &xml)
     QCOMPARE(buffer.data(), xml);
 }
 
-void TestPackets::testArchiveList()
+void TestPackets::testArchiveList_data()
 {
-    const QByteArray xml(
+    QTest::addColumn<QByteArray>("xml");
+    QTest::addColumn<int>("max");
+
+    QTest::newRow("no rsm") <<
+        QByteArray(
+        "<iq id=\"list_1\" type=\"get\">"
+        "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+        " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\"/>"
+        "</iq>") << -1;
+
+    QTest::newRow("with rsm") <<
+        QByteArray(
         "<iq id=\"list_1\" type=\"get\">"
         "<list xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
         " start=\"1469-07-21T02:00:00Z\" end=\"1479-07-21T04:00:00Z\">"
@@ -199,7 +210,13 @@ void TestPackets::testArchiveList()
             "<max>30</max>"
             "</set>"
         "</list>"
-        "</iq>");
+        "</iq>") << 30;
+}
+
+void TestPackets::testArchiveList()
+{
+    QFETCH(QByteArray, xml);
+    QFETCH(int, max);
 
     QXmppArchiveListIq iq;
     parsePacket(iq, xml);
@@ -208,7 +225,7 @@ void TestPackets::testArchiveList()
     QCOMPARE(iq.with(), QLatin1String("juliet@capulet.com"));
     QCOMPARE(iq.start(), QDateTime(QDate(1469, 7, 21), QTime(2, 0, 0), Qt::UTC));
     QCOMPARE(iq.end(), QDateTime(QDate(1479, 7, 21), QTime(4, 0, 0), Qt::UTC));
-    QCOMPARE(iq.resultSetQuery().max(), 30);
+    QCOMPARE(iq.resultSetQuery().max(), max);
     serializePacket(iq, xml);
 }
 
@@ -264,9 +281,20 @@ void TestPackets::testArchiveRemove()
     serializePacket(iq, xml);
 }
 
-void TestPackets::testArchiveRetrieve()
+void TestPackets::testArchiveRetrieve_data()
 {
-    const QByteArray xml(
+    QTest::addColumn<QByteArray>("xml");
+    QTest::addColumn<int>("max");
+
+    QTest::newRow("no rsm") <<
+        QByteArray(
+        "<iq id=\"retrieve_1\" type=\"get\">"
+        "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
+        " start=\"1469-07-21T02:00:00Z\"/>"
+        "</iq>") << -1;
+
+    QTest::newRow("with rsm") <<
+        QByteArray(
         "<iq id=\"retrieve_1\" type=\"get\">"
         "<retrieve xmlns=\"urn:xmpp:archive\" with=\"juliet@capulet.com\""
         " start=\"1469-07-21T02:00:00Z\">"
@@ -274,7 +302,13 @@ void TestPackets::testArchiveRetrieve()
             "<max>30</max>"
             "</set>"
         "</retrieve>"
-        "</iq>");
+        "</iq>") << 30;
+}
+
+void TestPackets::testArchiveRetrieve()
+{
+    QFETCH(QByteArray, xml);
+    QFETCH(int, max);
 
     QXmppArchiveRetrieveIq iq;
     parsePacket(iq, xml);
@@ -282,7 +316,7 @@ void TestPackets::testArchiveRetrieve()
     QCOMPARE(iq.id(), QLatin1String("retrieve_1"));
     QCOMPARE(iq.with(), QLatin1String("juliet@capulet.com"));
     QCOMPARE(iq.start(), QDateTime(QDate(1469, 7, 21), QTime(2, 0, 0), Qt::UTC));
-    QCOMPARE(iq.resultSetQuery().max(), 30);
+    QCOMPARE(iq.resultSetQuery().max(), max);
     serializePacket(iq, xml);
 }
 
diff --git a/tests/tests.h b/tests/tests.h
index 6177a998..c6d67b27 100644
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -43,9 +43,11 @@ class TestPackets : public QObject
     Q_OBJECT
 
 private slots:
+    void testArchiveList_data();
     void testArchiveList();
     void testArchiveChat();
     void testArchiveRemove();
+    void testArchiveRetrieve_data();
     void testArchiveRetrieve();
     void testBindNoResource();
     void testBindResource();
-- 
cgit v1.2.3