split vcard tests

5 files changed, 28 insertions, 44 deletions

diff --git a/tests/all/all.pro b/tests/all/all.pro
index 43ddf061..da74f3cb 100644
--- a/tests/all/all.pro
+++ b/tests/all/all.pro
@@ -13,8 +13,7 @@ SOURCES += \
     rtp.cpp \
     stanza.cpp \
     stun.cpp \
-    tests.cpp \
-    vcard.cpp
+    tests.cpp
 HEADERS += \
     dataform.h \
     jingle.h \
@@ -25,8 +24,7 @@ HEADERS += \
     rtp.h \
     stanza.h \
     stun.h \
-    tests.h \
-    vcard.h
+    tests.h
 
 !isEmpty(QXMPP_AUTOTEST_INTERNAL) {
     HEADERS += codec.h sasl.h si.h
diff --git a/tests/all/si.h b/tests/all/si.h
deleted file mode 100644
index 97e325b8..00000000
--- a/tests/all/si.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2008-2012 The QXmpp developers
- *
- * Authors:
- *  Olivier Goffart
- *  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 tst_QXmppStreamInitiationIq : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testFileInfo_data();
-    void testFileInfo();
-    void testOffer();
-    void testResult();
-};
-
diff --git a/tests/qxmppvcardiq/qxmppvcardiq.pro b/tests/qxmppvcardiq/qxmppvcardiq.pro
new file mode 100644
index 00000000..ca5081e6
--- /dev/null
+++ b/tests/qxmppvcardiq/qxmppvcardiq.pro
@@ -0,0 +1,3 @@
+include(../tests.pri)
+TARGET = tst_qxmppvcardiq
+SOURCES += tst_qxmppvcardiq.cpp
diff --git a/tests/all/vcard.cpp b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
index 350e8a7e..2041e2d7 100644
--- a/tests/all/vcard.cpp
+++ b/tests/qxmppvcardiq/tst_qxmppvcardiq.cpp
@@ -21,10 +21,23 @@
  *
  */
 
+#include <QObject>
 #include "QXmppVCardIq.h"
-
 #include "util.h"
-#include "vcard.h"
+
+class tst_QXmppVCardIq : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testAddress_data();
+    void testAddress();
+    void testEmail_data();
+    void testEmail();
+    void testPhone_data();
+    void testPhone();
+    void testVCard();
+};
 
 void tst_QXmppVCardIq::testAddress_data()
 {
@@ -185,3 +198,6 @@ void tst_QXmppVCardIq::testVCard()
     QCOMPARE(vcard.url(), QLatin1String("http://code.google.com/p/qxmpp/"));
     serializePacket(vcard, xml);
 }
+
+QTEST_MAIN(tst_QXmppVCardIq)
+#include "tst_qxmppvcardiq.moc"
diff --git a/tests/tests.pro b/tests/tests.pro
index c7f6bcb8..a2814ebe 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -4,4 +4,8 @@ SUBDIRS = \
     qxmppiq \
     qxmppmessage \
     qxmpppresence \
-    qxmppstreaminitiationiq
+    qxmppvcardiq
+
+!isEmpty(QXMPP_AUTOTEST_INTERNAL) {
+    SUBDIRS += qxmppstreaminitiationiq
+}