##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Removes test_private form qmake, adds chaeck in soruce file of private tests
Removes test_private form qmake, adds chaeck in soruce file of private tests
Michal Klocek - - Load All Authors

File last commit:

r1977:0c7165b201ff
r1977:0c7165b201ff
Show More
tst_chartdataset.cpp
644 lines | 19.0 KiB | text/x-c | CppLexer
/ tests / auto / chartdataset / tst_chartdataset.cpp
History | Source | Raw |Copy content |Copy permalink
Michal Klocek
Updates chartdataset unit test
 r771 /****************************************************************************
**
** Copyright (C) 2012 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 Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial 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$
**
****************************************************************************/
Michal Klocek
Removes test_private form qmake, adds chaeck in soruce file of private tests
 r1977 #ifndef BUILD_PRIVATE_UNIT_TESTS
#include <QtTest/QtTest>
class tst_ChartDataSet: public QObject {
Q_OBJECT
private Q_SLOTS:
void skip();
};
void tst_ChartDataSet::skip()
{
QSKIP("This test requires the debug version of library", SkipAll);
}
QTEST_MAIN(tst_ChartDataSet)
#include "tst_chartdataset.moc"
#else
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds chartdata unit test
 r224 #include <QtTest/QtTest>
Michal Klocek
Refactors QAxis to QAbstractAxis...
 r1541 #include <qabstractaxis.h>
Marek Rosa
renamed QValueAxis related files
 r1805 #include <qvalueaxis.h>
Marek Rosa
renamed QBarCategoryAxis related files
 r1810 #include <qbarcategoryaxis.h>
Michal Klocek
Rename QLineChartSeries to QLineSeries
 r349 #include <qlineseries.h>
Michal Klocek
Update of chartdataset_tst
 r1564 #include <qareaseries.h>
#include <qscatterseries.h>
#include <qsplineseries.h>
#include <qpieseries.h>
sauimone
GroupedBarSeries to BarSeries
 r1594 #include <qbarseries.h>
Michal Klocek
Update of chartdataset_tst
 r1564 #include <qpercentbarseries.h>
#include <qstackedbarseries.h>
Michal Klocek
Adds chartdata unit test
 r224 #include <private/chartdataset_p.h>
#include <private/domain_p.h>
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 #include <tst_definitions.h>
Michal Klocek
Adds chartdata unit test
 r224
QTCOMMERCIALCHART_USE_NAMESPACE
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 Q_DECLARE_METATYPE(Domain *)
Michal Klocek
Refactors QAxis to QAbstractAxis...
 r1541 Q_DECLARE_METATYPE(QAbstractAxis *)
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 Q_DECLARE_METATYPE(QAbstractSeries *)
Michal Klocek
Update of chartdataset_tst
 r1564 Q_DECLARE_METATYPE(QList<QAbstractSeries *>)
Q_DECLARE_METATYPE(QList<QAbstractAxis *>)
Tero Ahola
Renamed QSeries to QAbstractSeries
 r988 Q_DECLARE_METATYPE(QLineSeries *)
Michal Klocek
Adds chartdata unit test
 r224
class tst_ChartDataSet: public QObject {
Michal Klocek
Updates chartdataset unit test
 r771 Q_OBJECT
public Q_SLOTS:
Michal Klocek
Adds chartdata unit test
 r224 void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
Michal Klocek
Updates chartdataset unit test
 r771 private Q_SLOTS:
Michal Klocek
Adds chartdata unit test
 r224 void chartdataset_data();
void chartdataset();
void addSeries_data();
void addSeries();
Michal Klocek
Update of chartdataset_tst
 r1564 void setAxisX_data();
void setAxisX();
void setAxisY_data();
void setAxisY();
Michal Klocek
Adds chartdata unit test
 r224 void removeSeries_data();
void removeSeries();
Michal Klocek
Adds RemoveAllSeries method to API
 r258 void removeAllSeries_data();
void removeAllSeries();
Michal Klocek
Fix indexing issue of series
 r910 void seriesCount_data();
void seriesCount();
Michal Klocek
Updates chartdataset unit test
 r771 void seriesIndex_data();
void seriesIndex();
void domain_data();
void domain();
void zoomInDomain_data();
void zoomInDomain();
void zoomOutDomain_data();
void zoomOutDomain();
void scrollDomain_data();
void scrollDomain();
Michal Klocek
Fix all tst_chartdataset test cases
 r1593
Michal Klocek
Refactor axis hadnling...
 r1078 private:
ChartDataSet* m_dataset;
Michal Klocek
Adds chartdata unit test
 r224 };
