##// END OF EJS Templates
Plugged some memory leaks....
Plugged some memory leaks. Autotests were also made Valgrind friendly by adding a final one millisecond wait to the end of the test to allow pending deleteLaters to run. Also some minor cosmetic cleanup done to autotests. Change-Id: Ic3719167a22949f243eaf54614e174a681dbe34a Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>

File last commit:

r2733:c6ed50e68438
r2733:c6ed50e68438
Show More
tst_qxymodelmapper.cpp
591 lines | 18.6 KiB | text/x-c | CppLexer
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
** This file is part of the Qt Enterprise Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.digia.com
** $QT_END_LICENSE$
**
****************************************************************************/
#include <QtCore/QString>
#include <QtTest/QtTest>
#include <QtCharts/QChart>
#include <QtCharts/QChartView>
#include <QtCharts/QXYSeries>
#include <QtCharts/QLineSeries>
#include <QtCharts/QVXYModelMapper>
#include <QtCharts/QHXYModelMapper>
#include <QtGui/QStandardItemModel>
#include "tst_definitions.h"
QT_CHARTS_USE_NAMESPACE
class tst_qxymodelmapper : public QObject
{
Q_OBJECT
public:
tst_qxymodelmapper();
void createVerticalMapper();
void createHorizontalMapper();
private Q_SLOTS:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
void verticalMapper_data();
void verticalMapper();
void verticalMapperCustomMapping_data();
void verticalMapperCustomMapping();
void horizontalMapper_data();
void horizontalMapper();
void horizontalMapperCustomMapping_data();
void horizontalMapperCustomMapping();
void seriesUpdated();
void verticalModelInsertRows();
void verticalModelRemoveRows();
void verticalModelInsertColumns();
void verticalModelRemoveColumns();
void horizontalModelInsertRows();
void horizontalModelRemoveRows();
void horizontalModelInsertColumns();
void horizontalModelRemoveColumns();
void modelUpdateCell();
void verticalMapperSignals();
void horizontalMapperSignals();
private:
QStandardItemModel *m_model;
int m_modelRowCount;
int m_modelColumnCount;
QHXYModelMapper *m_hMapper;
QVXYModelMapper *m_vMapper;
QXYSeries *m_series;
QChart *m_chart;
QChartView *m_chartView;
};
tst_qxymodelmapper::tst_qxymodelmapper():
m_model(0),
m_modelRowCount(10),
m_modelColumnCount(8),
m_hMapper(0),
m_vMapper(0),
m_series(0),
m_chart(0),
m_chartView(0)
{
}
void tst_qxymodelmapper::createVerticalMapper()
{
m_vMapper = new QVXYModelMapper;
QVERIFY(m_vMapper->model() == 0);
m_vMapper->setXColumn(0);
m_vMapper->setYColumn(1);
m_vMapper->setModel(m_model);
m_vMapper->setSeries(m_series);
}
void tst_qxymodelmapper::createHorizontalMapper()
{
m_hMapper = new QHXYModelMapper;
QVERIFY(m_hMapper->model() == 0);
m_hMapper->setXRow(0);
m_hMapper->setYRow(1);
m_hMapper->setModel(m_model);
m_hMapper->setSeries(m_series);
}
void tst_qxymodelmapper::init()
{
m_series = new QLineSeries;
m_chart->addSeries(m_series);
m_model = new QStandardItemModel(m_modelRowCount, m_modelColumnCount, this);
for (int row = 0; row < m_modelRowCount; ++row) {
for (int column = 0; column < m_modelColumnCount; column++) {
m_model->setData(m_model->index(row, column), row * column);
}
}
}
void tst_qxymodelmapper::cleanup()
{
m_chart->removeSeries(m_series);
m_series->deleteLater();
m_series = 0;
m_model->clear();
m_model->deleteLater();
m_model = 0;
if (m_vMapper) {
m_vMapper->deleteLater();
m_vMapper = 0;
}
if (m_hMapper) {
m_hMapper->deleteLater();
m_hMapper = 0;
}
}
void tst_qxymodelmapper::initTestCase()
{
m_chart = newQChartOrQPolarChart();
m_chartView = new QChartView(m_chart);
m_chartView->show();
}
void tst_qxymodelmapper::cleanupTestCase()
{
delete m_chartView;
QTest::qWait(1); // Allow final deleteLaters to run
}
void tst_qxymodelmapper::verticalMapper_data()
{
QTest::addColumn<int>("xColumn");
QTest::addColumn<int>("yColumn");
QTest::addColumn<int>("expectedCount");
QTest::newRow("different x and y columns") << 0 << 1 << m_modelRowCount;
QTest::newRow("same x and y columns") << 1 << 1 << m_modelRowCount;
QTest::newRow("invalid x column and correct y column") << -3 << 1 << 0;
QTest::newRow("x column beyond the size of model and correct y column") << m_modelColumnCount << 1 << 0;
QTest::newRow("x column beyond the size of model and invalid y column") << m_modelColumnCount << -1 << 0;
}
void tst_qxymodelmapper::verticalMapper()
{
QFETCH(int, xColumn);
QFETCH(int, yColumn);
QFETCH(int, expectedCount);
QVXYModelMapper *mapper = new QVXYModelMapper;
QVERIFY(mapper->model() == 0);
mapper->setXColumn(xColumn);
mapper->setYColumn(yColumn);
mapper->setModel(m_model);
mapper->setSeries(m_series);
QCOMPARE(m_series->count(), expectedCount);
QCOMPARE(mapper->xColumn(), qMax(-1, xColumn));
QCOMPARE(mapper->yColumn(), qMax(-1, yColumn));
delete mapper;
mapper = 0;
}
void tst_qxymodelmapper::verticalMapperCustomMapping_data()
{
QTest::addColumn<int>("first");
QTest::addColumn<int>("countLimit");
QTest::addColumn<int>("expectedCount");
QTest::newRow("first: 0, unlimited count") << 0 << -1 << m_modelRowCount;
QTest::newRow("first: 3, unlimited count") << 3 << -1 << m_modelRowCount - 3;
QTest::newRow("first: 0, count: 5") << 0 << 5 << qMin(5, m_modelRowCount);
QTest::newRow("first: 3, count: 5") << 3 << 5 << qMin(5, m_modelRowCount - 3);
QTest::newRow("first: +1 greater then the number of rows in the model, unlimited count") << m_modelRowCount + 1 << -1 << 0;
QTest::newRow("first: +1 greater then the number of rows in the model, count: 5") << m_modelRowCount + 1 << 5 << 0;
QTest::newRow("first: 0, count: +3 greater than the number of rows in the model (should limit to the size of model)") << 0 << m_modelRowCount + 3 << m_modelRowCount;
QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << m_modelRowCount;
QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << m_modelRowCount;
QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << m_modelRowCount;
}
void tst_qxymodelmapper::verticalMapperCustomMapping()
{
QFETCH(int, first);
QFETCH(int, countLimit);
QFETCH(int, expectedCount);
QCOMPARE(m_series->count(), 0);
QVXYModelMapper *mapper = new QVXYModelMapper;
mapper->setXColumn(0);
mapper->setYColumn(1);
mapper->setModel(m_model);
mapper->setSeries(m_series);
mapper->setFirstRow(first);
mapper->setRowCount(countLimit);
QCOMPARE(m_series->count(), expectedCount);
// change values column mapping to invalid
mapper->setXColumn(-1);
mapper->setYColumn(1);
QCOMPARE(m_series->count(), 0);
delete mapper;
mapper = 0;
}
void tst_qxymodelmapper::horizontalMapper_data()
{
QTest::addColumn<int>("xRow");
QTest::addColumn<int>("yRow");
QTest::addColumn<int>("expectedCount");
QTest::newRow("different x and y rows") << 0 << 1 << m_modelColumnCount;
QTest::newRow("same x and y rows") << 1 << 1 << m_modelColumnCount;
QTest::newRow("invalid x row and correct y row") << -3 << 1 << 0;
QTest::newRow("x row beyond the size of model and correct y row") << m_modelRowCount << 1 << 0;
QTest::newRow("x row beyond the size of model and invalid y row") << m_modelRowCount << -1 << 0;
}
void tst_qxymodelmapper::horizontalMapper()
{
QFETCH(int, xRow);
QFETCH(int, yRow);
QFETCH(int, expectedCount);
QHXYModelMapper *mapper = new QHXYModelMapper;
mapper->setXRow(xRow);
mapper->setYRow(yRow);
mapper->setModel(m_model);
mapper->setSeries(m_series);
QCOMPARE(m_series->count(), expectedCount);
QCOMPARE(mapper->xRow(), qMax(-1, xRow));
QCOMPARE(mapper->yRow(), qMax(-1, yRow));
delete mapper;
mapper = 0;
}
void tst_qxymodelmapper::horizontalMapperCustomMapping_data()
{
QTest::addColumn<int>("first");
QTest::addColumn<int>("countLimit");
QTest::addColumn<int>("expectedCount");
QTest::newRow("first: 0, unlimited count") << 0 << -1 << m_modelColumnCount;
QTest::newRow("first: 3, unlimited count") << 3 << -1 << m_modelColumnCount - 3;
QTest::newRow("first: 0, count: 5") << 0 << 5 << qMin(5, m_modelColumnCount);
QTest::newRow("first: 3, count: 5") << 3 << 5 << qMin(5, m_modelColumnCount - 3);
QTest::newRow("first: +1 greater then the number of columns in the model, unlimited count") << m_modelColumnCount + 1 << -1 << 0;
QTest::newRow("first: +1 greater then the number of columns in the model, count: 5") << m_modelColumnCount + 1 << 5 << 0;
QTest::newRow("first: 0, count: +3 greater than the number of columns in the model (should limit to the size of model)") << 0 << m_modelColumnCount + 3 << m_modelColumnCount;
QTest::newRow("first: -3(invalid - should default to 0), unlimited count") << -3 << -1 << m_modelColumnCount;
QTest::newRow("first: 0, count: -3 (invalid - shlould default to -1)") << 0 << -3 << m_modelColumnCount;
QTest::newRow("first: -3(invalid - should default to 0), count: -3 (invalid - shlould default to -1)") << -3 << -3 << m_modelColumnCount;
}
void tst_qxymodelmapper::horizontalMapperCustomMapping()
{
QFETCH(int, first);
QFETCH(int, countLimit);
QFETCH(int, expectedCount);
QCOMPARE(m_series->count(), 0);
QHXYModelMapper *mapper = new QHXYModelMapper;
mapper->setXRow(0);
mapper->setYRow(1);
mapper->setModel(m_model);
mapper->setSeries(m_series);
mapper->setFirstColumn(first);
mapper->setColumnCount(countLimit);
QCOMPARE(m_series->count(), expectedCount);
// change values row mapping to invalid
mapper->setXRow(-1);
mapper->setYRow(1);
QCOMPARE(m_series->count(), 0);
delete mapper;
mapper = 0;
}
void tst_qxymodelmapper::seriesUpdated()
{
// setup the mapper
createVerticalMapper();
QCOMPARE(m_series->count(), m_modelRowCount);
QCOMPARE(m_vMapper->rowCount(), -1);
m_series->append(QPointF(100, 100));
QCOMPARE(m_series->count(), m_modelRowCount + 1);
QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
m_series->remove(m_series->points().last());
QCOMPARE(m_series->count(), m_modelRowCount);
QCOMPARE(m_vMapper->rowCount(), -1); // the value should not change as it indicates 'all' items there are in the model
m_series->replace(m_series->points().first(), QPointF(25.0, 75.0));
QCOMPARE(m_model->data(m_model->index(0, 0)).toReal(), 25.0);
QCOMPARE(m_model->data(m_model->index(0, 1)).toReal(), 75.0);
}
void tst_qxymodelmapper::verticalModelInsertRows()
{
// setup the mapper
createVerticalMapper();
QCOMPARE(m_series->count(), m_modelRowCount);
QVERIFY(m_vMapper->model() != 0);
int insertCount = 4;
m_model->insertRows(3, insertCount);
QCOMPARE(m_series->count(), m_modelRowCount + insertCount);
int first = 3;
m_vMapper->setFirstRow(3);
QCOMPARE(m_series->count(), m_modelRowCount + insertCount - first);
m_model->insertRows(3, insertCount);
QCOMPARE(m_series->count(), m_modelRowCount + 2 * insertCount - first);
int countLimit = 6;
m_vMapper->setRowCount(countLimit);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 2 * insertCount - first));
m_model->insertRows(3, insertCount);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount - first));
m_vMapper->setFirstRow(0);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount + 3 * insertCount));
m_vMapper->setRowCount(-1);
QCOMPARE(m_series->count(), m_modelRowCount + 3 * insertCount);
}
void tst_qxymodelmapper::verticalModelRemoveRows()
{
// setup the mapper
createVerticalMapper();
QCOMPARE(m_series->count(), m_modelRowCount);
QVERIFY(m_vMapper->model() != 0);
int removeCount = 2;
m_model->removeRows(1, removeCount);
QCOMPARE(m_series->count(), m_modelRowCount - removeCount);
int first = 1;
m_vMapper->setFirstRow(first);
QCOMPARE(m_series->count(), m_modelRowCount - removeCount - first);
m_model->removeRows(1, removeCount);
QCOMPARE(m_series->count(), m_modelRowCount - 2 * removeCount - first);
int countLimit = 3;
m_vMapper->setRowCount(countLimit);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount - 2 * removeCount - first));
m_model->removeRows(1, removeCount);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount - 3 * removeCount - first));
m_vMapper->setFirstRow(0);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelRowCount - 3 * removeCount));
m_vMapper->setRowCount(-1);
QCOMPARE(m_series->count(), m_modelRowCount - 3 * removeCount);
}
void tst_qxymodelmapper::verticalModelInsertColumns()
{
// setup the mapper
createVerticalMapper();
QCOMPARE(m_series->count(), m_modelRowCount);
QVERIFY(m_vMapper->model() != 0);
int insertCount = 4;
m_model->insertColumns(3, insertCount);
QCOMPARE(m_series->count(), m_modelRowCount);
}
void tst_qxymodelmapper::verticalModelRemoveColumns()
{
// setup the mapper
createVerticalMapper();
QCOMPARE(m_series->count(), m_modelRowCount);
QVERIFY(m_vMapper->model() != 0);
int removeCount = m_modelColumnCount - 2;
m_model->removeColumns(0, removeCount);
QCOMPARE(m_series->count(), m_modelRowCount);
// leave only one column
m_model->removeColumns(0, m_modelColumnCount - removeCount - 1);
QCOMPARE(m_series->count(), 0);
}
void tst_qxymodelmapper::horizontalModelInsertRows()
{
// setup the mapper
createHorizontalMapper();
QCOMPARE(m_series->count(), m_modelColumnCount);
QVERIFY(m_hMapper->model() != 0);
int insertCount = 4;
m_model->insertRows(3, insertCount);
QCOMPARE(m_series->count(), m_modelColumnCount);
}
void tst_qxymodelmapper::horizontalModelRemoveRows()
{
// setup the mapper
createHorizontalMapper();
QCOMPARE(m_series->count(), m_modelColumnCount);
QVERIFY(m_hMapper->model() != 0);
int removeCount = m_modelRowCount - 2;
m_model->removeRows(0, removeCount);
QCOMPARE(m_series->count(), m_modelColumnCount);
// leave only one column
m_model->removeRows(0, m_modelRowCount - removeCount - 1);
QCOMPARE(m_series->count(), 0);
}
void tst_qxymodelmapper::horizontalModelInsertColumns()
{
// setup the mapper
createHorizontalMapper();
QCOMPARE(m_series->count(), m_modelColumnCount);
QVERIFY(m_hMapper->model() != 0);
int insertCount = 4;
m_model->insertColumns(3, insertCount);
QCOMPARE(m_series->count(), m_modelColumnCount + insertCount);
int first = 3;
m_hMapper->setFirstColumn(3);
QCOMPARE(m_series->count(), m_modelColumnCount + insertCount - first);
m_model->insertColumns(3, insertCount);
QCOMPARE(m_series->count(), m_modelColumnCount + 2 * insertCount - first);
int countLimit = 6;
m_hMapper->setColumnCount(countLimit);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 2 * insertCount - first));
m_model->insertColumns(3, insertCount);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount - first));
m_hMapper->setFirstColumn(0);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount + 3 * insertCount));
m_hMapper->setColumnCount(-1);
QCOMPARE(m_series->count(), m_modelColumnCount + 3 * insertCount);
}
void tst_qxymodelmapper::horizontalModelRemoveColumns()
{
// setup the mapper
createHorizontalMapper();
QCOMPARE(m_series->count(), m_modelColumnCount);
QVERIFY(m_hMapper->model() != 0);
int removeCount = 2;
m_model->removeColumns(1, removeCount);
QCOMPARE(m_series->count(), m_modelColumnCount - removeCount);
int first = 1;
m_hMapper->setFirstColumn(first);
QCOMPARE(m_series->count(), m_modelColumnCount - removeCount - first);
m_model->removeColumns(1, removeCount);
QCOMPARE(m_series->count(), m_modelColumnCount - 2 * removeCount - first);
int countLimit = 3;
m_hMapper->setColumnCount(countLimit);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount - 2 * removeCount - first));
m_model->removeColumns(1, removeCount);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount - 3 * removeCount - first));
m_hMapper->setFirstColumn(0);
QCOMPARE(m_series->count(), qMin(countLimit, m_modelColumnCount - 3 * removeCount));
m_hMapper->setColumnCount(-1);
QCOMPARE(m_series->count(), m_modelColumnCount - 3 * removeCount);
}
void tst_qxymodelmapper::modelUpdateCell()
{
// setup the mapper
createVerticalMapper();
QVERIFY(m_model->setData(m_model->index(1, 0), 44));
QCOMPARE(m_series->points().at(1).x(), 44.0);
QCOMPARE(m_model->data(m_model->index(1, 0)).toReal(), 44.0);
}
void tst_qxymodelmapper::verticalMapperSignals()
{
QVXYModelMapper *mapper = new QVXYModelMapper;
QSignalSpy spy0(mapper, SIGNAL(firstRowChanged()));
QSignalSpy spy1(mapper, SIGNAL(rowCountChanged()));
QSignalSpy spy2(mapper, SIGNAL(xColumnChanged()));
QSignalSpy spy3(mapper, SIGNAL(yColumnChanged()));
QSignalSpy spy4(mapper, SIGNAL(modelReplaced()));
QSignalSpy spy5(mapper, SIGNAL(seriesReplaced()));
mapper->setXColumn(0);
mapper->setYColumn(1);
mapper->setModel(m_model);
mapper->setSeries(m_series);
mapper->setFirstRow(1);
mapper->setRowCount(5);
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
QCOMPARE(spy3.count(), 1);
QCOMPARE(spy4.count(), 1);
QCOMPARE(spy5.count(), 1);
delete mapper;
}
void tst_qxymodelmapper::horizontalMapperSignals()
{
QHXYModelMapper *mapper = new QHXYModelMapper;
QSignalSpy spy0(mapper, SIGNAL(firstColumnChanged()));
QSignalSpy spy1(mapper, SIGNAL(columnCountChanged()));
QSignalSpy spy2(mapper, SIGNAL(xRowChanged()));
QSignalSpy spy3(mapper, SIGNAL(yRowChanged()));
QSignalSpy spy4(mapper, SIGNAL(modelReplaced()));
QSignalSpy spy5(mapper, SIGNAL(seriesReplaced()));
mapper->setXRow(0);
mapper->setYRow(1);
mapper->setModel(m_model);
mapper->setSeries(m_series);
mapper->setFirstColumn(1);
mapper->setColumnCount(5);
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
QCOMPARE(spy3.count(), 1);
QCOMPARE(spy4.count(), 1);
QCOMPARE(spy5.count(), 1);
delete mapper;
}
QTEST_MAIN(tst_qxymodelmapper)
#include "tst_qxymodelmapper.moc"