From 2c000f1cd113e11066422f11b32e259a64c38f9f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 27 Oct 2015 16:10:12 +0100 Subject: [PATCH] prune ioutils test this is now extensively tested inside qt itself. maintaining a second version is unnecessary effort. Change-Id: I8bbce32b53acad6df37f9c6aea18f791d5648810 Reviewed-by: Joerg Bornemann --- tests/auto/auto.pro | 1 - tests/auto/auto.qbs | 1 - tests/auto/ioutils/ioutils.pro | 5 -- tests/auto/ioutils/ioutils.qbs | 11 ---- tests/auto/ioutils/tst_ioutils.cpp | 84 ------------------------------ 5 files changed, 102 deletions(-) delete mode 100644 tests/auto/ioutils/ioutils.pro delete mode 100644 tests/auto/ioutils/ioutils.qbs delete mode 100644 tests/auto/ioutils/tst_ioutils.cpp diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index c74664f4443..6284497e4c5 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -12,7 +12,6 @@ SUBDIRS += \ generichighlighter \ profilewriter \ treeviewfind \ - ioutils \ qtcprocess \ utils \ filesearch \ diff --git a/tests/auto/auto.qbs b/tests/auto/auto.qbs index 84c6867cbba..91c6e593f88 100644 --- a/tests/auto/auto.qbs +++ b/tests/auto/auto.qbs @@ -14,7 +14,6 @@ Project { "externaltool/externaltool.qbs", "filesearch/filesearch.qbs", "generichighlighter/generichighlighter.qbs", - "ioutils/ioutils.qbs", "profilewriter/profilewriter.qbs", "qml/qml.qbs", "qtcprocess/qtcprocess.qbs", diff --git a/tests/auto/ioutils/ioutils.pro b/tests/auto/ioutils/ioutils.pro deleted file mode 100644 index a4b2b5787fa..00000000000 --- a/tests/auto/ioutils/ioutils.pro +++ /dev/null @@ -1,5 +0,0 @@ -include(../qttest.pri) - -INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared -SOURCES += tst_ioutils.cpp \ - $$IDE_SOURCE_TREE/src/shared/proparser/ioutils.cpp diff --git a/tests/auto/ioutils/ioutils.qbs b/tests/auto/ioutils/ioutils.qbs deleted file mode 100644 index 2f9f0ff3c94..00000000000 --- a/tests/auto/ioutils/ioutils.qbs +++ /dev/null @@ -1,11 +0,0 @@ -import qbs - -QtcAutotest { - name: "IoUtils autotest" - Depends { name: "Qt.core" } - files: [ - project.sharedSourcesDir + "/proparser/ioutils.cpp", - "tst_ioutils.cpp" - ] - cpp.includePaths: base.concat([project.sharedSourcesDir]) -} diff --git a/tests/auto/ioutils/tst_ioutils.cpp b/tests/auto/ioutils/tst_ioutils.cpp deleted file mode 100644 index db767c786b9..00000000000 --- a/tests/auto/ioutils/tst_ioutils.cpp +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing -** -** This file is part of Qt Creator. -** -** 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 The Qt Company. For licensing terms and -** conditions see http://www.qt.io/terms-conditions. For further information -** use the contact form at http://www.qt.io/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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include -#include - - -class tst_IoUtils : public QObject -{ - Q_OBJECT - -private slots: - void quoteArg_data(); - void quoteArg(); -}; - -void tst_IoUtils::quoteArg_data() -{ - QTest::addColumn("in"); - QTest::addColumn("out"); - - static const struct { - const char * const in; - const char * const out; - } vals[] = { -#ifdef Q_OS_WIN - { "", "\"\"" }, - { "hallo", "hallo" }, - { "hallo du", "\"hallo du\"" }, - { "hallo\\", "hallo\\" }, - { "hallo du\\", "\"hallo du\"\\" }, - { "ha\"llo", "\"ha\"\\^\"\"llo\"" }, - { "ha\\\"llo", "\"ha\"\\\\\\^\"\"llo\"" }, -#else - { "", "\"\"" }, - { "hallo", "hallo" }, - { "hallo du", "'hallo du'" }, - { "ha'llo", "'ha'\\''llo'" }, -#endif - }; - - for (unsigned i = 0; i < sizeof(vals)/sizeof(vals[0]); i++) - QTest::newRow(vals[i].in) << QString::fromLatin1(vals[i].in) - << QString::fromLatin1(vals[i].out); -} - -void tst_IoUtils::quoteArg() -{ - QFETCH(QString, in); - QFETCH(QString, out); - - QCOMPARE(QMakeInternal::IoUtils::shellQuote(in), out); -} - -QTEST_MAIN(tst_IoUtils) - -#include "tst_ioutils.moc"