void tst_ChartDataSet::initTestCase()
{
Michal Klocek
Refactor domain model...
 r439 qRegisterMetaType<Domain*>();
Michal Klocek
Update of chartdataset_tst
 r1564 qRegisterMetaType<QAbstractAxis*>();
Tero Ahola
QSeries to QAbstractSeries in unit tests
 r989 qRegisterMetaType<QAbstractSeries*>();
Michal Klocek
Adds chartdata unit test
 r224 }
void tst_ChartDataSet::cleanupTestCase()
{
}
void tst_ChartDataSet::init()
{
Michal Klocek
Refactor axis hadnling...
 r1078 m_dataset = new ChartDataSet();
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Refactor axis hadnling...
 r1078
Michal Klocek
Adds chartdata unit test
 r224 void tst_ChartDataSet::cleanup()
{
Michal Klocek
Refactor axis hadnling...
 r1078 QList<QAbstractSeries*> series = m_dataset->series();
foreach(QAbstractSeries* serie, series)
{
m_dataset->removeSeries(serie);
}
Michal Klocek
Adds chartdata unit test
 r224 }
void tst_ChartDataSet::chartdataset_data()
{
}
void tst_ChartDataSet::chartdataset()
{
Michal Klocek
Update of chartdataset_tst
 r1564 QVERIFY(m_dataset->axisX(0) == 0);
QVERIFY(m_dataset->axisY(0) == 0);
Michal Klocek
Fix indexing issue of series
 r910 QLineSeries* series = new QLineSeries(this);
Michal Klocek
Refactor axis hadnling...
 r1078 QCOMPARE(m_dataset->seriesIndex(series),-1);
Michal Klocek
Update of chartdataset_tst
 r1564 QVERIFY(m_dataset->domain(series) == 0);
QVERIFY(m_dataset->axisX(series) == 0);
QVERIFY(m_dataset->axisY(series) == 0);
Michal Klocek
Refactor QChart API...
 r1577 m_dataset->createDefaultAxes();
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564
Michal Klocek
Adds chartdata unit test
 r224 void tst_ChartDataSet::addSeries_data()
{
Michal Klocek
Update of chartdataset_tst
 r1564 QTest::addColumn<QAbstractSeries*>("series");
QAbstractSeries* line = new QLineSeries(this);
QAbstractSeries* area = new QAreaSeries(static_cast<QLineSeries*>(line));
QAbstractSeries* scatter = new QScatterSeries(this);
QAbstractSeries* spline = new QSplineSeries(this);
QAbstractSeries* pie = new QPieSeries(this);
sauimone
GroupedBarSeries to BarSeries
 r1594 QAbstractSeries* bar = new QBarSeries(this);
Michal Klocek
Update of chartdataset_tst
 r1564 QAbstractSeries* percent = new QPercentBarSeries(this);
QAbstractSeries* stacked = new QStackedBarSeries(this);
QTest::newRow("line") << line;
QTest::newRow("area") << area;
QTest::newRow("scatter") << scatter;
QTest::newRow("spline") << spline;
QTest::newRow("pie") << pie;
QTest::newRow("bar") << bar;
QTest::newRow("percent") << percent;
QTest::newRow("stacked") << stacked;
}
void tst_ChartDataSet::addSeries()
{
Michal Klocek
Refactor domain model...
 r439
Michal Klocek
Update of chartdataset_tst
 r1564 QFETCH(QAbstractSeries*, series);
Michal Klocek
Refactor domain model...
 r439
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Refactor domain model...
 r439
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->addSeries(series);
Michal Klocek
Refactor QChart API...
 r1577 m_dataset->createDefaultAxes();
Michal Klocek
Update of chartdataset_tst
 r1564 if(series->type()==QAbstractSeries::SeriesTypePie){
TRY_COMPARE(spy0.count(), 0);
}else{
TRY_COMPARE(spy0.count(), 2);
}
TRY_COMPARE(spy1.count(), 0);
TRY_COMPARE(spy2.count(), 1);
TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564
void tst_ChartDataSet::setAxisX_data()
Michal Klocek
Adds chartdata unit test
 r224 {
Michal Klocek
Chartdataset fixes + tst update
 r1567 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
QTest::addColumn<QList<QAbstractAxis*> >("axisList");
QTest::addColumn<int>("axisCount");
Michal Klocek
Update of chartdataset_tst
 r1564
QAbstractSeries* line = new QLineSeries(this);
QAbstractSeries* area = new QAreaSeries(static_cast<QLineSeries*>(line));
QAbstractSeries* scatter = new QScatterSeries(this);
QAbstractSeries* spline = new QSplineSeries(this);
Tero Ahola
Fixed a couple of warnings on a test case under construction
 r1913 /*QAbstractSeries* pie = */new QPieSeries(this);
/*QAbstractSeries* bar = */new QBarSeries(this);
/*QAbstractSeries* percent = */new QPercentBarSeries(this);
/*QAbstractSeries* stacked = */new QStackedBarSeries(this);
Michal Klocek
Update of chartdataset_tst
 r1564
Michal Klocek
Chartdataset fixes + tst update
 r1567 QTest::newRow("line,spline,scatter: axis 0 axis1 axis 2")
<< (QList<QAbstractSeries*>() << line << spline << scatter)
Marek Rosa
class QValuesAxis renamed to QValueAxis
 r1804 << (QList<QAbstractAxis*>() << new QValueAxis(this) << new QValueAxis(this) << new QValueAxis(this)) << 3;
Michal Klocek
Chartdataset fixes + tst update
 r1567
QTest::newRow("area: axis 0") << (QList<QAbstractSeries*>() << area)
Marek Rosa
class QValuesAxis renamed to QValueAxis
 r1804 << (QList<QAbstractAxis*>() << new QValueAxis(this)) << 1;
Michal Klocek
Update of chartdataset_tst
 r1564
Michal Klocek
Chartdataset fixes + tst update
 r1567 QList<QAbstractAxis*> axes0;
Marek Rosa
class QValuesAxis renamed to QValueAxis
 r1804 axes0 << new QValueAxis(this) << new QValueAxis(this);
Michal Klocek
Chartdataset fixes + tst update
 r1567 axes0 << axes0.last();
QTest::newRow("line,spline,scatter: axis 0 axis1 axis 1")
<< (QList<QAbstractSeries*>() << line << spline << scatter)
<< axes0 << 2;
//TODO: add more test cases
Michal Klocek
Update of chartdataset_tst
 r1564 }
void tst_ChartDataSet::setAxisX()
{
QFETCH(QList<QAbstractSeries*>, seriesList);
QFETCH(QList<QAbstractAxis*>, axisList);
Michal Klocek
Refactor domain model...
 r439 QFETCH(int, axisCount);
Michal Klocek
Fix unit test
 r411
Michal Klocek
Update of chartdataset_tst
 r1564 Q_ASSERT(seriesList.count() == axisList.count());
QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *,Domain*)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Fix unit test
 r411
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList){
m_dataset->addSeries(series);
}
Michal Klocek
Fix unit test
 r411
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy0.count(), 0);
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy1.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy2.count(), seriesList.count());
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy4(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*)));
QSignalSpy spy5(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
for(int i=0 ; i < seriesList.count(); i++){
Michal Klocek
Fix tst_chartdataset
 r1696 m_dataset->setAxis(seriesList.at(i),axisList.at(i),Qt::Horizontal);
Michal Klocek
Update of chartdataset_tst
 r1564 }
TRY_COMPARE(spy4.count(), axisCount);
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy5.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy6.count(), 0);
TRY_COMPARE(spy7.count(), 0);
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 for(int i=0 ; i < seriesList.count(); i++){
QVERIFY(m_dataset->axisX(seriesList.at(i)) == axisList.at(i));
}
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564 void tst_ChartDataSet::setAxisY_data()
Michal Klocek
Adds chartdata unit test
 r224 {
Michal Klocek
Update of chartdataset_tst
 r1564 setAxisX_data();
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564 void tst_ChartDataSet::setAxisY()
Michal Klocek
Adds chartdata unit test
 r224 {
Michal Klocek
Update of chartdataset_tst
 r1564 QFETCH(QList<QAbstractSeries*>, seriesList);
QFETCH(QList<QAbstractAxis*>, axisList);
Michal Klocek
Refactor domain model...
 r439 QFETCH(int, axisCount);
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 Q_ASSERT(seriesList.count() == axisList.count());
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList){
m_dataset->addSeries(series);
}
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy0.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy1.count(), 0);
TRY_COMPARE(spy2.count(), seriesList.count());
TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy4(m_dataset, SIGNAL(axisAdded(QAbstractAxis*,Domain*)));
QSignalSpy spy5(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
QSignalSpy spy6(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
QSignalSpy spy7(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
for(int i=0 ; i < seriesList.count(); i++){
Michal Klocek
Fix tst_chartdataset
 r1696 m_dataset->setAxis(seriesList.at(i),axisList.at(i),Qt::Vertical);
Michal Klocek
Update of chartdataset_tst
 r1564 }
TRY_COMPARE(spy4.count(), axisCount);
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy5.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy6.count(), 0);
TRY_COMPARE(spy7.count(), 0);
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 for(int i=0 ; i < seriesList.count(); i++){
QVERIFY(m_dataset->axisY(seriesList.at(i)) == axisList.at(i));
}
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564 void tst_ChartDataSet::removeSeries_data()
Michal Klocek
Adds chartdata unit test
 r224 {
Michal Klocek
Update of chartdataset_tst
 r1564 addSeries_data();
}
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 void tst_ChartDataSet::removeSeries()
{
QFETCH(QAbstractSeries*, series);
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->addSeries(series);
Michal Klocek
Refactor QChart API...
 r1577 m_dataset->createDefaultAxes();
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis*, Domain *)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Krazy reported errors...
 r974
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->removeSeries(series);
Michal Klocek
Krazy reported errors...
 r974
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy0.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 if (series->type() == QAbstractSeries::SeriesTypePie) {
TRY_COMPARE(spy1.count(), 0);
}
else {
TRY_COMPARE(spy1.count(), 2);
}
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy2.count(), 0);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy3.count(), 1);
Michal Klocek
Adds chartdata unit test
 r224 }
