Commit a5f9345e authored by Volker Krause's avatar Volker Krause Committed by Nicolas Fella
Browse files

Replace old ModelTest copy by QAbstractItemModelTester

parent f2dc2bc5
......@@ -31,7 +31,6 @@ ecm_mark_as_test(testHistory)
########################################################
set(testHistoryModel_SRCS
historymodeltest.cpp
modeltest.cpp
../historymodel.cpp
../historyimageitem.cpp
../historyitem.cpp
......
......@@ -16,12 +16,12 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "modeltest.h"
#include "../historymodel.h"
#include "../historyimageitem.h"
#include "../historystringitem.h"
#include "../historyurlitem.h"
#include <QAbstractItemModelTester>
#include <QtTest>
class HistoryModelTest : public QObject
......@@ -39,7 +39,7 @@ private Q_SLOTS:
void HistoryModelTest::testSetMaxSize()
{
QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
QCOMPARE(history->rowCount(), 0);
QCOMPARE(history->maxSize(), 0);
......@@ -77,7 +77,7 @@ void HistoryModelTest::testSetMaxSize()
void HistoryModelTest::testInsertRemove()
{
QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
history->setMaxSize(10);
QCOMPARE(history->rowCount(), 0);
......@@ -178,7 +178,7 @@ void HistoryModelTest::testInsertRemove()
void HistoryModelTest::testClear()
{
QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
history->setMaxSize(10);
QCOMPARE(history->rowCount(), 0);
......@@ -200,7 +200,7 @@ void HistoryModelTest::testClear()
void HistoryModelTest::testIndexOf()
{
QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
history->setMaxSize(10);
QCOMPARE(history->rowCount(), 0);
QVERIFY(!history->indexOf(QByteArrayLiteral("whatever")).isValid());
......@@ -234,7 +234,7 @@ void HistoryModelTest::testType_data()
void HistoryModelTest::testType()
{
QScopedPointer<HistoryModel> history(new HistoryModel(nullptr));
QScopedPointer<ModelTest> modelTest(new ModelTest(history.data()));
QScopedPointer<QAbstractItemModelTester> modelTest(new QAbstractItemModelTester(history.data()));
history->setMaxSize(10);
QCOMPARE(history->rowCount(), 0);
......
This diff is collapsed.
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the test suite of the Qt Toolkit.
**
** $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 https://qt.io/licensing. For further information
** use the contact form at https://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 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: https://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef MODELTEST_H
#define MODELTEST_H
#include <QObject>
#include <QAbstractItemModel>
#include <QStack>
class ModelTest : public QObject
{
Q_OBJECT
public:
ModelTest( QAbstractItemModel *model, QObject *parent = nullptr );
private Q_SLOTS:
void nonDestructiveBasicTest();
void rowCount();
void columnCount();
void hasIndex();
void index();
void parent();
void data();
protected Q_SLOTS:
void runAllTests();
void layoutAboutToBeChanged();
void layoutChanged();
void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end );
void rowsInserted( const QModelIndex & parent, int start, int end );
void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end );
void rowsRemoved( const QModelIndex & parent, int start, int end );
void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
void headerDataChanged(Qt::Orientation orientation, int start, int end);
private:
void checkChildren( const QModelIndex &parent, int currentDepth = 0 );
QAbstractItemModel *model;
struct Changing {
QModelIndex parent;
int oldSize;
QVariant last;
QVariant next;
};
QStack<Changing> insert;
QStack<Changing> remove;
bool fetchingMore;
QList<QPersistentModelIndex> changing;
};
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment