From d54ababd5f67bb621c1b3a911d0853c23df817a1 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago@kde.org>
Date: Tue, 28 Mar 2006 18:58:58 +0000
Subject: 	* test/qt/*: Sync with KDE Subversion revision 523647.        
 Update the testcases to the new API. Remove testcases for         classes
 that are no longer public or have been removed.

---
 test/qt/tst_qdbusconnection.cpp | 90 -----------------------------------------
 1 file changed, 90 deletions(-)

(limited to 'test/qt/tst_qdbusconnection.cpp')

diff --git a/test/qt/tst_qdbusconnection.cpp b/test/qt/tst_qdbusconnection.cpp
index 52fb9ff9..224a02c6 100644
--- a/test/qt/tst_qdbusconnection.cpp
+++ b/test/qt/tst_qdbusconnection.cpp
@@ -3,7 +3,6 @@
 
 #include <QtTest/QtTest>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/qdbus.h>
 
 class MyObject: public QObject
@@ -28,12 +27,6 @@ private slots:
     void send();
     void sendAsync();
     void sendSignal();
-    void requestName_data();
-    void requestName();
-    void getNameOwner_data();
-    void getNameOwner();
-    void releaseName_data();
-    void releaseName();
 
     void registerObject();
 
@@ -159,89 +152,6 @@ void tst_QDBusConnection::addConnection()
     }
 }
 
-void tst_QDBusConnection::requestName_data()
-{
-    QTest::addColumn<QString>("requestedName");
-    QTest::addColumn<int>("flags");
-    QTest::addColumn<bool>("expectedResult");
-
-    QTest::newRow("null") << QString() << (int)QDBusConnection::NoReplace << false;
-    QTest::newRow("empty") << QString("") << (int)QDBusConnection::NoReplace << false;
-    QTest::newRow("invalid") << "./invalid name" << (int)QDBusConnection::NoReplace << false;
-//    QTest::newRow("existing") << "org.freedesktop.DBus"
-//                              << (int)QDBusConnection::NoReplace << false;
-
-    QTest::newRow("ok1") << "com.trolltech.QtDBUS.tst_qdbusconnection"
-                         << (int)QDBusConnection::NoReplace << true;
-}
-
-void tst_QDBusConnection::requestName()
-{
-    QDBusConnection &con = QDBus::sessionBus();
-
-    QVERIFY(con.isConnected());
-    
-    QFETCH(QString, requestedName);
-    QFETCH(int, flags);
-    QFETCH(bool, expectedResult);
-
-    bool result = con.requestName(requestedName, (QDBusConnection::NameRequestMode)flags);
-
-//    QEXPECT_FAIL("existing", "For whatever reason, the bus lets us replace this name", Abort);
-    QCOMPARE(result, expectedResult);
-}
-
-void tst_QDBusConnection::getNameOwner_data()
-{
-    QTest::addColumn<QString>("name");
-    QTest::addColumn<QString>("expectedResult");
-
-    QTest::newRow("null") << QString() << QString();
-    QTest::newRow("empty") << QString("") << QString();
-
-    QTest::newRow("invalid") << ".invalid" << QString();
-    QTest::newRow("non-existent") << "com.trolltech.QtDBUS.foo" << QString();
-
-    QTest::newRow("bus") << "org.freedesktop.DBus" << "org.freedesktop.DBus";
-
-    QString base = QDBus::sessionBus().baseService();
-    QTest::newRow("address") << base << base;
-    QTest::newRow("self") << "com.trolltech.QtDBUS.tst_qdbusconnection" << base;
-}
-
-void tst_QDBusConnection::getNameOwner()
-{
-    QFETCH(QString, name);
-    QFETCH(QString, expectedResult);
-
-    QDBusConnection &con = QDBus::sessionBus();
-    QVERIFY(con.isConnected());
-
-    QString result = con.getNameOwner(name);
-
-    QCOMPARE(result, expectedResult);
-}
-
-void tst_QDBusConnection::releaseName_data()
-{
-    requestName_data();
-}
-
-void tst_QDBusConnection::releaseName()
-{
-    QDBusConnection &con = QDBus::sessionBus();
-
-    QVERIFY(con.isConnected());
-    
-    QFETCH(QString, requestedName);
-    //QFETCH(int, flags);
-    QFETCH(bool, expectedResult);
-
-    bool result = con.releaseName(requestedName);
-
-    QCOMPARE(result, expectedResult);
-}
-
 void tst_QDBusConnection::registerObject()
 {
     QDBusConnection &con = QDBus::sessionBus();
-- 
cgit