Michal Klocek
Update of chartdataset_tst
 r1564 void tst_ChartDataSet::removeAllSeries_data()
Michal Klocek
Adds chartdata unit test
 r224 {
Michal Klocek
Update of chartdataset_tst
 r1564 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
QTest::addColumn<QList<QAbstractAxis*> >("axisList");
QTest::addColumn<int>("axisCount");
Michal Klocek
Adds chartdata unit test
 r224
Michal Klocek
Update of chartdataset_tst
 r1564 QTest::newRow("line,spline,scatter: axis 0 axis1 axis 2")
Michal Klocek
Chartdataset fixes + tst update
 r1567 << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QSplineSeries(this)
<< new QScatterSeries(this))
Marek Rosa
class QValuesAxis renamed to QValueAxis
 r1804 << (QList<QAbstractAxis*>() << new QValueAxis(this) << new QValueAxis(this)
<< new QValueAxis(this)) << 3;
Michal Klocek
Update of chartdataset_tst
 r1564 //TODO:
}
void tst_ChartDataSet::removeAllSeries()
{
QFETCH(QList<QAbstractSeries*>, seriesList);
QFETCH(QList<QAbstractAxis*>, axisList);
QFETCH(int, axisCount);
Michal Klocek
Adds RemoveAllSeries method to API
 r258
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Adds RemoveAllSeries method to API
 r258
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
Michal Klocek
Fix tst_chartdataset
 r1696 m_dataset->setAxis(seriesList.at(i), axisList.at(i),Qt::Horizontal);
Michal Klocek
Update of chartdataset_tst
 r1564 }
