diff options
| author | Tero Ahola <tero.ahola@digia.com> | 2012-12-12 13:59:54 +0200 |
|---|---|---|
| committer | Tero Ahola <tero.ahola@digia.com> | 2012-12-12 14:40:02 +0200 |
| commit | c871e96450b9b14ef2b60abf3f91425f3c0eb488 (patch) | |
| tree | fc1691bbd481499d2488927ecaf0cb4ac4ed4752 /tests/auto | |
| parent | 47589136bb842582f0f6e33c1710c68da8a3f281 (diff) | |
Fixed a bug with QChart::axis getters with no series defined
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/chartdataset/tst_chartdataset.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qchart/tst_qchart.cpp | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index f19be8d7..38af86d0 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -264,6 +264,7 @@ void tst_ChartDataSet::removeAxis() m_dataset->removeAxis(axis); + QCOMPARE(m_dataset->axes().count(),0); QCOMPARE(m_dataset->series().count(),0); TRY_COMPARE(spy0.count(), 0); TRY_COMPARE(spy1.count(), 1); diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 4c6f5bc6..5fa266fd 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -431,14 +431,15 @@ void tst_QChart::removeAllSeries() m_view->show(); QTest::qWaitForWindowShown(m_view); m_chart->createDefaultAxes(); + QCOMPARE(m_chart->axes().count(), 2); QVERIFY(m_chart->axisY(series0)!=0); QVERIFY(m_chart->axisY(series1)!=0); QVERIFY(m_chart->axisY(series2)!=0); m_chart->removeAllSeries(); - QVERIFY(m_chart->axisY(series0)==0); - QVERIFY(m_chart->axisY(series1)==0); - QVERIFY(m_chart->axisY(series2)==0); + QCOMPARE(m_chart->axes().count(), 2); + QVERIFY(m_chart->axisX() != 0); + QVERIFY(m_chart->axisY() != 0); QCOMPARE(deleteSpy1.count(), 1); QCOMPARE(deleteSpy2.count(), 1); QCOMPARE(deleteSpy3.count(), 1); @@ -461,6 +462,8 @@ void tst_QChart::removeSeries() m_chart->setAxisY(axis,series); QCOMPARE(m_chart->axisY(series),axis); m_chart->removeSeries(series); + QCOMPARE(m_chart->axes().count(), 1); + QVERIFY(m_chart->axisY() != 0); QVERIFY(m_chart->axisY(series)==0); QCOMPARE(deleteSpy.count(), 0); } |