From 499cfb75b818e67e997b566583058d0b37badb8e Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 6 Aug 2013 16:11:11 +0200 Subject: use dependency solver to order the installed operations - in case of single updates the order of the installed operations were wrong, now we reorder that till we are using that code for the install order aswell - added initial autotest for the dependency resolve code Task-number: QTIFW-318 Change-Id: If411a684cb02ef9e7d0316084075e86702bf839d Reviewed-by: Karsten Heimrich --- tests/auto/installer/installer.pro | 4 +- tests/auto/installer/solver/solver.pro | 5 ++ tests/auto/installer/solver/tst_solver.cpp | 134 +++++++++++++++++++++++++++++ 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 tests/auto/installer/solver/solver.pro create mode 100644 tests/auto/installer/solver/tst_solver.cpp (limited to 'tests') diff --git a/tests/auto/installer/installer.pro b/tests/auto/installer/installer.pro index f96e5f420..5873a8db8 100644 --- a/tests/auto/installer/installer.pro +++ b/tests/auto/installer/installer.pro @@ -11,4 +11,6 @@ SUBDIRS += \ scriptengine \ consumeoutputoperationtest \ mkdiroperationtest \ - copyoperationtest \ No newline at end of file + copyoperationtest \ + solver + diff --git a/tests/auto/installer/solver/solver.pro b/tests/auto/installer/solver/solver.pro new file mode 100644 index 000000000..0094bc090 --- /dev/null +++ b/tests/auto/installer/solver/solver.pro @@ -0,0 +1,5 @@ +include(../../qttest.pri) + +QT -= gui + +SOURCES += tst_solver.cpp diff --git a/tests/auto/installer/solver/tst_solver.cpp b/tests/auto/installer/solver/tst_solver.cpp new file mode 100644 index 000000000..f0596b31e --- /dev/null +++ b/tests/auto/installer/solver/tst_solver.cpp @@ -0,0 +1,134 @@ +/************************************************************************** +** +** Copyright (C) 2012-2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Installer Framework. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +**************************************************************************/ + +#include "graph.h" + +#include + +using namespace QInstaller; + +class Data { +public: + Data() {} + explicit Data(const QString &data) + : m_data(data) {} + inline uint qHash(const Data &test); + QString data() const { return m_data; } + bool operator==(const Data &rhs) const { return m_data == rhs.m_data; } + const Data &operator=(const Data &rhs) { if (this != &rhs) { m_data = rhs.m_data; } return *this; } + +private: + QString m_data; +}; +inline uint qHash(const Data &data) +{ + return qHash(data.data()); +} + + +class tst_Solver : public QObject +{ + Q_OBJECT + +private slots: + // TODO: add failing cases + void sortGraph() + { + Graph graph; + graph.addNode("Hut"); + graph.addEdge("Jacke", "Shirt"); + graph.addEdge("Guertel", "Hose"); + graph.addEdge("Guertel", "Shirt"); + graph.addEdge("Shirt", "Socken"); + graph.addEdge("Socken", "Unterwaesche"); + graph.addEdge("Shirt", "Unterwaesche"); + graph.addEdges("Hose", QStringList() << "Unterwaesche" << "Socken"); + graph.addEdges("Krawatte", QStringList() << "Shirt" << "Hose" << "Guertel"); + graph.addEdges("Schuhe", QStringList() << "Socken" << "Unterwaesche" << "Hose"); + graph.addEdges("Jacke", QStringList() << "Hose" << "Shirt" << "Guertel" << "Schuhe" << "Krawatte"); + + QList resolved = graph.sort(); + foreach (const QString &value, resolved) + qDebug(qPrintable(value)); + } + + void sortGraphReverse() + { + Graph graph; + graph.addEdge("Krawatte", "Jacke"); + graph.addEdge("Guertel", "Jacke"); + graph.addEdge("Shirt", "Guertel"); + graph.addEdges("Shirt", QList() << "Krawatte" << "Schuhe"); + graph.addEdges("Hose", QList() << "Schuhe" << "Guertel" << "Shirt"); + graph.addEdges("Socken", QList() << "Schuhe" << "Hose"); + graph.addEdges("Unterwaesche", QList() << "Socken" << "Hose" << "Guertel" << "Shirt" + << "Krawatte" << "Schuhe"); + + QList resolved = graph.sortReverse(); + foreach (const QString &value, resolved) + qDebug(qPrintable(value)); + } + + void sortGraphCycle() + { + Data a("A"), b("B"), c("C"), d("D"), e("E"); + + Graph graph; + graph.addEdge(a, b); + graph.addEdge(b, c); + graph.addEdge(c, d); + graph.addEdge(d, e); + graph.addEdge(e, a); + + QList resolved = graph.sort(); + foreach (const Data &value, resolved) + qDebug(qPrintable(value.data())); + + QPair cycle = graph.cycle(); + qDebug("Found cycle: %s", graph.hasCycle() ? "true" : "false"); + qDebug("(%s) has a indirect dependency on (%s).", qPrintable(cycle.second.data()), + qPrintable(cycle.first.data())); + } +}; + +QTEST_MAIN(tst_Solver) + +#include "tst_solver.moc" -- cgit v1.2.3