Michal Klocek
Adds RemoveAllSeries method to API
 r258
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *)));
QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Adds RemoveAllSeries method to API
 r258
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->removeAllSeries();
Michal Klocek
Adds RemoveAllSeries method to API
 r258
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy0.count(), 0);
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy1.count(), axisCount);
Michal Klocek
Update of chartdataset_tst
 r1564 TRY_COMPARE(spy2.count(), 0);
TRY_COMPARE(spy3.count(), seriesList.count());
Michal Klocek
Adds RemoveAllSeries method to API
 r258 }
Michal Klocek
Update of chartdataset_tst
 r1564
Michal Klocek
Fix indexing issue of series
 r910 void tst_ChartDataSet::seriesCount_data()
{
Michal Klocek
Update of chartdataset_tst
 r1564 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
QTest::addColumn<int>("seriesCount");
QTest::newRow("line,line, line, spline 3") << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QLineSeries(this) << new QLineSeries(this) << new QSplineSeries(this) ) << 3;
QTest::newRow("scatter,scatter, line, line 2") << (QList<QAbstractSeries*>() << new QScatterSeries(this) << new QScatterSeries(this) << new QLineSeries(this) << new QLineSeries(this) ) << 2;
Michal Klocek
Fix indexing issue of series
 r910 }
