From 9f1aa866bda7678261f2f441d4cfd5bb524c2411 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Thu, 20 Oct 2011 13:17:26 +0200 Subject: Moved tests into integrationtests/ and widgets/ Task-number: QTBUG-19013 Change-Id: Ibb776f5967c0645ce6d22ef7afdc40657c575461 Reviewed-by: Holger Ihrig --- tests/auto/qstringlistmodel/.gitignore | 1 - tests/auto/qstringlistmodel/qmodellistener.h | 75 ------ tests/auto/qstringlistmodel/qstringlistmodel.pro | 8 - .../auto/qstringlistmodel/tst_qstringlistmodel.cpp | 286 --------------------- 4 files changed, 370 deletions(-) delete mode 100644 tests/auto/qstringlistmodel/.gitignore delete mode 100644 tests/auto/qstringlistmodel/qmodellistener.h delete mode 100644 tests/auto/qstringlistmodel/qstringlistmodel.pro delete mode 100644 tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp (limited to 'tests/auto/qstringlistmodel') diff --git a/tests/auto/qstringlistmodel/.gitignore b/tests/auto/qstringlistmodel/.gitignore deleted file mode 100644 index 9c14561e3c..0000000000 --- a/tests/auto/qstringlistmodel/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qstringlistmodel diff --git a/tests/auto/qstringlistmodel/qmodellistener.h b/tests/auto/qstringlistmodel/qmodellistener.h deleted file mode 100644 index f3ed3c1793..0000000000 --- a/tests/auto/qstringlistmodel/qmodellistener.h +++ /dev/null @@ -1,75 +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 -#include - - -QT_FORWARD_DECLARE_CLASS(QStringListModel) - -class QModelListener : public QObject -{ - Q_OBJECT -public: - QModelListener(QStringList *pAboutToStringlist, QStringList *pExpectedStringlist, QStringListModel *pModel) - { - setTestData(pAboutToStringlist, pExpectedStringlist, pModel); - } - virtual ~QModelListener() { } - - void setTestData(QStringList *pAboutToStringlist, QStringList *pExpectedStringlist, QStringListModel *pModel) - { - m_pAboutToStringlist = pAboutToStringlist; - m_pExpectedStringlist = pExpectedStringlist; - m_pModel = pModel; - } - -private: - QStringList *m_pAboutToStringlist; - QStringList *m_pExpectedStringlist; - QStringListModel *m_pModel; - -public slots: - void rowsAboutToBeRemovedOrInserted(const QModelIndex & parent, int start, int end ); - void rowsRemovedOrInserted(const QModelIndex & parent, int start, int end ); - -}; - diff --git a/tests/auto/qstringlistmodel/qstringlistmodel.pro b/tests/auto/qstringlistmodel/qstringlistmodel.pro deleted file mode 100644 index fe70ed7345..0000000000 --- a/tests/auto/qstringlistmodel/qstringlistmodel.pro +++ /dev/null @@ -1,8 +0,0 @@ -load(qttest_p4) -QT += widgets -HEADERS += qmodellistener.h - -SOURCES += tst_qstringlistmodel.cpp - - - diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp deleted file mode 100644 index 2542496f14..0000000000 --- a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp +++ /dev/null @@ -1,286 +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 -#include -#include -#include -#include -#include -#include "qmodellistener.h" -#include - -//TESTED_CLASS= -//TESTED_FILES= - -void QModelListener::rowsAboutToBeRemovedOrInserted(const QModelIndex & parent, int start, int end ) -{ - int i; - for (i = 0; start + i <= end; i++) - { - QModelIndex mIndex = m_pModel->index(start + i, 0, parent); - QVariant var = m_pModel->data(mIndex, Qt::DisplayRole); - QString str = var.toString(); - - QCOMPARE(str, m_pAboutToStringlist->at(i)); - } -} - -void QModelListener::rowsRemovedOrInserted(const QModelIndex & parent, int , int) -{ - int i; - // Can the rows that *are* removed be iterated now ? - - // What about rowsAboutToBeInserted - what will the indices be? - // will insertRow() overwrite existing, or insert (and conseq. grow the model?) - // What will the item then contain? empty data? - - // RemoveColumn. Does that also fire the rowsRemoved-family signals? - - for (i = 0; i < m_pExpectedStringlist->size(); i++) - { - QModelIndex mIndex = m_pModel->index(i, 0, parent); - QVariant var = m_pModel->data(mIndex, Qt::DisplayRole); - QString str = var.toString(); - - //qDebug() << "index: " << i << " start: " << start << "end: " << end; - QCOMPARE(str, m_pExpectedStringlist->at(i)); - } -} - - -class tst_QStringListModel : public QObject -{ - Q_OBJECT - -public: - - tst_QStringListModel(); - virtual ~tst_QStringListModel(); - - -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); -private slots: - - void rowsAboutToBeRemoved_rowsRemoved(); - void rowsAboutToBeRemoved_rowsRemoved_data(); - - void rowsAboutToBeInserted_rowsInserted(); - void rowsAboutToBeInserted_rowsInserted_data(); -}; - - -tst_QStringListModel::tst_QStringListModel() - -{ -} - -tst_QStringListModel::~tst_QStringListModel() -{ -} - -void tst_QStringListModel::initTestCase() -{ -} - -void tst_QStringListModel::cleanupTestCase() -{ -} - -void tst_QStringListModel::init() -{ -} - -void tst_QStringListModel::cleanup() -{ -} - -/* - tests -*/ - - -void tst_QStringListModel::rowsAboutToBeRemoved_rowsRemoved_data() -{ - QTest::addColumn("input"); - QTest::addColumn("row"); - QTest::addColumn("count"); - QTest::addColumn("aboutto"); - QTest::addColumn("res"); - - QStringList strings0; strings0 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto0; aboutto0 << "Two" << "Three"; - QStringList res0; res0 << "One" << "Four" << "Five"; - QTest::newRow( "data0" ) << strings0 << 1 << 2 << aboutto0 << res0; - - QStringList strings1; strings1 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto1; aboutto1 << "One" << "Two"; - QStringList res1; res1 << "Three" << "Four" << "Five"; - QTest::newRow( "data1" ) << strings1 << 0 << 2 << aboutto1 << res1; - - QStringList strings2; strings2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto2; aboutto2 << "Four" << "Five"; - QStringList res2; res2 << "One" << "Two" << "Three"; - QTest::newRow( "data2" ) << strings2 << 3 << 2 << aboutto2 << res2; - - QStringList strings3; strings3 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto3; aboutto3 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList res3; res3 ; - QTest::newRow( "data3" ) << strings3 << 0 << 5 << aboutto3 << res3; - - /* Not sure if this is a valid test */ - QStringList strings4; strings4 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto4; aboutto4 << "Five" << ""; - QStringList res4; res4 << "One" << "Two" << "Three" << "Four"; - QTest::newRow( "data4" ) << strings4 << 4 << 2 << aboutto4 << res4; - - /* - * Keep this, template to add more data - QStringList strings2; strings2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto2; aboutto2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList res2; res2 << "One" << "Two" << "Three" << "Four" << "Five"; - QTest::newRow( "data2" ) << strings2 << 0 << 5 << aboutto2 << res2; -*/ - -} - -void tst_QStringListModel::rowsAboutToBeRemoved_rowsRemoved() -{ - QFETCH(QStringList, input); - QFETCH(int, row); - QFETCH(int, count); - QFETCH(QStringList, aboutto); - QFETCH(QStringList, res); - - QStringListModel *model = new QStringListModel(input); - QModelListener *pListener = new QModelListener(&aboutto, &res, model); - pListener->connect(model, SIGNAL( rowsAboutToBeRemoved(const QModelIndex & , int , int )), - pListener, SLOT( rowsAboutToBeRemovedOrInserted(const QModelIndex & , int , int )) ); - - pListener->connect(model, SIGNAL( rowsRemoved(const QModelIndex & , int , int )), - pListener, SLOT( rowsRemovedOrInserted(const QModelIndex & , int , int )) ); - - model->removeRows(row,count); - // At this point, control goes to our connected slots inn this order: - // 1. rowsAboutToBeRemovedOrInserted - // 2. rowsRemovedOrInserted - // Control returns here - - delete pListener; - delete model; - -} - -void tst_QStringListModel::rowsAboutToBeInserted_rowsInserted_data() -{ - QTest::addColumn("input"); - QTest::addColumn("row"); - QTest::addColumn("count"); - QTest::addColumn("aboutto"); - QTest::addColumn("res"); - - QStringList strings0; strings0 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto0; aboutto0 << "Two" << "Three"; - QStringList res0; res0 << "One" << "" << "" << "Two" << "Three" << "Four" << "Five"; - QTest::newRow( "data0" ) << strings0 << 1 << 2 << aboutto0 << res0; - - QStringList strings1; strings1 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto1; aboutto1 << "One" << "Two"; - QStringList res1; res1 << "" << "" << "One" << "Two" << "Three" << "Four" << "Five"; - QTest::newRow( "data1" ) << strings1 << 0 << 2 << aboutto1 << res1; - - QStringList strings2; strings2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto2; aboutto2 << "Four" << "Five"; - QStringList res2; res2 << "One" << "Two" << "Three" << "" << "" << "Four" << "Five"; - QTest::newRow( "data2" ) << strings2 << 3 << 2 << aboutto2 << res2; - - QStringList strings3; strings3 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto3; aboutto3 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList res3; res3 << "" << "" << "" << "" << "" << "One" << "Two" << "Three" << "Four" << "Five"; - QTest::newRow( "data3" ) << strings3 << 0 << 5 << aboutto3 << res3; - - /* - * Keep this, template to add more data - QStringList strings2; strings2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList aboutto2; aboutto2 << "One" << "Two" << "Three" << "Four" << "Five"; - QStringList res2; res2 << "One" << "Two" << "Three" << "Four" << "Five"; - QTest::newRow( "data2" ) << strings2 << 0 << 5 << aboutto2 << res2; -*/ - -} - -void tst_QStringListModel::rowsAboutToBeInserted_rowsInserted() -{ - QFETCH(QStringList, input); - QFETCH(int, row); - QFETCH(int, count); - QFETCH(QStringList, aboutto); - QFETCH(QStringList, res); - - QStringListModel *model = new QStringListModel(input); - QModelListener *pListener = new QModelListener(&aboutto, &res, model); - connect(model, SIGNAL( rowsAboutToBeInserted(const QModelIndex & , int , int )), - pListener, SLOT( rowsAboutToBeRemovedOrInserted(const QModelIndex & , int , int )) ); - - connect(model, SIGNAL( rowsInserted(const QModelIndex & , int , int )), - pListener, SLOT( rowsRemovedOrInserted(const QModelIndex & , int , int )) ); - - model->insertRows(row,count); - // At this point, control goes to our connected slots inn this order: - // 1. rowsAboutToBeRemovedOrInserted - // 2. rowsRemovedOrInserted - // Control returns here - - delete pListener; - delete model; - -} - - -QTEST_MAIN(tst_QStringListModel) -#include "tst_qstringlistmodel.moc" - -- cgit v1.2.3