Remove empty functions from itemmodels tests.
Change-Id: I23775a334812b096192c7f44c4a3cb06f4b08705 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
ea415e2060
commit
9f843918f2
@ -49,14 +49,7 @@ class tst_QAbstractProxyModel : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
void init();
|
||||
void cleanup();
|
||||
|
||||
private slots:
|
||||
void qabstractproxymodel_data();
|
||||
void qabstractproxymodel();
|
||||
void data_data();
|
||||
void data();
|
||||
@ -74,9 +67,7 @@ private slots:
|
||||
void mapSelectionToSource();
|
||||
void mapToSource_data();
|
||||
void mapToSource();
|
||||
void revert_data();
|
||||
void revert();
|
||||
void setSourceModel_data();
|
||||
void setSourceModel();
|
||||
void submit_data();
|
||||
void submit();
|
||||
@ -116,32 +107,6 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
// This will be called before the first test function is executed.
|
||||
// It is only called once.
|
||||
void tst_QAbstractProxyModel::initTestCase()
|
||||
{
|
||||
}
|
||||
|
||||
// This will be called after the last test function is executed.
|
||||
// It is only called once.
|
||||
void tst_QAbstractProxyModel::cleanupTestCase()
|
||||
{
|
||||
}
|
||||
|
||||
// This will be called before each test function is executed.
|
||||
void tst_QAbstractProxyModel::init()
|
||||
{
|
||||
}
|
||||
|
||||
// This will be called after every test function.
|
||||
void tst_QAbstractProxyModel::cleanup()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_QAbstractProxyModel::qabstractproxymodel_data()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_QAbstractProxyModel::qabstractproxymodel()
|
||||
{
|
||||
SubQAbstractProxyModel model;
|
||||
@ -309,32 +274,16 @@ void tst_QAbstractProxyModel::mapToSource()
|
||||
QCOMPARE(model.mapToSource(proxyIndex), mapToSource);
|
||||
}
|
||||
|
||||
void tst_QAbstractProxyModel::revert_data()
|
||||
{
|
||||
//QTest::addColumn<int>("foo");
|
||||
//QTest::newRow("null") << 0;
|
||||
}
|
||||
|
||||
// public void revert()
|
||||
void tst_QAbstractProxyModel::revert()
|
||||
{
|
||||
//QFETCH(int, foo);
|
||||
|
||||
SubQAbstractProxyModel model;
|
||||
model.revert();
|
||||
}
|
||||
|
||||
void tst_QAbstractProxyModel::setSourceModel_data()
|
||||
{
|
||||
//QTest::addColumn<int>("sourceModelCount");
|
||||
//QTest::newRow("null") << 0;
|
||||
}
|
||||
|
||||
// public void setSourceModel(QAbstractItemModel* sourceModel)
|
||||
void tst_QAbstractProxyModel::setSourceModel()
|
||||
{
|
||||
//QFETCH(int, sourceModelCount);
|
||||
|
||||
SubQAbstractProxyModel model;
|
||||
QStandardItemModel *sourceModel = new QStandardItemModel(&model);
|
||||
model.setSourceModel(sourceModel);
|
||||
|
@ -55,14 +55,11 @@ class tst_QIdentityProxyModel : public QObject
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
|
||||
tst_QIdentityProxyModel();
|
||||
virtual ~tst_QIdentityProxyModel();
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
void init();
|
||||
void cleanup();
|
||||
|
||||
private slots:
|
||||
@ -85,11 +82,6 @@ tst_QIdentityProxyModel::tst_QIdentityProxyModel()
|
||||
|
||||
}
|
||||
|
||||
tst_QIdentityProxyModel::~tst_QIdentityProxyModel()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void tst_QIdentityProxyModel::initTestCase()
|
||||
{
|
||||
qRegisterMetaType<QModelIndex>("QModelIndex");
|
||||
@ -104,10 +96,6 @@ void tst_QIdentityProxyModel::cleanupTestCase()
|
||||
delete m_model;
|
||||
}
|
||||
|
||||
void tst_QIdentityProxyModel::init()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_QIdentityProxyModel::cleanup()
|
||||
{
|
||||
m_model->clear();
|
||||
|
@ -51,8 +51,6 @@ class tst_QItemSelectionModel : public QObject
|
||||
|
||||
public:
|
||||
tst_QItemSelectionModel();
|
||||
virtual ~tst_QItemSelectionModel();
|
||||
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
@ -190,10 +188,6 @@ tst_QItemSelectionModel::tst_QItemSelectionModel() : model(0), selection(0)
|
||||
{
|
||||
}
|
||||
|
||||
tst_QItemSelectionModel::~tst_QItemSelectionModel()
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
This test usually uses a model with a 5x5 table
|
||||
-------------------------------------------
|
||||
|
@ -66,12 +66,10 @@ class tst_QSortFilterProxyModel : public QObject
|
||||
public:
|
||||
|
||||
tst_QSortFilterProxyModel();
|
||||
virtual ~tst_QSortFilterProxyModel();
|
||||
|
||||
public slots:
|
||||
void initTestCase();
|
||||
void cleanupTestCase();
|
||||
void init();
|
||||
void cleanup();
|
||||
|
||||
private slots:
|
||||
@ -84,8 +82,6 @@ private slots:
|
||||
void insertRows_data();
|
||||
void insertRows();
|
||||
void prependRow();
|
||||
// void insertColumns_data();
|
||||
// void insertColumns();
|
||||
void removeRows_data();
|
||||
void removeRows();
|
||||
void removeColumns_data();
|
||||
@ -180,11 +176,6 @@ tst_QSortFilterProxyModel::tst_QSortFilterProxyModel()
|
||||
|
||||
}
|
||||
|
||||
tst_QSortFilterProxyModel::~tst_QSortFilterProxyModel()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void tst_QSortFilterProxyModel::initTestCase()
|
||||
{
|
||||
qRegisterMetaType<QModelIndex>("QModelIndex");
|
||||
@ -202,10 +193,6 @@ void tst_QSortFilterProxyModel::cleanupTestCase()
|
||||
delete m_model;
|
||||
}
|
||||
|
||||
void tst_QSortFilterProxyModel::init()
|
||||
{
|
||||
}
|
||||
|
||||
void tst_QSortFilterProxyModel::cleanup()
|
||||
{
|
||||
m_proxy->setFilterRegExp(QRegExp());
|
||||
@ -634,19 +621,6 @@ void tst_QSortFilterProxyModel::prependRow()
|
||||
QCOMPARE(proxy.rowCount(QModelIndex()), 1); //only the "root" item is there
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
void tst_QSortFilterProxyModel::insertColumns_data()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void tst_QSortFilterProxyModel::insertColumns()
|
||||
{
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
void tst_QSortFilterProxyModel::removeRows_data()
|
||||
{
|
||||
QTest::addColumn<QStringList>("initial");
|
||||
|
@ -90,19 +90,7 @@ 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();
|
||||
|
||||
@ -110,37 +98,6 @@ private slots:
|
||||
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<QStringList>("input");
|
||||
|
Loading…
Reference in New Issue
Block a user