void tst_ChartDataSet::seriesCount()
{
Michal Klocek
Update of chartdataset_tst
 r1564 QFETCH(QList<QAbstractSeries*>, seriesList);
QFETCH(int, seriesCount);
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList){
m_dataset->addSeries(series);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 QCOMPARE(m_dataset->seriesCount(seriesList.at(0)->type()),seriesCount);
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy0.count(), 0);
TRY_COMPARE(spy1.count(), 0);
TRY_COMPARE(spy2.count(), 0);
TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Fix indexing issue of series
 r910 }
Michal Klocek
Updates chartdataset unit test
 r771 void tst_ChartDataSet::seriesIndex_data()
{
Michal Klocek
Update of chartdataset_tst
 r1564 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
QTest::newRow("line,line, line, spline") << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QLineSeries(this) << new QLineSeries(this) << new QSplineSeries(this) );
QTest::newRow("scatter,scatter, line, line") << (QList<QAbstractSeries*>() << new QScatterSeries(this) << new QScatterSeries(this) << new QLineSeries(this) << new QLineSeries(this) );
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::seriesIndex()
{
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 QFETCH(QList<QAbstractSeries*>, seriesList);
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Update of chartdataset_tst
 r1564 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *,Domain*)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*,Domain*)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)));
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
}
Michal Klocek
Updates chartdataset unit test
 r771
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy0.count(), 0);
TRY_COMPARE(spy1.count(), 0);
TRY_COMPARE(spy2.count(), 0);
TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList) {
m_dataset->removeSeries(series);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), -1);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->removeSeries(seriesList.at(1));
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
if (i != 1)
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
else
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), -1);
}
Michal Klocek
Fix indexing issue of series
 r910
Michal Klocek
Update of chartdataset_tst
 r1564 m_dataset->addSeries(seriesList.at(1));
for (int i = 0; i < seriesList.count(); i++) {
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
}
m_dataset->removeSeries(seriesList.at(2));
for (int i = 0; i < seriesList.count(); i++) {
if (i != 2)
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
else
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), -1);
}
m_dataset->removeSeries(seriesList.at(0));
for (int i = 0; i < seriesList.count(); i++) {
if (i != 2 && i != 0)
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
else
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), -1);
}
m_dataset->addSeries(seriesList.at(2));
m_dataset->addSeries(seriesList.at(0));
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Update of chartdataset_tst
 r1564 for (int i = 0; i < seriesList.count(); i++) {
if (i == 2)
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), 0);
else if (i == 0)
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), 2);
else
QCOMPARE(m_dataset->seriesIndex(seriesList.at(i)), i);
}
}
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568
Michal Klocek
Updates chartdataset unit test
 r771 void tst_ChartDataSet::domain_data()
{
addSeries_data();
}
void tst_ChartDataSet::domain()
{
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 QFETCH(QAbstractSeries*, series);
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 QSignalSpy spy0(m_dataset, SIGNAL(axisAdded(QAbstractAxis *, Domain *)));
QSignalSpy spy1(m_dataset, SIGNAL(axisRemoved(QAbstractAxis *)));
Michal Klocek
Refactor axis hadnling...
 r1078 QSignalSpy spy2(m_dataset, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
QSignalSpy spy3(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries *)));
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 m_dataset->addSeries(series);
QVERIFY(m_dataset->domain(series));
Michal Klocek
Refactor QChart API...
 r1577 TRY_COMPARE(spy0.count(), 0);
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy1.count(), 0);
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 TRY_COMPARE(spy2.count(), 1);
QList<QVariant> arguments = spy2.takeFirst();
Domain *domain = (Domain *) arguments.at(1).value<Domain *>();
QVERIFY(m_dataset->domain(series) == domain);
Tero Ahola
Auto tests involving signal spys to wait before comparisons
 r1109 TRY_COMPARE(spy3.count(), 0);
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::zoomInDomain_data()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QTest::addColumn<bool >("sameAxis");
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 QTest::addColumn<QList<QAbstractSeries*> >("seriesList");
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QTest::newRow("sameAxis: line,line, line, spline") << true << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QLineSeries(this) << new QLineSeries(this) << new QSplineSeries(this) );
QTest::newRow("separeateAxis: line,line, line, spline") << false << (QList<QAbstractSeries*>() << new QLineSeries(this) << new QLineSeries(this) << new QLineSeries(this) << new QSplineSeries(this) );
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::zoomInDomain()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QFETCH(bool, sameAxis);
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 QFETCH(QList<QAbstractSeries*>, seriesList);
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 if(sameAxis) m_dataset->createDefaultAxes();
Michal Klocek
Adds createDefaultAxes logic
 r1588
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 QList<QSignalSpy*> spyList;
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 foreach(QAbstractSeries* series, seriesList) {
Michal Klocek
Refactors Domain and Axis...
 r1698 spyList << new QSignalSpy(m_dataset->domain(series),SIGNAL(updated()));
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 }
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Adds zoomIn testcase to tst_chartdataset
 r1568 m_dataset->zoomInDomain(QRect(0, 0, 100, 100), QSize(1000, 1000));
