Merge branch 'master' of github.com:qxmpp-project/qxmpp

4 files changed, 74 insertions, 23 deletions

diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
index 4bdb9d13..dd449726 100644
--- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
+++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
@@ -51,7 +51,9 @@ void tst_QXmppIceConnection::testBind()
     QXmppIceComponent *component = client.component(componentId);
     QVERIFY(component);
 
+    QCOMPARE(client.gatheringState(), QXmppIceConnection::NewGatheringState);
     client.bind(QXmppIceComponent::discoverAddresses());
+    QCOMPARE(client.gatheringState(), QXmppIceConnection::CompleteGatheringState);
     QCOMPARE(client.localCandidates().size(), component->localCandidates().size());
     QVERIFY(!client.localCandidates().isEmpty());
     foreach (const QXmppJingleCandidate &c, client.localCandidates()) {
@@ -80,13 +82,17 @@ void tst_QXmppIceConnection::testBindStun()
     QXmppIceComponent *component = client.component(componentId);
     QVERIFY(component);
 
+    QCOMPARE(client.gatheringState(), QXmppIceConnection::NewGatheringState);
+    client.bind(QXmppIceComponent::discoverAddresses());
+    QCOMPARE(client.gatheringState(), QXmppIceConnection::BusyGatheringState);
+
     QEventLoop loop;
-    connect(&client, SIGNAL(localCandidatesChanged()),
+    connect(&client, SIGNAL(gatheringStateChanged()),
             &loop, SLOT(quit()));
-    client.bind(QXmppIceComponent::discoverAddresses());
     loop.exec();
 
     bool foundReflexive = false;
+    QCOMPARE(client.gatheringState(), QXmppIceConnection::CompleteGatheringState);
     QCOMPARE(client.localCandidates().size(), component->localCandidates().size());
     QVERIFY(!client.localCandidates().isEmpty());
     foreach (const QXmppJingleCandidate &c, client.localCandidates()) {
@@ -101,7 +107,7 @@ void tst_QXmppIceConnection::testBindStun()
 
 void tst_QXmppIceConnection::testConnect()
 {
-    const int component = 1024;
+    const int componentId = 1024;
 
     QXmppLogger logger;
     logger.setLoggingType(QXmppLogger::StdoutLogging);
@@ -110,14 +116,14 @@ void tst_QXmppIceConnection::testConnect()
     connect(&clientL, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
             &logger, SLOT(log(QXmppLogger::MessageType,QString)));
     clientL.setIceControlling(true);
-    clientL.addComponent(component);
+    clientL.addComponent(componentId);
     clientL.bind(QXmppIceComponent::discoverAddresses());
 
     QXmppIceConnection clientR;
     connect(&clientR, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
             &logger, SLOT(log(QXmppLogger::MessageType,QString)));
     clientR.setIceControlling(false);
-    clientR.addComponent(component);
+    clientR.addComponent(componentId);
     clientR.bind(QXmppIceComponent::discoverAddresses());
 
     // exchange credentials
diff --git a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
index b7c197be..b5e9c094 100644
--- a/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
+++ b/tests/qxmppjingleiq/tst_qxmppjingleiq.cpp
@@ -34,6 +34,7 @@ private slots:
     void testContent();
     void testContentFingerprint();
     void testContentSdp();
+    void testContentSdpReflexive();
     void testContentSdpFingerprint();
     void testContentSdpParameters();
     void testSession();
@@ -209,6 +210,55 @@ void tst_QXmppJingleIq::testContentSdp()
         "a=rtpmap:103 L16/16000/2\r\n"
         "a=rtpmap:98 x-ISAC/8000\r\n"
         "a=candidate:1 1 udp 2130706431 10.0.1.1 8998 typ host generation 0\r\n"
+        "a=candidate:2 1 udp 1694498815 192.0.2.3 45664 typ host generation 0\r\n"
+        "a=ice-ufrag:8hhy\r\n"
+        "a=ice-pwd:asd88fgpdd777uzjYhagZg\r\n");
+
+    QXmppJingleIq::Content content;
+    QVERIFY(content.parseSdp(sdp));
+
+    QCOMPARE(content.descriptionMedia(), QLatin1String("audio"));
+    QCOMPARE(content.descriptionSsrc(), quint32(0));
+    QCOMPARE(content.payloadTypes().size(), 6);
+    QCOMPARE(content.payloadTypes()[0].id(), quint8(96));
+    QCOMPARE(content.payloadTypes()[1].id(), quint8(97));
+    QCOMPARE(content.payloadTypes()[2].id(), quint8(18));
+    QCOMPARE(content.payloadTypes()[3].id(), quint8(0));
+    QCOMPARE(content.payloadTypes()[4].id(), quint8(103));
+    QCOMPARE(content.payloadTypes()[5].id(), quint8(98));
+    QCOMPARE(content.transportCandidates().size(), 2);
+    QCOMPARE(content.transportCandidates()[0].component(), 1);
+    QCOMPARE(content.transportCandidates()[0].foundation(), QLatin1String("1"));
+    QCOMPARE(content.transportCandidates()[0].host(), QHostAddress("10.0.1.1"));
+    QCOMPARE(content.transportCandidates()[0].port(), quint16(8998));
+    QCOMPARE(content.transportCandidates()[0].priority(), 2130706431);
+    QCOMPARE(content.transportCandidates()[0].protocol(), QLatin1String("udp"));
+    QCOMPARE(content.transportCandidates()[0].type(), QXmppJingleCandidate::HostType);
+    QCOMPARE(content.transportCandidates()[1].component(), 1);
+    QCOMPARE(content.transportCandidates()[1].foundation(), QLatin1String("2"));
+    QCOMPARE(content.transportCandidates()[1].host(), QHostAddress("192.0.2.3"));
+    QCOMPARE(content.transportCandidates()[1].port(), quint16(45664));
+    QCOMPARE(content.transportCandidates()[1].priority(), 1694498815);
+    QCOMPARE(content.transportCandidates()[1].protocol(), QLatin1String("udp"));
+    QCOMPARE(content.transportCandidates()[1].type(), QXmppJingleCandidate::HostType);
+    QCOMPARE(content.transportUser(), QLatin1String("8hhy"));
+    QCOMPARE(content.transportPassword(), QLatin1String("asd88fgpdd777uzjYhagZg"));
+
+    QCOMPARE(content.toSdp(), sdp);
+}
+
+void tst_QXmppJingleIq::testContentSdpReflexive()
+{
+    const QString sdp(
+        "m=audio 45664 RTP/AVP 96 97 18 0 103 98\r\n"
+        "c=IN IP4 192.0.2.3\r\n"
+        "a=rtpmap:96 speex/16000\r\n"
+        "a=rtpmap:97 speex/8000\r\n"
+        "a=rtpmap:18 G729/0\r\n"
+        "a=rtpmap:0 PCMU/0\r\n"
+        "a=rtpmap:103 L16/16000/2\r\n"
+        "a=rtpmap:98 x-ISAC/8000\r\n"
+        "a=candidate:1 1 udp 2130706431 10.0.1.1 8998 typ host generation 0\r\n"
         "a=candidate:2 1 udp 1694498815 192.0.2.3 45664 typ srflx generation 0\r\n"
         "a=ice-ufrag:8hhy\r\n"
         "a=ice-pwd:asd88fgpdd777uzjYhagZg\r\n");
@@ -344,8 +394,9 @@ void tst_QXmppJingleIq::testSession()
     QCOMPARE(session.action(), QXmppJingleIq::SessionInitiate);
     QCOMPARE(session.initiator(), QLatin1String("romeo@montague.lit/orchard"));
     QCOMPARE(session.sid(), QLatin1String("a73sjjvkla37jfea"));
-    QCOMPARE(session.content().creator(), QLatin1String("initiator"));
-    QCOMPARE(session.content().name(), QLatin1String("this-is-a-stub"));
+    QCOMPARE(session.contents().size(), 1);
+    QCOMPARE(session.contents()[0].creator(), QLatin1String("initiator"));
+    QCOMPARE(session.contents()[0].name(), QLatin1String("this-is-a-stub"));
     QCOMPARE(session.reason().text(), QString());
     QCOMPARE(session.reason().type(), QXmppJingleIq::Reason::None);
     serializePacket(session, xml);
diff --git a/tests/qxmpputils/tst_qxmpputils.cpp b/tests/qxmpputils/tst_qxmpputils.cpp
index 61d2a5dc..55314823 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.9.0"));
+    QCOMPARE(QXmppVersion(), QString("0.9.2"));
 }
 
 void tst_QXmppUtils::testTimezoneOffset()
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index 64a7a730..2f51f4de 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-QMAKE_ARGS="QXMPP_PROFILE=true"
+QMAKE_ARGS=""
 
 if [ -n "$CC" ]; then
     QMAKE_ARGS="$QMAKE_ARGS QMAKE_CC=$CC"
@@ -14,12 +14,18 @@ fi
 
 case "$CONFIG" in
 full*)
-    QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1"
+    QMAKE_ARGS="$QMAKE_ARGS QXMPP_USE_DOXYGEN=1 QXMPP_USE_OPUS=1 QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1 QXMPP_USE_VPX=1"
     ;;
 esac
 
 case "$CONFIG" in
-*static)
+*debug*)
+    QMAKE_ARGS="$QMAKE_ARGS CONFIG+=debug"
+    ;;
+esac
+
+case "$CONFIG" in
+*static*)
     QMAKE_ARGS="$QMAKE_ARGS QXMPP_LIBRARY_TYPE=staticlib"
     ;;
 esac
@@ -30,15 +36,3 @@ make VERBOSE=1
 
 # run tests
 make check
-exit 0
-
-# generate coverage report
-TRACEFILE=coverage.info
-rm -f $TRACEFILE
-lcov --capture --directory src -o $TRACEFILE --no-external
-lcov --remove $TRACEFILE \*moc_\* -o $TRACEFILE.clean
-mv $TRACEFILE.clean $TRACEFILE
-
-rm -rf coverage
-genhtml -o coverage $TRACEFILE
-echo "ok"