diff options
Diffstat (limited to 'tests/auto/qml-qtquicktest/tst_xyseries.qml')
| -rw-r--r-- | tests/auto/qml-qtquicktest/tst_xyseries.qml | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/tests/auto/qml-qtquicktest/tst_xyseries.qml b/tests/auto/qml-qtquicktest/tst_xyseries.qml index 0a13b98f..4b57f314 100644 --- a/tests/auto/qml-qtquicktest/tst_xyseries.qml +++ b/tests/auto/qml-qtquicktest/tst_xyseries.qml @@ -18,9 +18,9 @@ ** ****************************************************************************/ -import QtQuick 1.0 -import QtQuickTest 1.0 -import QtCommercial.Chart 1.2 +import QtQuick 2.0 +import QtTest 1.0 +import QtCommercial.Chart 1.3 Rectangle { width: 400 @@ -57,23 +57,12 @@ Rectangle { function test_axes() { // Axis initialization - compare(chartView.axes.length, 2); - verify(chartView.axes[0] == lineSeries.axisX || chartView.axes[1] == lineSeries.axisX); - verify(chartView.axes[0] == lineSeries.axisY || chartView.axes[1] == lineSeries.axisY); + compare(chartView.axisX(), lineSeries.axisX); + compare(chartView.axisY(), lineSeries.axisY); compare(lineSeries.axisX, splineSeries.axisX); compare(lineSeries.axisY, splineSeries.axisY); compare(lineSeries.axisX, areaSeries.axisX); compare(lineSeries.axisY, areaSeries.axisY); - - // Set illegal axes - lineSeries.axisX = lineSeries.axisY; - compare(lineSeries.axisX, splineSeries.axisX); - lineSeries.axisXTop = lineSeries.axisX; - compare(lineSeries.axisX, splineSeries.axisX); - lineSeries.axisY = lineSeries.axisX; - compare(lineSeries.axisY, splineSeries.axisY); - lineSeries.axisYRight = lineSeries.axisY; - compare(lineSeries.axisY, splineSeries.axisY); } function test_append() { @@ -84,9 +73,9 @@ Rectangle { compare(lineSeries.count, count); compare(splineSeries.count, count); compare(scatterSeries.count, count); - tryCompare(lineSeriesPointAddedSpy.count, count); - tryCompare(splineSeriesPointAddedSpy.count, count); - tryCompare(scatterSeriesPointAddedSpy.count, count); + compare(lineSeriesPointAddedSpy.count, count); + compare(splineSeriesPointAddedSpy.count, count); + compare(scatterSeriesPointAddedSpy.count, count); clear(); compare(lineSeries.count, 0); compare(splineSeries.count, 0); @@ -103,9 +92,9 @@ Rectangle { compare(lineSeries.count, count); compare(splineSeries.count, count); compare(scatterSeries.count, count); - tryCompare(lineSeriesPointReplacedSpy.count, count); - tryCompare(splineSeriesPointReplacedSpy.count, count); - tryCompare(scatterSeriesPointReplacedSpy.count, count); + compare(lineSeriesPointReplacedSpy.count, count); + compare(splineSeriesPointReplacedSpy.count, count); + compare(scatterSeriesPointReplacedSpy.count, count); clear(); } @@ -122,9 +111,9 @@ Rectangle { compare(lineSeries.count, count * 2); compare(splineSeries.count, count * 2); compare(scatterSeries.count, count * 2); - tryCompare(lineSeriesPointAddedSpy.count, count); - tryCompare(splineSeriesPointAddedSpy.count, count); - tryCompare(scatterSeriesPointAddedSpy.count, count); + compare(lineSeriesPointAddedSpy.count, count); + compare(splineSeriesPointAddedSpy.count, count); + compare(scatterSeriesPointAddedSpy.count, count); clear(); } @@ -141,9 +130,9 @@ Rectangle { compare(lineSeries.count, 0); compare(splineSeries.count, 0); compare(scatterSeries.count, 0); - tryCompare(lineSeriesPointRemovedSpy.count, count); - tryCompare(splineSeriesPointRemovedSpy.count, count); - tryCompare(scatterSeriesPointRemovedSpy.count, count); + compare(lineSeriesPointRemovedSpy.count, count); + compare(splineSeriesPointRemovedSpy.count, count); + compare(scatterSeriesPointRemovedSpy.count, count); } // Not a test function, called from test functions |