From 5c27f0a2fb772279fb3e4d60f7c879f5cecb3352 Mon Sep 17 00:00:00 2001 From: Holger Ihrig Date: Fri, 26 Aug 2011 15:03:33 +0200 Subject: Moving relevant tests to corelib/tools Task-number: QTBUG-21066 Change-Id: I650f8f7826b9feea7c1484f06e03e10c68ec2b65 Reviewed-on: http://codereview.qt.nokia.com/3712 Reviewed-by: Qt Sanity Bot Reviewed-by: Sergio Ahumada --- tests/auto/qbytearraymatcher/qbytearraymatcher.pro | 5 - .../qbytearraymatcher/tst_qbytearraymatcher.cpp | 129 --------------------- 2 files changed, 134 deletions(-) delete mode 100644 tests/auto/qbytearraymatcher/qbytearraymatcher.pro delete mode 100644 tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp (limited to 'tests/auto/qbytearraymatcher') diff --git a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro b/tests/auto/qbytearraymatcher/qbytearraymatcher.pro deleted file mode 100644 index a2458e623f..0000000000 --- a/tests/auto/qbytearraymatcher/qbytearraymatcher.pro +++ /dev/null @@ -1,5 +0,0 @@ -load(qttest_p4) -SOURCES += tst_qbytearraymatcher.cpp - -QT = core -CONFIG += parallel_test diff --git a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp b/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp deleted file mode 100644 index 09a3dfdf7d..0000000000 --- a/tests/auto/qbytearraymatcher/tst_qbytearraymatcher.cpp +++ /dev/null @@ -1,129 +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 - -// COM interface -#if defined(Q_OS_WIN) && defined(interface) -# undef interface -#endif - -class tst_QByteArrayMatcher : public QObject -{ - Q_OBJECT - -private slots: - void interface(); - void task251958(); -}; - -static QByteArrayMatcher matcher1; - -void tst_QByteArrayMatcher::interface() -{ - const char needle[] = "abc123"; - QByteArray haystack(500, 'a'); - haystack.insert(6, "123"); - haystack.insert(31, "abc"); - haystack.insert(42, "abc123"); - haystack.insert(84, "abc123"); - - matcher1 = QByteArrayMatcher(QByteArray(needle)); - QByteArrayMatcher matcher2; - matcher2.setPattern(QByteArray(needle)); - - QByteArrayMatcher matcher3 = QByteArrayMatcher(QByteArray(needle)); - QByteArrayMatcher matcher4(needle, sizeof(needle) - 1); - QByteArrayMatcher matcher5(matcher2); - QByteArrayMatcher matcher6; - matcher6 = matcher3; - - QCOMPARE(matcher1.indexIn(haystack), 42); - QCOMPARE(matcher2.indexIn(haystack), 42); - QCOMPARE(matcher3.indexIn(haystack), 42); - QCOMPARE(matcher4.indexIn(haystack), 42); - QCOMPARE(matcher5.indexIn(haystack), 42); - QCOMPARE(matcher6.indexIn(haystack), 42); - - QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length()), 42); - - QCOMPARE(matcher1.indexIn(haystack, 43), 84); - QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 43), 84); - QCOMPARE(matcher1.indexIn(haystack, 85), -1); - QCOMPARE(matcher1.indexIn(haystack.constData(), haystack.length(), 85), -1); - - QByteArrayMatcher matcher7(QByteArray("123")); - QCOMPARE(matcher7.indexIn(haystack), 6); - - matcher7 = QByteArrayMatcher(QByteArray("abc")); - QCOMPARE(matcher7.indexIn(haystack), 31); - - matcher7.setPattern(matcher4.pattern()); - QCOMPARE(matcher7.indexIn(haystack), 42); -} - - -static QByteArrayMatcher matcher; - -void tst_QByteArrayMatcher::task251958() -{ - const char p_data[] = { 0x0, 0x0, 0x1 }; - QByteArray pattern(p_data, sizeof(p_data)); - - QByteArray haystack(8, '\0'); - haystack[7] = 0x1; - - matcher = QByteArrayMatcher(pattern); - QCOMPARE(matcher.indexIn(haystack, 0), 5); - QCOMPARE(matcher.indexIn(haystack, 1), 5); - QCOMPARE(matcher.indexIn(haystack, 2), 5); - - matcher.setPattern(pattern); - QCOMPARE(matcher.indexIn(haystack, 0), 5); - QCOMPARE(matcher.indexIn(haystack, 1), 5); - QCOMPARE(matcher.indexIn(haystack, 2), 5); -} - -QTEST_APPLESS_MAIN(tst_QByteArrayMatcher) -#include "tst_qbytearraymatcher.moc" -- cgit v1.2.3