6 files changed, 27 insertions, 51 deletions
diff --git a/tests/all/all.pro b/tests/all/all.pro
index 978d108e..3f2c3a92 100644
--- a/tests/all/all.pro
+++ b/tests/all/all.pro
@@ -6,12 +6,10 @@ RESOURCES += tests.qrc
 SOURCES += \
     jingle.cpp \
     rpc.cpp \
-    stun.cpp \
     tests.cpp
 HEADERS += \
     jingle.h \
     rpc.h \
-    stun.h \
     tests.h
 
 !isEmpty(QXMPP_AUTOTEST_INTERNAL) {
diff --git a/tests/all/stun.h b/tests/all/stun.h
deleted file mode 100644
index 1b0141d2..00000000
--- a/tests/all/stun.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Author:
- *  Jeremy Lainé
- *
- * Source:
- *  http://code.google.com/p/qxmpp
- *
- * This file is a part of QXmpp library.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- */
-
-#include <QObject>
-
-class TestStun : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testFingerprint();
-    void testIntegrity();
-    void testIPv4Address();
-    void testIPv6Address();
-    void testXorIPv4Address();
-    void testXorIPv6Address();
-};
diff --git a/tests/all/tests.cpp b/tests/all/tests.cpp
index 7e772550..909d44de 100644
--- a/tests/all/tests.cpp
+++ b/tests/all/tests.cpp
@@ -48,7 +48,6 @@
 #include "jingle.h"
 #include "rpc.h"
 #include "sasl.h"
-#include "stun.h"
 #include "tests.h"
 #include "util.h"
 
@@ -905,9 +904,6 @@ int main(int argc, char *argv[])
     TestServer testServer;
     errors += QTest::qExec(&testServer);
 
-    TestStun testStun;
-    errors += QTest::qExec(&testStun);
-
     TestXmlRpc testXmlRpc;
     errors += QTest::qExec(&testXmlRpc);
 
diff --git a/tests/qxmppstunmessage/qxmppstunmessage.pro b/tests/qxmppstunmessage/qxmppstunmessage.pro
new file mode 100644
index 00000000..64fbbf6e
--- /dev/null
+++ b/tests/qxmppstunmessage/qxmppstunmessage.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppstunmessage
+SOURCES += tst_qxmppstunmessage.cpp
diff --git a/tests/all/stun.cpp b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp
index 8fa09d7f..34af8abe 100644
--- a/tests/all/stun.cpp
+++ b/tests/qxmppstunmessage/tst_qxmppstunmessage.cpp
@@ -21,12 +21,24 @@
  *
  */
 
+#include <QObject>
 #include "QXmppStun.h"
-
-#include "stun.h"
 #include "util.h"
 
-void TestStun::testFingerprint()
+class tst_QXmppStunMessage : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testFingerprint();
+    void testIntegrity();
+    void testIPv4Address();
+    void testIPv6Address();
+    void testXorIPv4Address();
+    void testXorIPv6Address();
+};
+
+void tst_QXmppStunMessage::testFingerprint()
 {
     // without fingerprint
     QXmppStunMessage msg;
@@ -39,7 +51,7 @@ void TestStun::testFingerprint()
              QByteArray("\x00\x01\x00\x08\x21\x12\xA4\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x28\x00\x04\xB2\xAA\xF9\xF6", 28));
 }
 
-void TestStun::testIntegrity()
+void tst_QXmppStunMessage::testIntegrity()
 {
     QXmppStunMessage msg;
     msg.setType(0x0001);
@@ -47,7 +59,7 @@ void TestStun::testIntegrity()
              QByteArray("\x00\x01\x00\x18\x21\x12\xA4\x42\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x14\x96\x4B\x40\xD1\x84\x67\x6A\xFD\xB5\xE0\x7C\xC5\x1F\xFB\xBD\xA2\x61\xAF\xB1\x26", 44));
 }
 
-void TestStun::testIPv4Address()
+void tst_QXmppStunMessage::testIPv4Address()
 {
     // encode
     QXmppStunMessage msg;
@@ -65,7 +77,7 @@ void TestStun::testIPv4Address()
     QCOMPARE(msg2.mappedPort, quint16(12345));
 }
 
-void TestStun::testIPv6Address()
+void tst_QXmppStunMessage::testIPv6Address()
 {
     // encode
     QXmppStunMessage msg;
@@ -83,7 +95,7 @@ void TestStun::testIPv6Address()
     QCOMPARE(msg2.mappedPort, quint16(12345));
 }
 
-void TestStun::testXorIPv4Address()
+void tst_QXmppStunMessage::testXorIPv4Address()
 {
     // encode
     QXmppStunMessage msg;
@@ -101,7 +113,7 @@ void TestStun::testXorIPv4Address()
     QCOMPARE(msg2.xorMappedPort, quint16(12345));
 }
 
-void TestStun::testXorIPv6Address()
+void tst_QXmppStunMessage::testXorIPv6Address()
 {
     // encode
     QXmppStunMessage msg;
@@ -118,3 +130,6 @@ void TestStun::testXorIPv6Address()
     QCOMPARE(msg2.xorMappedHost, QHostAddress("::1"));
     QCOMPARE(msg2.xorMappedPort, quint16(12345));
 }
+
+QTEST_MAIN(tst_QXmppStunMessage)
+#include "tst_qxmppstunmessage.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index ff6c99e3..aec91831 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -10,6 +10,7 @@ SUBDIRS = \
     qxmpprosteriq \
     qxmpprtppacket \
     qxmppstanza \
+    qxmppstunmessage \
     qxmppvcardiq
 
 !isEmpty(QXMPP_AUTOTEST_INTERNAL) {