##// END OF EJS Templates
Removed some commented out code in barmodel mapper and replaced one comment with different one
Removed some commented out code in barmodel mapper and replaced one comment with different one

File last commit:

r2110:a93a773ef512
r2151:cdaf9997827b
Show More
tst_qcategoryaxis.cpp
307 lines | 7.9 KiB | text/x-c | CppLexer
Marek Rosa
Fixes and tests to Interval axis
r1708 /****************************************************************************
**
** 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$
**
****************************************************************************/
#include "../qabstractaxis/tst_qabstractaxis.h"
Marek Rosa
Renamed QCategoryAxis related files
r1817 #include "qcategoryaxis.h"
Marek Rosa
Fixes and tests to Interval axis
r1708 #include <qlineseries.h>
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 class tst_QCategoryAxis: public tst_QAbstractAxis
Marek Rosa
Fixes and tests to Interval axis
r1708 {
Q_OBJECT
public slots:
void initTestCase();
void cleanupTestCase();
void init();
void cleanup();
private slots:
Marek Rosa
Renamed QCategoryAxis related files
r1817 void qcategoryaxis_data();
void qcategoryaxis();
Marek Rosa
Fixes and tests to Interval axis
r1708
void max_raw_data();
void max_raw();
void max_data();
void max();
void max_animation_data();
void max_animation();
void min_raw_data();
void min_raw();
void min_data();
void min();
void min_animation_data();
void min_animation();
void range_raw_data();
void range_raw();
void range_data();
void range();
void range_animation_data();
void range_animation();
void interval_data();
void interval();
private:
Marek Rosa
Fixed range handling in categoryAxis
r1846 QCategoryAxis* m_categoryaxis;
Marek Rosa
Fixes and tests to Interval axis
r1708 QLineSeries* m_series;
};
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::initTestCase()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::cleanupTestCase()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::init()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis = new QCategoryAxis();
Marek Rosa
Fixes and tests to Interval axis
r1708 m_series = new QLineSeries();
*m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
Marek Rosa
Fixed range handling in categoryAxis
r1846 tst_QAbstractAxis::init(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
r1708 m_chart->addSeries(m_series);
m_chart->createDefaultAxes();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::cleanup()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
delete m_series;
Marek Rosa
Fixed range handling in categoryAxis
r1846 delete m_categoryaxis;
Marek Rosa
Fixes and tests to Interval axis
r1708 m_series = 0;
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis = 0;
Marek Rosa
Fixes and tests to Interval axis
r1708 tst_QAbstractAxis::cleanup();
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 void tst_QCategoryAxis::qcategoryaxis_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
}
Marek Rosa
Renamed QCategoryAxis related files
r1817 void tst_QCategoryAxis::qcategoryaxis()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
qabstractaxis();
Marek Rosa
Fixed range handling in categoryAxis
r1846 QVERIFY(qFuzzyIsNull(m_categoryaxis->max()));
QVERIFY(qFuzzyIsNull(m_categoryaxis->min()));
QCOMPARE(m_categoryaxis->type(), QAbstractAxis::AxisTypeCategory);
Marek Rosa
Fixes and tests to Interval axis
r1708
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
Marek Rosa
Fixed range handling in categoryAxis
r1846 QVERIFY(!qFuzzyIsNull(m_categoryaxis->max()));
QVERIFY(!qFuzzyIsNull(m_categoryaxis->min()));
Marek Rosa
Fixes and tests to Interval axis
r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max_raw_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QTest::addColumn<qreal>("max");
Marek Rosa
Updated documentation and tests on arm
r1822 QTest::newRow("1.0") << (qreal)1.0;
QTest::newRow("50.0") << (qreal)50.0;
QTest::newRow("101.0") << (qreal)101.0;
Marek Rosa
Fixes and tests to Interval axis
r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max_raw()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QFETCH(qreal, max);
Marek Rosa
Fixed range handling in categoryAxis
r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
r1708
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->setMax(max);
QVERIFY2(qFuzzyIsNull(m_categoryaxis->max() - max), "Not equal");
Marek Rosa
Fixes and tests to Interval axis
r1708
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 0);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
max_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
max_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max_animation_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
max_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::max_animation()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
max();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min_raw_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QTest::addColumn<qreal>("min");
Marek Rosa
Fix to QCategoryAxis tests
r1957 QTest::newRow("-1.0") << (qreal)-1.0;
QTest::newRow("-50.0") << (qreal)-50.0;
QTest::newRow("-101.0") << (qreal)-101.0;
Marek Rosa
Fixes and tests to Interval axis
r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min_raw()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QFETCH(qreal, min);
Marek Rosa
Fixed range handling in categoryAxis
r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
r1708
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->setMin(min);
QVERIFY2(qFuzzyIsNull(m_categoryaxis->min() - min), "Not equal");
Marek Rosa
Fixes and tests to Interval axis
r1708
QCOMPARE(spy0.count(), 0);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
min_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
min_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min_animation_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
min_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::min_animation()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
min();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range_raw_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QTest::addColumn<qreal>("min");
QTest::addColumn<qreal>("max");
Marek Rosa
Fix to QCategoryAxis tests
r1957 QTest::newRow("1.0 - 101.0") << (qreal)-1.0 << (qreal)101.0;
QTest::newRow("25.0 - 75.0") << (qreal)25.0 << (qreal)75.0;
QTest::newRow("101.0") << (qreal)40.0 << (qreal)60.0;
QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)10.0;
QTest::newRow("-35.0 - 0.0") << (qreal)-35.0 << (qreal)-15.0;
QTest::newRow("0.0 - 0.0") << (qreal)-0.1 << (qreal)0.1;
Marek Rosa
Fixes and tests to Interval axis
r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range_raw()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
QFETCH(qreal, min);
QFETCH(qreal, max);
Marek Rosa
Fixed range handling in categoryAxis
r1846 QSignalSpy spy0(m_categoryaxis, SIGNAL(maxChanged(qreal)));
QSignalSpy spy1(m_categoryaxis, SIGNAL(minChanged(qreal)));
Jani Honkonen
normalize signal/slot signatures
r2110 QSignalSpy spy2(m_categoryaxis, SIGNAL(rangeChanged(qreal,qreal)));
Marek Rosa
Fixes and tests to Interval axis
r1708
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->setRange(min, max);
QVERIFY2(qFuzzyIsNull(m_categoryaxis->min() - min), "Min not equal");
QVERIFY2(qFuzzyIsNull(m_categoryaxis->max() - max), "Max not equal");
Marek Rosa
Fixes and tests to Interval axis
r1708
QCOMPARE(spy0.count(), 1);
QCOMPARE(spy1.count(), 1);
QCOMPARE(spy2.count(), 1);
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
range_raw_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_chart->setAxisX(m_categoryaxis, m_series);
Marek Rosa
Fixes and tests to Interval axis
r1708 m_view->show();
QTest::qWaitForWindowShown(m_view);
range_raw();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range_animation_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
range_data();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::range_animation()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
m_chart->setAnimationOptions(QChart::GridAxisAnimations);
range();
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::interval_data()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
//
}
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 void tst_QCategoryAxis::interval()
Marek Rosa
Fixes and tests to Interval axis
r1708 {
// append one correct interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->append("first", (qreal)45);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->startValue("first"), (qreal)0);
QCOMPARE(m_categoryaxis->endValue("first"), (qreal)45);
Marek Rosa
Fixes and tests to Interval axis
r1708
// append one more correct interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->append("second", (qreal)75);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)45);
QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
r1708
// append one incorrect interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->append("third", (qreal)15);
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->endValue(m_categoryaxis->categoriesLabels().last()), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
r1708 // QCOMPARE(intervalMax("first"), (qreal)75);
// append one more correct interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->append("third", (qreal)100);
QCOMPARE(m_categoryaxis->count(), 3);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->startValue("third"), (qreal)75);
QCOMPARE(m_categoryaxis->endValue("third"), (qreal)100);
Marek Rosa
Fixes and tests to Interval axis
r1708
// remove one interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->remove("first");
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->startValue("second"), (qreal)0); // second interval should extend to firstInterval minimum
QCOMPARE(m_categoryaxis->endValue("second"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
r1708
Marek Rosa
Embedded compile fix
r1779 // remove one interval
Marek Rosa
Fixed range handling in categoryAxis
r1846 m_categoryaxis->replaceLabel("second", "replaced");
QCOMPARE(m_categoryaxis->count(), 2);
Marek Rosa
QCategoryAxis: renamed some functions according to review
r1847 QCOMPARE(m_categoryaxis->startValue("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
QCOMPARE(m_categoryaxis->endValue("replaced"), (qreal)75);
Marek Rosa
Fixes and tests to Interval axis
r1708 }
Marek Rosa
QIntervalsAxis renamed to QCategoryAxis
r1816 QTEST_MAIN(tst_QCategoryAxis)
Marek Rosa
Renamed QCategoryAxis related files
r1817 #include "tst_qcategoryaxis.moc"
Marek Rosa
Fixes and tests to Interval axis
r1708