Make sure mappings are created for columns when indexes newly become parents.

Also move the modeltest related tests to the modeltest subdirectory

Merge-request: 2262
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>

3 files changed, 5 insertions, 529 deletions

diff --git a/tests/auto/qabstractitemmodel/dynamictreemodel.cpp b/tests/auto/qabstractitemmodel/dynamictreemodel.cpp
deleted file mode 100644
index 24d3ab3..0000000
--- a/tests/auto/qabstractitemmodel/dynamictreemodel.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Stephen Kelly <steveire@gmail.com>
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** 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, 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "dynamictreemodel.h"
-
-#include <QtCore/QHash>
-#include <QtCore/QList>
-#include <QtCore/QTimer>
-
-
-DynamicTreeModel::DynamicTreeModel(QObject *parent)
-  : QAbstractItemModel(parent),
-    nextId(1)
-{
-}
-
-QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &parent) const
-{
-//   if (column != 0)
-//     return QModelIndex();
-
-
-  if ( column < 0 || row < 0 )
-    return QModelIndex();
-
-  QList<QList<qint64> > childIdColumns = m_childItems.value(parent.internalId());
-
-
-  if (childIdColumns.size() == 0)
-    return QModelIndex();
-
-  if (column >= childIdColumns.size())
-    return QModelIndex();
-
-  QList<qint64> rowIds = childIdColumns.at(column);
-
-  if ( row >= rowIds.size())
-    return QModelIndex();
-
-  qint64 id = rowIds.at(row);
-
-  return createIndex(row, column, reinterpret_cast<void *>(id));
-
-}
-
-qint64 DynamicTreeModel::findParentId(qint64 searchId) const
-{
-  if (searchId <= 0)
-    return -1;
-
-  QHashIterator<qint64, QList<QList<qint64> > > i(m_childItems);
-  while (i.hasNext())
-  {
-    i.next();
-    QListIterator<QList<qint64> > j(i.value());
-    while (j.hasNext())
-    {
-      QList<qint64> l = j.next();
-      if (l.contains(searchId))
-      {
-        return i.key();
-      }
-    }
-  }
-  return -1;
-}
-
-QModelIndex DynamicTreeModel::parent(const QModelIndex &index) const
-{
-  if (!index.isValid())
-    return QModelIndex();
-
-  qint64 searchId = index.internalId();
-  qint64 parentId = findParentId(searchId);
-  // Will never happen for valid index, but what the hey...
-  if (parentId <= 0)
-    return QModelIndex();
-
-  qint64 grandParentId = findParentId(parentId);
-  if (grandParentId < 0)
-    grandParentId = 0;
-
-  int column = 0;
-  QList<qint64> childList = m_childItems.value(grandParentId).at(column);
-
-  int row = childList.indexOf(parentId);
-
-  return createIndex(row, column, reinterpret_cast<void *>(parentId));
-
-}
-
-int DynamicTreeModel::rowCount(const QModelIndex &index ) const
-{
-  QList<QList<qint64> > cols = m_childItems.value(index.internalId());
-
-  if (cols.size() == 0 )
-    return 0;
-
-  if (index.column() > 0)
-    return 0;
-
-  return cols.at(0).size();
-}
-
-int DynamicTreeModel::columnCount(const QModelIndex &index ) const
-{
-//   Q_UNUSED(index);
-  return m_childItems.value(index.internalId()).size();
-}
-
-QVariant DynamicTreeModel::data(const QModelIndex &index, int role) const
-{
-  if (!index.isValid())
-    return QVariant();
-
-  if (Qt::DisplayRole == role)
-  {
-    return m_items.value(index.internalId());
-  }
-  return QVariant();
-}
-
-void DynamicTreeModel::clear()
-{
-  m_items.clear();
-  m_childItems.clear();
-  nextId = 1;
-  reset();
-}
-
-
-ModelChangeCommand::ModelChangeCommand( DynamicTreeModel *model, QObject *parent )
-    : QObject(parent), m_model(model), m_numCols(1), m_startRow(-1), m_endRow(-1)
-{
-
-}
-
-QModelIndex ModelChangeCommand::findIndex(QList<int> rows)
-{
-  const int col = 0;
-  QModelIndex parent = QModelIndex();
-  QListIterator<int> i(rows);
-  while (i.hasNext())
-  {
-    parent = m_model->index(i.next(), col, parent);
-    Q_ASSERT(parent.isValid());
-  }
-  return parent;
-}
-
-ModelInsertCommand::ModelInsertCommand(DynamicTreeModel *model, QObject *parent )
-    : ModelChangeCommand(model, parent)
-{
-
-}
-
-void ModelInsertCommand::doCommand()
-{
-  QModelIndex parent = findIndex(m_rowNumbers);
-  m_model->beginInsertRows(parent, m_startRow, m_endRow);
-  qint64 parentId = parent.internalId();
-  for (int row = m_startRow; row <= m_endRow; row++)
-  {
-    for(int col = 0; col < m_numCols; col++ )
-    {
-      if (m_model->m_childItems[parentId].size() <= col)
-      {
-        m_model->m_childItems[parentId].append(QList<qint64>());
-      }
-//       QString name = QUuid::createUuid().toString();
-      qint64 id = m_model->newId();
-      QString name = QString::number(id);
-
-      m_model->m_items.insert(id, name);
-      m_model->m_childItems[parentId][col].insert(row, id);
-
-    }
-  }
-  m_model->endInsertRows();
-}
-
-
-ModelMoveCommand::ModelMoveCommand(DynamicTreeModel *model, QObject *parent)
-  : ModelChangeCommand(model, parent)
-{
-
-}
-bool ModelMoveCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
-{
-  return m_model->beginMoveRows(srcParent, srcStart, srcEnd, destParent, destRow);
-}
-
-void ModelMoveCommand::doCommand()
-{
-    QModelIndex srcParent = findIndex(m_rowNumbers);
-    QModelIndex destParent = findIndex(m_destRowNumbers);
-
-    if (!emitPreSignal(srcParent, m_startRow, m_endRow, destParent, m_destRow))
-    {
-        return;
-    }
-
-    for (int column = 0; column < m_numCols; ++column)
-    {
-        QList<qint64> l = m_model->m_childItems.value(srcParent.internalId())[column].mid(m_startRow, m_endRow - m_startRow + 1 );
-
-        for (int i = m_startRow; i <= m_endRow ; i++)
-        {
-            m_model->m_childItems[srcParent.internalId()][column].removeAt(m_startRow);
-        }
-        int d;
-        if (m_destRow < m_startRow)
-            d = m_destRow;
-        else
-        {
-            if (srcParent == destParent)
-                d = m_destRow - (m_endRow - m_startRow + 1);
-            else
-                d = m_destRow - (m_endRow - m_startRow) + 1;
-        }
-
-        foreach(const qint64 id, l)
-        {
-            m_model->m_childItems[destParent.internalId()][column].insert(d++, id);
-        }
-    }
-
-    emitPostSignal();
-}
-
-void ModelMoveCommand::emitPostSignal()
-{
-    m_model->endMoveRows();
-}
-
-ModelResetCommand::ModelResetCommand(DynamicTreeModel* model, QObject* parent)
-  : ModelMoveCommand(model, parent)
-{
-
-}
-
-ModelResetCommand::~ModelResetCommand()
-{
-
-}
-
-bool ModelResetCommand::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
-{
-    Q_UNUSED(srcParent);
-    Q_UNUSED(srcStart);
-    Q_UNUSED(srcEnd);
-    Q_UNUSED(destParent);
-    Q_UNUSED(destRow);
-
-    return true;
-}
-
-void ModelResetCommand::emitPostSignal()
-{
-    m_model->reset();
-}
-
-ModelResetCommandFixed::ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent)
-  : ModelMoveCommand(model, parent)
-{
-
-}
-
-ModelResetCommandFixed::~ModelResetCommandFixed()
-{
-
-}
-
-bool ModelResetCommandFixed::emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow)
-{
-    Q_UNUSED(srcParent);
-    Q_UNUSED(srcStart);
-    Q_UNUSED(srcEnd);
-    Q_UNUSED(destParent);
-    Q_UNUSED(destRow);
-
-    m_model->beginResetModel();
-    return true;
-}
-
-void ModelResetCommandFixed::emitPostSignal()
-{
-    m_model->endResetModel();
-}
-
diff --git a/tests/auto/qabstractitemmodel/dynamictreemodel.h b/tests/auto/qabstractitemmodel/dynamictreemodel.h
deleted file mode 100644
index 3f0d90d..0000000
--- a/tests/auto/qabstractitemmodel/dynamictreemodel.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Stephen Kelly <steveire@gmail.com>
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** 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, 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.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DYNAMICTREEMODEL_H
-#define DYNAMICTREEMODEL_H
-
-#include <QtCore/QAbstractItemModel>
-
-#include <QtCore/QHash>
-#include <QtCore/QList>
-
-
-template<typename T> class QList;
-
-class DynamicTreeModel : public QAbstractItemModel
-{
-  Q_OBJECT
-
-public:
-  DynamicTreeModel(QObject *parent = 0);
-
-  QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-  QModelIndex parent(const QModelIndex &index) const;
-  int rowCount(const QModelIndex &index = QModelIndex()) const;
-  int columnCount(const QModelIndex &index = QModelIndex()) const;
-
-  QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-
-  void clear();
-
-protected slots:
-
-  /**
-  Finds the parent id of the string with id @p searchId.
-
-  Returns -1 if not found.
-  */
-  qint64 findParentId(qint64 searchId) const;
-
-private:
-  QHash<qint64, QString> m_items;
-  QHash<qint64, QList<QList<qint64> > > m_childItems;
-  qint64 nextId;
-  qint64 newId() { return nextId++; };
-
-  QModelIndex m_nextParentIndex;
-  int m_nextRow;
-
-  int m_depth;
-  int maxDepth;
-
-  friend class ModelInsertCommand;
-  friend class ModelMoveCommand;
-  friend class ModelResetCommand;
-  friend class ModelResetCommandFixed;
-
-};
-
-
-class ModelChangeCommand : public QObject
-{
-  Q_OBJECT
-public:
-
-  ModelChangeCommand( DynamicTreeModel *model, QObject *parent = 0 );
-
-  virtual ~ModelChangeCommand() {}
-
-  void setAncestorRowNumbers(QList<int> rowNumbers) { m_rowNumbers = rowNumbers; }
-
-  QModelIndex findIndex(QList<int> rows);
-
-  void setStartRow(int row) { m_startRow = row; }
-
-  void setEndRow(int row) { m_endRow = row; }
-
-  void setNumCols(int cols) { m_numCols = cols; }
-
-  virtual void doCommand() = 0;
-
-protected:
-  DynamicTreeModel* m_model;
-  QList<int> m_rowNumbers;
-  int m_numCols;
-  int m_startRow;
-  int m_endRow;
-
-};
-
-typedef QList<ModelChangeCommand*> ModelChangeCommandList;
-
-class ModelInsertCommand : public ModelChangeCommand
-{
-  Q_OBJECT
-
-public:
-
-  ModelInsertCommand(DynamicTreeModel *model, QObject *parent = 0 );
-  virtual ~ModelInsertCommand() {}
-
-  virtual void doCommand();
-};
-
-
-class ModelMoveCommand : public ModelChangeCommand
-{
-  Q_OBJECT
-public:
-  ModelMoveCommand(DynamicTreeModel *model, QObject *parent);
-
-  virtual ~ModelMoveCommand() {}
-
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
-
-  virtual void doCommand();
-
-  virtual void emitPostSignal();
-
-  void setDestAncestors( QList<int> rows ) { m_destRowNumbers = rows; }
-
-  void setDestRow(int row) { m_destRow = row; }
-
-protected:
-  QList<int> m_destRowNumbers;
-  int m_destRow;
-};
-
-/**
-  A command which does a move and emits a reset signal.
-*/
-class ModelResetCommand : public ModelMoveCommand
-{
-  Q_OBJECT
-public:
-  ModelResetCommand(DynamicTreeModel* model, QObject* parent = 0);
-
-  virtual ~ModelResetCommand();
-
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
-  virtual void emitPostSignal();
-
-};
-
-/**
-  A command which does a move and emits a beginResetModel and endResetModel signals.
-*/
-class ModelResetCommandFixed : public ModelMoveCommand
-{
-  Q_OBJECT
-public:
-  ModelResetCommandFixed(DynamicTreeModel* model, QObject* parent = 0);
-
-  virtual ~ModelResetCommandFixed();
-
-  virtual bool emitPreSignal(const QModelIndex &srcParent, int srcStart, int srcEnd, const QModelIndex &destParent, int destRow);
-  virtual void emitPostSignal();
-
-};
-
-
-#endif
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
index a31868b..52c4e96 100644
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,6 +1,9 @@
 load(qttest_p4)
-SOURCES         += tst_qabstractitemmodel.cpp dynamictreemodel.cpp
-HEADERS         += dynamictreemodel.h
+
+INCLUDEPATH += $$PWD/../modeltest
+
+SOURCES         += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
+HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h