From 43dd58eba3fcd72b88e6ac0d928aea0d2024a863 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Oct 2011 10:59:56 +1000 Subject: [PATCH] Remove QtMD5 autotest. This test is only valid with obsolete Qt Solutions packages. Any Qt Solutions that are still of value need to be rewritten as Qt5 addons and will be delivered with their own unit tests. Change-Id: I099ef816655cc7de13715f5a4e5f4a06099df2d5 Reviewed-by: Rohan McGovern --- tests/auto/other/other.pro | 1 - tests/auto/other/qtmd5/.gitignore | 1 - tests/auto/other/qtmd5/qtmd5.pro | 15 ------- tests/auto/other/qtmd5/tst_qtmd5.cpp | 84 ------------------------------------ tests/auto/solutions.pri | 16 ------- 5 files changed, 117 deletions(-) delete mode 100644 tests/auto/other/qtmd5/.gitignore delete mode 100644 tests/auto/other/qtmd5/qtmd5.pro delete mode 100644 tests/auto/other/qtmd5/tst_qtmd5.cpp delete mode 100644 tests/auto/solutions.pri diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro index 9f07100..0224bb4 100644 --- a/tests/auto/other/other.pro +++ b/tests/auto/other/other.pro @@ -4,7 +4,6 @@ SUBDIRS=\ baselineexample \ compiler \ headersclean \ - qtmd5 \ qtokenautomaton \ cross_compile: SUBDIRS -= \ diff --git a/tests/auto/other/qtmd5/.gitignore b/tests/auto/other/qtmd5/.gitignore deleted file mode 100644 index 6028bec..0000000 --- a/tests/auto/other/qtmd5/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qtmd5 diff --git a/tests/auto/other/qtmd5/qtmd5.pro b/tests/auto/other/qtmd5/qtmd5.pro deleted file mode 100644 index 6973c9e..0000000 --- a/tests/auto/other/qtmd5/qtmd5.pro +++ /dev/null @@ -1,15 +0,0 @@ -include(../../solutions.pri) - -!contains(DEFINES, QT_NO_SOLUTIONS) { - include($${SOLUTIONBASEDIR}/utils/qtmd5/src/qtmd5.pri) -} - -load(qttest_p4) - -SOURCES += tst_qtmd5.cpp - - -QT = core - - -CONFIG += parallel_test diff --git a/tests/auto/other/qtmd5/tst_qtmd5.cpp b/tests/auto/other/qtmd5/tst_qtmd5.cpp deleted file mode 100644 index 8c87ba7..0000000 --- a/tests/auto/other/qtmd5/tst_qtmd5.cpp +++ /dev/null @@ -1,84 +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 - -#ifdef QT_NO_SOLUTIONS -QTEST_NOOP_MAIN -#else - -#include "qtmd5.h" - -class tst_QtMD5: public QObject -{ - Q_OBJECT - -private slots: - void computeMD5_data(); - void computeMD5(); -}; - -void tst_QtMD5::computeMD5_data() -{ - QTest::addColumn("data"); - QTest::addColumn("expected"); - - QTest::newRow("data0") << QByteArray("") << QString("d41d8cd98f00b204e9800998ecf8427e"); - QTest::newRow("data1") << QByteArray("a") << QString("0cc175b9c0f1b6a831c399e269772661"); - QTest::newRow("data2") << QByteArray("abc") << QString("900150983cd24fb0d6963f7d28e17f72"); - QTest::newRow("data3") << QByteArray("message digest") << QString("f96b697d7cb7938d525a2f31aaf161d0"); - QTest::newRow("data4") << QByteArray("abcdefghijklmnopqrstuvwxyz") << QString("c3fcd3d76192e4007dfb496cca67e13b"); - QTest::newRow("data5") << QByteArray("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") << QString("d174ab98d277d9f5a5611c2c9f419d9f"); - QTest::newRow("data6") << QByteArray("12345678901234567890123456789012345678901234567890123456789012345678901234567890") << QString("57edf4a22be3c955ac49da2e2107b67a"); -} - -void tst_QtMD5::computeMD5() -{ - QFETCH(QByteArray, data); - QFETCH(QString, expected); - - QCOMPARE(qtMD5(data), expected); -} - -QTEST_MAIN(tst_QtMD5) -#include "tst_qtmd5.moc" -#endif diff --git a/tests/auto/solutions.pri b/tests/auto/solutions.pri deleted file mode 100644 index 5c069c5..0000000 --- a/tests/auto/solutions.pri +++ /dev/null @@ -1,16 +0,0 @@ -# use p4 where to get the solutions base dir. -# need to check for "..." since p4 behaves differently between versions -# SOLUTIONBASEDIR = $$system(p4 where //depot/addons/main/...) - -# figure out the path on your harddrive -# SOLUTIONBASEDIR = $$member(SOLUTIONBASEDIR, 2) -SOLUTIONBASEDIR = $$(SOLUTIONBASEDIR) - -# strip the trailing "..." -# SOLUTIONBASEDIR ~= s/\\.\\.\\.$// - -# replace \ with / -# win32:SOLUTIONBASEDIR ~= s.\\\\./.g - -isEmpty(SOLUTIONBASEDIR):DEFINES += QT_NO_SOLUTIONS - -- 2.7.4