From 342f67fa85df0fbd60f7ea8947d6cfbf4692fe63 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 12 Mar 2012 16:51:41 +0100 Subject: Move everything releated to testing into tests. Change-Id: I28fc488b3de03a8561888969336f2ebc62a97bb0 Reviewed-by: Tim Jenssen --- tools/fileengineclient/fileengineclient.cpp | 182 ---------------------------- tools/fileengineclient/fileengineclient.pro | 17 --- tools/fileengineserver/fileengineserver.cpp | 43 ------- tools/fileengineserver/fileengineserver.pro | 15 --- tools/tools.pro | 7 +- 5 files changed, 5 insertions(+), 259 deletions(-) delete mode 100644 tools/fileengineclient/fileengineclient.cpp delete mode 100644 tools/fileengineclient/fileengineclient.pro delete mode 100644 tools/fileengineserver/fileengineserver.cpp delete mode 100644 tools/fileengineserver/fileengineserver.pro (limited to 'tools') diff --git a/tools/fileengineclient/fileengineclient.cpp b/tools/fileengineclient/fileengineclient.cpp deleted file mode 100644 index 33f8fff53..000000000 --- a/tools/fileengineclient/fileengineclient.cpp +++ /dev/null @@ -1,182 +0,0 @@ -/************************************************************************** -** -** This file is part of Installer Framework -** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** 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. -** -** 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. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#include - -#include -#include -#include -#include - -class OutputHandler : public QObject -{ - Q_OBJECT - -public: - OutputHandler(QProcess* processWrapper, QObject *parent = 0) - : QObject (parent) - { - m_process = processWrapper; - QObject::connect(m_process, SIGNAL(readyRead()), - this, SLOT(readProcessOutput()), Qt::DirectConnection ); - } - void clearSavedOutPut() { m_savedOutPut.clear(); } - QByteArray savedOutPut() { return m_savedOutPut; } - -public slots: - void readProcessOutput() - { - Q_ASSERT(m_process); - Q_ASSERT(QThread::currentThread() == m_process->thread()); - if (QThread::currentThread() != m_process->thread()) { - qDebug() << Q_FUNC_INFO << QLatin1String(" can only be called from the same thread as the process is.") ; - } - const QByteArray output = m_process->readAll(); - if( !output.isEmpty() ) { - m_savedOutPut.append(output); - qDebug() << output; - } - } - -private: - QProcess* m_process; - QByteArray m_savedOutPut; -}; - - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - - - QString fileName(QLatin1String("give_me_some_output.bat")); - QFile file(fileName); - if (file.exists() && !file.remove()) { - qFatal( qPrintable( QString("something is wrong, can not delete: %1").arg(file.fileName()) ) ); - return -1; - } - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) - { - qFatal( qPrintable( QString("something is wrong, can not open for writing to: %1").arg(file.fileName()) ) ); - return -2; - } - - QTextStream out(&file); - out << QLatin1String("echo mega test output"); - if (!file.flush()) - { - qFatal( qPrintable( QString("something is wrong, can not write to: %1").arg(file.fileName()) ) ); - return -3; - } - file.close(); - - -//first run as a normal QProcess - QByteArray firstOutPut; - { - QProcess process; - OutputHandler outputer(&process); - - process.start(fileName); - qDebug() << "1"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - process.waitForStarted(); - qDebug() << "2"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - process.waitForFinished(); - qDebug() << "3"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - firstOutPut = outputer.savedOutPut(); - } -//first run as a normal QProcess - QByteArray secondOutPut; - { - FSEngineClientHandler::instance().enableTestMode(); - FSEngineClientHandler::instance().init(39999); - FSEngineClientHandler::instance().setActive(true); - - QProcess process; - OutputHandler outputer(&process); - - process.start(fileName); - qDebug() << "1"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - process.waitForStarted(); - qDebug() << "2"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - process.waitForFinished(); - qDebug() << "3"; - { - const QByteArray output = process.readAll(); - if( !output.isEmpty() ) { - qDebug() << output; - } - } - secondOutPut = outputer.savedOutPut(); - } - - if (firstOutPut != secondOutPut) { - qFatal( qPrintable( QString("Test failed: output is different between a normal QProcess and QProcessWrapper").arg(file.fileName()) ) ); - return -2; - } else { - qDebug() << QLatin1String("Test OK: QProcess works as expected."); - } - - return app.exec(); -} - -#include "fileengineclient.moc" diff --git a/tools/fileengineclient/fileengineclient.pro b/tools/fileengineclient/fileengineclient.pro deleted file mode 100644 index 8946813ae..000000000 --- a/tools/fileengineclient/fileengineclient.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app -DEPENDPATH += . .. ../../installerbuilder/common -INCLUDEPATH += . .. - -DESTDIR = ../../installerbuilder/bin - -CONFIG += console -CONFIG -= app_bundle - -QT += network - -include(../../installerbuilder/libinstaller/libinstaller.pri) - -# Input -SOURCES += fileengineclient.cpp - -LIBS = -L../../installerbuilder/lib -linstaller $$LIBS diff --git a/tools/fileengineserver/fileengineserver.cpp b/tools/fileengineserver/fileengineserver.cpp deleted file mode 100644 index a1e2d121c..000000000 --- a/tools/fileengineserver/fileengineserver.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/************************************************************************** -** -** This file is part of Installer Framework -** -** Copyright (c) 2011-2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** 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. -** -** 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. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ - -#include - -#include - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - FSEngineServer server(39999); - server.enableTestMode(); - return app.exec(); -} diff --git a/tools/fileengineserver/fileengineserver.pro b/tools/fileengineserver/fileengineserver.pro deleted file mode 100644 index 89cd0ffc9..000000000 --- a/tools/fileengineserver/fileengineserver.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -DEPENDPATH += . .. ../../installerbuilder/common -INCLUDEPATH += . .. - -DESTDIR = ../../installerbuilder/bin - -CONFIG += console -CONFIG -= app_bundle - -include(../../installerbuilder/libinstaller/libinstaller.pri) - -# Input -SOURCES += fileengineserver.cpp - -LIBS = -L../../installerbuilder/lib -linstaller $$LIBS diff --git a/tools/tools.pro b/tools/tools.pro index 1b7b31eef..4ec49ab01 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,5 +1,8 @@ -TEMPLATE=subdirs CONFIG += ordered -SUBDIRS += fileengineclient fileengineserver extractbinarydata +TEMPLATE = subdirs +SUBDIRS += extractbinarydata \ + maddehelper \ + repocompare \ + repogenfromonlinerepo -- cgit v1.2.3