foreach(QSignalSpy* spy, spyList) {
TRY_COMPARE(spy->count(), 1);
}
qDeleteAll(spyList);
Michal Klocek
Updates chartdataset unit test
 r771 }
Michal Klocek
Fix all tst_chartdataset test cases
 r1593
Michal Klocek
Updates chartdataset unit test
 r771 void tst_ChartDataSet::zoomOutDomain_data()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 zoomInDomain_data();
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::zoomOutDomain()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QFETCH(bool, sameAxis);
QFETCH(QList<QAbstractSeries*>, seriesList);
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 if (sameAxis)
m_dataset->createDefaultAxes();
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QList<QSignalSpy*> spyList;
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 foreach(QAbstractSeries* series, seriesList) {
Michal Klocek
Refactors Domain and Axis...
 r1698 spyList << new QSignalSpy(m_dataset->domain(series), SIGNAL(updated()));
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 }
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 m_dataset->zoomOutDomain(QRect(0, 0, 100, 100), QSize(1000, 1000));
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 foreach(QSignalSpy* spy, spyList) {
TRY_COMPARE(spy->count(), 1);
}
qDeleteAll (spyList);
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::scrollDomain_data()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 zoomInDomain_data();
Michal Klocek
Updates chartdataset unit test
 r771 }
void tst_ChartDataSet::scrollDomain()
{
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QFETCH(bool, sameAxis);
QFETCH(QList<QAbstractSeries*>, seriesList);
foreach(QAbstractSeries* series, seriesList) {
m_dataset->addSeries(series);
}
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 if (sameAxis)
m_dataset->createDefaultAxes();
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 QList<QSignalSpy*> spyList;
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 foreach(QAbstractSeries* series, seriesList) {
spyList
<< new QSignalSpy(m_dataset->domain(series),
Michal Klocek
Refactors Domain and Axis...
 r1698 SIGNAL(updated()));
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 }
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 m_dataset->scrollDomain(10, 10, QSize(1000, 1000));
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 foreach(QSignalSpy* spy, spyList) {
TRY_COMPARE(spy->count(), 1);
}
Michal Klocek
Updates chartdataset unit test
 r771
Michal Klocek
Fix all tst_chartdataset test cases
 r1593 qDeleteAll(spyList);
Michal Klocek
Updates chartdataset unit test
 r771 }
Michal Klocek
Fix all tst_chartdataset test cases
 r1593
Michal Klocek
Adds chartdata unit test
 r224 QTEST_MAIN(tst_ChartDataSet)
#include "tst_chartdataset.moc"
Michal Klocek
Removes test_private form qmake, adds chaeck in soruce file of private tests
 r1977 #endif