From 83611473acf442d8e7e3fea818e2e33114451b5f Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 17 Oct 2011 14:10:53 +1000 Subject: Remove qcopchannel autotest. The QCopChannel class was removed during Qt5 refactoring. Change-Id: I62914eca1db65c680d90233ce9dad5d891890c4a Reviewed-by: Rohan McGovern --- tests/auto/other.pro | 2 - tests/auto/qcopchannel/.gitignore | 2 - tests/auto/qcopchannel/qcopchannel.pro | 7 -- tests/auto/qcopchannel/test/test.pro | 6 - tests/auto/qcopchannel/testSend/main.cpp | 68 ----------- tests/auto/qcopchannel/testSend/testSend.pro | 6 - tests/auto/qcopchannel/tst_qcopchannel.cpp | 174 --------------------------- 7 files changed, 265 deletions(-) delete mode 100644 tests/auto/qcopchannel/.gitignore delete mode 100644 tests/auto/qcopchannel/qcopchannel.pro delete mode 100644 tests/auto/qcopchannel/test/test.pro delete mode 100644 tests/auto/qcopchannel/testSend/main.cpp delete mode 100644 tests/auto/qcopchannel/testSend/testSend.pro delete mode 100644 tests/auto/qcopchannel/tst_qcopchannel.cpp (limited to 'tests/auto') diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 17a92a2e01..5848cdb755 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -12,7 +12,6 @@ SUBDIRS=\ macplist \ qaccessibility \ qcombobox \ - qcopchannel \ qdirectpainter \ qfocusevent \ qlayout \ @@ -38,7 +37,6 @@ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility macplist \ !embedded|wince*: SUBDIRS -= \ - qcopchannel \ qdirectpainter \ qmultiscreen \ diff --git a/tests/auto/qcopchannel/.gitignore b/tests/auto/qcopchannel/.gitignore deleted file mode 100644 index 8e9b6160b4..0000000000 --- a/tests/auto/qcopchannel/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -tst_qcopchannel -testSend/testSend diff --git a/tests/auto/qcopchannel/qcopchannel.pro b/tests/auto/qcopchannel/qcopchannel.pro deleted file mode 100644 index 427430f620..0000000000 --- a/tests/auto/qcopchannel/qcopchannel.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = testSend - -SUBDIRS += test - -requires(embedded) - diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro deleted file mode 100644 index 8c7cc5baaa..0000000000 --- a/tests/auto/qcopchannel/test/test.pro +++ /dev/null @@ -1,6 +0,0 @@ -load(qttest_p4) - -SOURCES += ../tst_qcopchannel.cpp -TARGET = ../tst_qcopchannel - - diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp deleted file mode 100644 index ab5a4212bc..0000000000 --- a/tests/auto/qcopchannel/testSend/main.cpp +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include -#include -#include -#include -#include - -int main(int argc, char** argv) -{ -#ifdef Q_WS_QWS - QApplication app(argc, argv); - QStringList args = app.arguments(); - if (args.count() != 3 && args.count() != 4) { - fprintf(stdout,qPrintable(QString("Usage: %1 channel message [data]").arg(args.at(0)))); - fflush(stdout); - return 1; - } - QString channelName = args.at(1); - QString msg = args.at(2); - QByteArray data; - if(args.count()==4) - data = QByteArray(args.at(3).toAscii()); - QCopChannel::send(channelName, msg, data); - QCopChannel::flush(); - fprintf(stdout,"done"); - fflush(stdout); -#endif - return 0; -} diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro deleted file mode 100644 index ebce3ddb4e..0000000000 --- a/tests/auto/qcopchannel/testSend/testSend.pro +++ /dev/null @@ -1,6 +0,0 @@ -load(qttest_p4) -SOURCES = main.cpp -TARGET = testSend - -requires(embedded) - diff --git a/tests/auto/qcopchannel/tst_qcopchannel.cpp b/tests/auto/qcopchannel/tst_qcopchannel.cpp deleted file mode 100644 index 8556295bbd..0000000000 --- a/tests/auto/qcopchannel/tst_qcopchannel.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include - -#if !defined(QT_NO_PROCESS) - -//TESTED_CLASS= -//TESTED_FILES= - -#include -#include -#include "../../shared/util.h" - -class tst_QCopChannel : public QObject -{ - Q_OBJECT - -public: - tst_QCopChannel() {} - virtual ~tst_QCopChannel() {} - -private slots: - void channel(); - void isRegistered(); - void sendreceivemp(); - void sendreceivesp(); -protected: - void testSend(const QString& channel, const QString& msg, const QByteArray& data=QByteArray()); -}; - -class tst_SendQCopProcess : public QProcess -{ - Q_OBJECT -public: - tst_SendQCopProcess( QObject* par ) - : QProcess( par ) - { - } - -signals: - void messageSent(); -}; - -void tst_QCopChannel::channel() -{ - QCopChannel channel1("channel1"); - QCOMPARE(channel1.channel(), QString("channel1")); -} - -void tst_QCopChannel::isRegistered() -{ - QVERIFY(!QCopChannel::isRegistered("foo")); - - const QString channelName("registered/channel"); - QCopChannel *channel = new QCopChannel(channelName); - QVERIFY(QCopChannel::isRegistered(channelName)); - - delete channel; - QVERIFY(!QCopChannel::isRegistered(channelName)); -} - -void tst_QCopChannel::sendreceivemp() -{ - const QString channelName("tst_QcopChannel::send()"); - QCopChannel *channel = new QCopChannel(channelName); - QSignalSpy spy(channel, SIGNAL(received(const QString&, const QByteArray&))); - - testSend("foo", "msg"); - QApplication::processEvents(); - QCOMPARE(spy.count(), 0); - - testSend(channelName, "msg", "data"); - QApplication::processEvents(); - QTRY_COMPARE(spy.count(), 1); - - QList args = spy.takeFirst(); - QCOMPARE(args.at(0).toString(), QString("msg")); - QCOMPARE(args.at(1).toByteArray(), QByteArray("data")); - - QCOMPARE(spy.count(), 0); - - delete channel; - testSend(channelName, "msg2"); - QApplication::processEvents(); - QCOMPARE(spy.count(), 0); -} - -void tst_QCopChannel::sendreceivesp() -{ - const QString channelName("tst_QcopChannel::send()"); - QCopChannel *channel = new QCopChannel(channelName); - QSignalSpy spy(channel, SIGNAL(received(const QString&, const QByteArray&))); - QCopChannel::send("foo", "msg"); - QApplication::processEvents(); - QCOMPARE(spy.count(), 0); - QCopChannel::send(channelName, "msg", "data"); - QApplication::processEvents(); - QTRY_COMPARE(spy.count(), 1); - - QList args = spy.takeFirst(); - QCOMPARE(args.at(0).toString(), QString("msg")); - QCOMPARE(args.at(1).toByteArray(), QByteArray("data")); - - QCOMPARE(spy.count(), 0); - - delete channel; - QCopChannel::send(channelName, "msg2"); - QApplication::processEvents(); - QCOMPARE(spy.count(), 0); -} - -void tst_QCopChannel::testSend( const QString& channel, const QString& msg, const QByteArray& data ) -{ - QProcess proc; - QStringList args; - args << channel << msg; - if( !data.isEmpty() ) - args << data; - proc.start( "testSend/testSend", args ); - - QTest::qWait(100); - - QVERIFY(proc.state() == QProcess::NotRunning || proc.waitForFinished()); - QCOMPARE(proc.exitStatus(), QProcess::NormalExit); - QVERIFY(proc.readAll() == "done"); // sanity check -} - -QTEST_MAIN(tst_QCopChannel) - -#include "tst_qcopchannel.moc" - -#else // Q_WS_QWS -QTEST_NOOP_MAIN -#endif -- cgit v1.2.3