diff options
Diffstat (limited to 'tests/auto')
78 files changed, 1448 insertions, 347 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index c528b34a..a0915009 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -2,26 +2,14 @@ error( "Couldn't find the tests.pri file!" ) } -greaterThan(QT_MAJOR_VERSION, 4) { QT += testlib widgets -} else { - CONFIG += qtestlib -} -!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") -android { - # Workaround to fix android deployment, which seems to always look for target in - # OUT_PWD instead of DESTDIR. Need to override the QMAKE_POST_LINK setting done - # in tests.pri, as "tst_" was prepended to the target. - COPY_PARAMETERS = "$$CHART_BUILD_BIN_DIR/lib$${TARGET}.so $$OUT_PWD/lib$${TARGET}.so" - contains(QMAKE_HOST.os, Windows): COPY_PARAMETERS = $$replace(COPY_PARAMETERS, "/","\\") - QMAKE_POST_LINK += $$QMAKE_COPY $$COPY_PARAMETERS -} +!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") INCLUDEPATH += ../inc HEADERS += ../inc/tst_definitions.h -OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET -MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET -UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET -RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET +#Define for unit tests +CONFIG(debug, debug|release) { + DEFINES += BUILD_PRIVATE_UNIT_TESTS +} diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 416b2372..32d49fa4 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,7 +1,3 @@ -!include( ../tests.pri ) { - error( "Couldn't find the tests.pri file!" ) -} - TEMPLATE = subdirs SUBDIRS += \ qchartview \ @@ -28,27 +24,12 @@ SUBDIRS += \ chartdataset \ qlegend -contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) { - warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.") -} else { - !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative): SUBDIRS += qml - - # Check if QtQuickTest is installed - exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){ - SUBDIRS += qml-qtquicktest - } else { - warning("QtQuickTest not found; cannot build QML api unit tests") - } -} - !linux-arm*: { SUBDIRS += \ qdatetimeaxis } -contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) { - SUBDIRS += quick2 +qtHaveModule(quick) { + SUBDIRS += qml \ + qml-qtquicktest } - - - diff --git a/tests/auto/chartdataset/chartdataset.pro b/tests/auto/chartdataset/chartdataset.pro index 9a7880de..994532ae 100644 --- a/tests/auto/chartdataset/chartdataset.pro +++ b/tests/auto/chartdataset/chartdataset.pro @@ -2,4 +2,6 @@ error( "Couldn't find the auto.pri file!" ) } +QT += charts-private + SOURCES += tst_chartdataset.cpp diff --git a/tests/auto/chartdataset/tst_chartdataset.cpp b/tests/auto/chartdataset/tst_chartdataset.cpp index 4bd1441e..2a0f9637 100644 --- a/tests/auto/chartdataset/tst_chartdataset.cpp +++ b/tests/auto/chartdataset/tst_chartdataset.cpp @@ -31,11 +31,7 @@ private Q_SLOTS: void tst_ChartDataSet::skip() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("This test requires the debug version of library"); -#else - QSKIP("This test requires the debug version of library", SkipAll); -#endif } QTEST_MAIN(tst_ChartDataSet) @@ -63,7 +59,7 @@ QTEST_MAIN(tst_ChartDataSet) #include <private/abstractdomain_p.h> #include <tst_definitions.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(AbstractDomain *) Q_DECLARE_METATYPE(QAbstractAxis *) diff --git a/tests/auto/domain/domain.pro b/tests/auto/domain/domain.pro index 8c9af3d7..f0e90136 100644 --- a/tests/auto/domain/domain.pro +++ b/tests/auto/domain/domain.pro @@ -2,4 +2,6 @@ error( "Couldn't find the auto.pri file!" ) } +QT += charts-private + SOURCES += tst_domain.cpp diff --git a/tests/auto/domain/tst_domain.cpp b/tests/auto/domain/tst_domain.cpp index d9c853b4..33b68a10 100644 --- a/tests/auto/domain/tst_domain.cpp +++ b/tests/auto/domain/tst_domain.cpp @@ -32,11 +32,7 @@ private Q_SLOTS: void tst_Domain::skip() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("This test requires the debug version of library"); -#else - QSKIP("This test requires the debug version of library", SkipAll); -#endif } QTEST_MAIN(tst_Domain) @@ -49,7 +45,7 @@ QTEST_MAIN(tst_Domain) #include <private/qabstractaxis_p.h> #include <tst_definitions.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(XYDomain*) Q_DECLARE_METATYPE(QSizeF) diff --git a/tests/auto/inc/tst_definitions.h b/tests/auto/inc/tst_definitions.h index 12963e78..6dd4a837 100644 --- a/tests/auto/inc/tst_definitions.h +++ b/tests/auto/inc/tst_definitions.h @@ -21,11 +21,10 @@ #ifndef TST_DEFINITIONS_H #define TST_DEFINITIONS_H -#include "qpolarchart.h" +#include <QtCharts/qpolarchart.h> #include <QtTest/QtTest> #include <QPushButton> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) namespace QTest { // This was deprecated in Qt5. This is a small hack for the sake of compatibility. @@ -34,7 +33,6 @@ namespace QTest return QTest::qWaitForWindowExposed(window); } } -#endif #define TRY_COMPARE(actual, expected) { \ do { \ @@ -51,7 +49,6 @@ namespace QTest // Some bamboo clients have trouble passing mouse events to the test application. // This can be used to skip those tests so that they don't show up as a failure // in the test report. -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \ do { \ QPushButton b; \ @@ -74,30 +71,6 @@ namespace QTest if (!isPolarTest()) \ QSKIP("Test not supported by cartesian chart"); \ } -#else - #define SKIP_IF_CANNOT_TEST_MOUSE_EVENTS() { \ - do { \ - QPushButton b; \ - b.resize(100, 100); \ - b.show(); \ - QTest::qWaitForWindowShown(&b); \ - QSignalSpy spy(&b, SIGNAL(clicked())); \ - QTest::mouseClick(&b, Qt::LeftButton, 0, b.rect().center()); \ - if (spy.count() == 0) \ - QSKIP("Cannot test mouse events in this environment", SkipAll); \ - } while (0); \ - } - - #define SKIP_ON_POLAR() { \ - if (isPolarTest()) \ - QSKIP("Test not supported by polar chart", SkipAll); \ - } - - #define SKIP_ON_CARTESIAN() { \ - if (!isPolarTest()) \ - QSKIP("Test not supported by cartesian chart", SkipAll); \ - } -#endif static inline bool isPolarTest() { @@ -112,12 +85,12 @@ static inline bool isPolarTest() return isPolar; } -static inline QtCommercialChart::QChart *newQChartOrQPolarChart() +static inline QtCharts::QChart *newQChartOrQPolarChart() { if (isPolarTest()) - return new QtCommercialChart::QPolarChart(); + return new QtCharts::QPolarChart(); else - return new QtCommercialChart::QChart(); + return new QtCharts::QChart(); } diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp index d9cbebd4..4df20372 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.cpp +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.cpp @@ -135,11 +135,7 @@ void tst_QAbstractAxis::axisPenColor_data() void tst_QAbstractAxis::axisPenColor() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("Test is not implemented. This is deprecated function"); -#else - QSKIP("Test is not implemented. This is deprecated function", SkipAll); -#endif } void tst_QAbstractAxis::gridLinePen_data() @@ -404,11 +400,7 @@ void tst_QAbstractAxis::labelsColor_data() void tst_QAbstractAxis::labelsColor() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("Test is not implemented. This is deprecated function"); -#else - QSKIP("Test is not implemented. This is deprecated function", SkipAll); -#endif } void tst_QAbstractAxis::labelsFont_data() @@ -633,11 +625,7 @@ void tst_QAbstractAxis::shadesBorderColor_data() void tst_QAbstractAxis::shadesBorderColor() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("Test is not implemented. This is deprecated function"); -#else - QSKIP("Test is not implemented. This is deprecated function", SkipAll); -#endif } void tst_QAbstractAxis::shadesBrush_data() @@ -687,11 +675,7 @@ void tst_QAbstractAxis::shadesColor_data() // public QColor shadesColor() const void tst_QAbstractAxis::shadesColor() { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) QSKIP("Test is not implemented. This is deprecated function"); -#else - QSKIP("Test is not implemented. This is deprecated function", SkipAll); -#endif } void tst_QAbstractAxis::shadesPen_data() diff --git a/tests/auto/qabstractaxis/tst_qabstractaxis.h b/tests/auto/qabstractaxis/tst_qabstractaxis.h index 8e9d1b27..2ca5107a 100644 --- a/tests/auto/qabstractaxis/tst_qabstractaxis.h +++ b/tests/auto/qabstractaxis/tst_qabstractaxis.h @@ -26,7 +26,7 @@ #include <qabstractaxis.h> #include <qchartview.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_QAbstractAxis : public QObject { diff --git a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp index 3fc51f8f..0e9fef5a 100644 --- a/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp +++ b/tests/auto/qbarmodelmapper/tst_qbarmodelmapper.cpp @@ -29,7 +29,7 @@ #include <qhbarmodelmapper.h> #include <QStandardItemModel> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_qbarmodelmapper : public QObject { diff --git a/tests/auto/qbarseries/tst_qbarseries.cpp b/tests/auto/qbarseries/tst_qbarseries.cpp index f2c056a0..c9265e38 100644 --- a/tests/auto/qbarseries/tst_qbarseries.cpp +++ b/tests/auto/qbarseries/tst_qbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QList<QBarSet*>) diff --git a/tests/auto/qbarset/tst_qbarset.cpp b/tests/auto/qbarset/tst_qbarset.cpp index 74db42f0..4c937dce 100644 --- a/tests/auto/qbarset/tst_qbarset.cpp +++ b/tests/auto/qbarset/tst_qbarset.cpp @@ -24,7 +24,7 @@ #include <qchartview.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_QBarSet : public QObject { diff --git a/tests/auto/qchart/tst_qchart.cpp b/tests/auto/qchart/tst_qchart.cpp index 54cd5621..18ae868c 100644 --- a/tests/auto/qchart/tst_qchart.cpp +++ b/tests/auto/qchart/tst_qchart.cpp @@ -33,7 +33,7 @@ #include <qbarcategoryaxis.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QAbstractAxis *) Q_DECLARE_METATYPE(QValueAxis *) diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index ab404370..f8264bad 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -19,13 +19,13 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <qchartview.h> -#include <qlineseries.h> +#include <QtCharts/qchartview.h> +#include <QtCharts/qlineseries.h> #include <cmath> #include <tst_definitions.h> -#include <qvalueaxis.h> +#include <QtCharts/qvalueaxis.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QChart*) diff --git a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp index de5b868f..5294ff2c 100644 --- a/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp +++ b/tests/auto/qhorizontalbarseries/tst_qhorizontalbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp index e03f0d0e..63afbb2a 100644 --- a/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp +++ b/tests/auto/qhorizontalpercentbarseries/tst_qhorizontalpercentbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp index b25df764..df4f0837 100644 --- a/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp +++ b/tests/auto/qhorizontalstackedbarseries/tst_qhorizontalstackedbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qlegend/tst_qlegend.cpp b/tests/auto/qlegend/tst_qlegend.cpp index a4899a5e..7f14a43a 100644 --- a/tests/auto/qlegend/tst_qlegend.cpp +++ b/tests/auto/qlegend/tst_qlegend.cpp @@ -33,7 +33,7 @@ #include <qbarlegendmarker.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_QLegend : public QObject { diff --git a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro index 94062270..d9a1e74f 100644 --- a/tests/auto/qml-qtquicktest/qml-qtquicktest.pro +++ b/tests/auto/qml-qtquicktest/qml-qtquicktest.pro @@ -2,12 +2,8 @@ error( "Couldn't find the auto.pri file!" ) } -greaterThan(QT_MAJOR_VERSION, 4) { - TEMPLATE = app - CONFIG += warn_on qmltestcase - SOURCES += main.cpp - OTHER_FILES += tst_*.qml - DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\" -} else { - error("These auto tests are designed for Qt5 / QtQuick 2.0") -} +TEMPLATE = app +CONFIG += warn_on qmltestcase +SOURCES += main.cpp +OTHER_FILES += tst_*.qml +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD\\\"\" diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml index eae2364a..f936237c 100644 --- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml +++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 @@ -87,7 +87,7 @@ Rectangle { id: axisX categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ] } - axisY: ValuesAxis { + axisY: ValueAxis { id: axisY min: 0 max: 10 diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml index 6e21b990..e3f55b13 100644 --- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml index d40c407c..61b35443 100644 --- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml index 7b714ad5..aced30ac 100644 --- a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml new file mode 100644 index 00000000..96d23b34 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_barcategoryaxis_1_4.qml @@ -0,0 +1,118 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest BarCategoryAxis 1.4" + when: windowShown + + function test_minMax() { + compare(barSeries1.axisX.min, "Jan", "AxisX min"); + compare(barSeries1.axisX.max, "Jun", "AxisX max"); + compare(barSeries1.axisY.min, 0, "AxisY min"); + compare(barSeries1.axisY.max, 10, "AxisY max"); + } + + function test_categories() { + compare(barSeries1.axisX.count, 6, "AxisX count"); + categoriesCountChangedSpy.clear(); + categoriesChangedSpy.clear(); + + // Replace categories + barSeries1.axisX.categories = ["Tam", "Hel", "Maa", "Huh"]; + compare(barSeries1.axisX.count, 4, "AxisX count"); + compare(categoriesCountChangedSpy.count, 1, "onCountChanged"); + compare(categoriesChangedSpy.count, 1, "onCategoriesChanged"); + + // Reset the original categories + barSeries1.axisX.categories = ["Jan", "Feb", "Mar", "Apr", "May", "Jun"] + compare(barSeries1.axisX.count, 6, "AxisX count"); + compare(categoriesCountChangedSpy.count, 2, "onCountChanged"); + compare(categoriesChangedSpy.count, 2, "onCategoriesChanged"); + } + + function test_minMaxChanged() { + axisY.min = -1; + compare(minChangedSpy.count, 1, "onMinChanged"); + compare(maxChangedSpy.count, 0, "onMaxChanged"); + axisY.max = 12; + compare(minChangedSpy.count, 1, "onMinChanged"); + compare(maxChangedSpy.count, 1, "onMaxChanged"); + } + + function test_seriesAxisClear() { + verify(barSeries1.axisX.min !== "", "barSeries1.axisX.min"); + verify(barSeries1.axisX.max !== "", "barSeries1.axisX.max"); + verify(barSeries1.axisX.count !== 0, "barSeries1.axisX.count"); // category count + barSeries1.axisX.clear(); + verify(barSeries1.axisX.min === "", "barSeries1.axisX.min"); + verify(barSeries1.axisX.max === "", "barSeries1.axisX.max"); + verify(barSeries1.axisX.count === 0); + } + + } + + ChartView { + id: chartView + anchors.fill: parent + + BarSeries { + id: barSeries1 + axisX: BarCategoryAxis { + id: axisX + categories: ["Jan", "Feb", "Mar", "Apr", "May", "Jun" ] + } + axisY: ValueAxis { + id: axisY + min: 0 + max: 10 + } + } + + SignalSpy { + id: categoriesCountChangedSpy + target: axisX + signalName: "countChanged" + } + SignalSpy { + id: categoriesChangedSpy + target: axisX + signalName: "categoriesChanged" + } + SignalSpy { + id: minChangedSpy + target: axisY + signalName: "minChanged" + } + SignalSpy { + id: maxChangedSpy + target: axisY + signalName: "maxChanged" + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_barseries.qml b/tests/auto/qml-qtquicktest/tst_barseries.qml index c5a5cfb7..fb80a744 100644 --- a/tests/auto/qml-qtquicktest/tst_barseries.qml +++ b/tests/auto/qml-qtquicktest/tst_barseries.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml b/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml index 5253019c..b2d1c199 100644 --- a/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_barseries_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml b/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml index d4c2d878..8c859596 100644 --- a/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_barseries_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml index bcc7ac15..4f9ae5fc 100644 --- a/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_barseries_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_barseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_barseries_1_4.qml new file mode 100644 index 00000000..0a2607dd --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_barseries_1_4.qml @@ -0,0 +1,163 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest BarSeries 1.4" + when: windowShown + + function test_properties() { + compare(barSeries.barWidth, 0.5); + compare(barSeries.labelsVisible, false); + compare(barSeries.labelsPosition, BarSeries.LabelsCenter); + } + + function test_setproperties() { + var set = barSeries.append("property", [1, 2, 3]) + compare(set.brushFilename, ""); + } + + function test_axes() { + verify(chartView.axisX() == barSeries.axisX); + verify(chartView.axisY() == barSeries.axisY); + + compare(barSeries.axisX, stackedBarSeries.axisX); + compare(barSeries.axisY, stackedBarSeries.axisY); + + compare(barSeries.axisX, percentBarSeries.axisX); + compare(barSeries.axisY, percentBarSeries.axisY); + } + + function test_append() { + var setCount = 5; + var valueCount = 50; + addedSpy.clear(); + append(setCount, valueCount); + + compare(barSeries.count, setCount); + for (var k = 0; k < setCount; k++) { + compare(barSeries.at(k).count, valueCount); + compare(barSeries.at(k).label, "barset" + k); + } + compare(addedSpy.count, setCount); + + barSeries.clear(); + compare(barSeries.count, 0); + } + + function test_insert() { + var setCount = 5; + var valueCount = 50; + addedSpy.clear(); + append(setCount, valueCount); + + for (var i = 0; i < setCount; i++) { + var values = []; + for (var j = 0; j < valueCount; j++) + values[j] = Math.random() * 10; + var set = barSeries.insert(i, "barset" + i, values); + compare(set.label, "barset" + i); + } + + compare(barSeries.count, setCount * 2); + for (var k = 0; k < setCount * 2; k++) + compare(barSeries.at(k).count, valueCount); + compare(addedSpy.count, 2 * setCount); + + barSeries.clear(); + compare(barSeries.count, 0); + } + + function test_signals() { + labelsPositionSpy.clear(); + barSeries.labelsPosition = BarSeries.LabelsOutsideEnd; + compare(labelsPositionSpy.count, 1, "onLabelsPositionChanged") + } + + function test_remove() { + var setCount = 5; + var valueCount = 50; + removedSpy.clear(); + append(setCount, valueCount); + + for (var k = 0; k < setCount; k++) + barSeries.remove(barSeries.at(0)); + + compare(barSeries.count, 0); + compare(removedSpy.count, setCount); + } + + // Not a test function, used by one or more test functions + function append(setCount, valueCount) { + for (var i = 0; i < setCount; i++) { + var values = []; + for (var j = 0; j < valueCount; j++) + values[j] = Math.random() * 10; + barSeries.append("barset" + i, values); + } + } + } + + ChartView { + id: chartView + anchors.fill: parent + + BarSeries { + id: barSeries + name: "bar" + axisX: BarCategoryAxis {} + axisY: ValueAxis { min: 0; max: 10 } + + SignalSpy { + id: addedSpy + target: barSeries + signalName: "barsetsAdded" + } + SignalSpy { + id: removedSpy + target: barSeries + signalName: "barsetsRemoved" + } + SignalSpy { + id: labelsPositionSpy + target: barSeries + signalName: "labelsPositionChanged" + } + } + + StackedBarSeries { + id: stackedBarSeries + name: "stackedBar" + } + + PercentBarSeries { + id: percentBarSeries + name: "percentBar" + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries.qml index 22a6e1bf..860f3a80 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml index 78c187eb..84ca79b2 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml new file mode 100644 index 00000000..bd4adc20 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml @@ -0,0 +1,100 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest BoxPlotSeries 1.4" + when: windowShown + + function test_properties() { + compare(boxPlotSeries.boxWidth, 0.5); + compare(boxPlotSeries.brushFilename, ""); + } + + function test_setproperties() { + var set = boxPlotSeries.append("boxplot", [1, 2, 5, 6, 8]); + compare(set.label, "boxplot"); + compare(set.count, 5); + compare(set.brushFilename, ""); + } + + function test_append() { + boxPlotSeries.clear(); + addedSpy.clear(); + countChangedSpy.clear(); + var count = 50; + for (var i = 0; i < count; i++) + boxPlotSeries.append("boxplot" + i, Math.random()); + compare(addedSpy.count, count); + compare(countChangedSpy.count, count); + compare(boxPlotSeries.count, count) + boxPlotSeries.clear(); + } + + function test_remove() { + boxPlotSeries.clear(); + removedSpy.clear(); + countChangedSpy.clear(); + var count = 50; + for (var i = 0; i < count; i++) + boxPlotSeries.append("boxplot" + i, Math.random()); + for (var j = 0; j < count; j++) + boxPlotSeries.remove(boxPlotSeries.at(0)); + compare(removedSpy.count, count); + compare(countChangedSpy.count, 2 * count); + compare(boxPlotSeries.count, 0) + } + } + + ChartView { + id: chartView + anchors.fill: parent + + BoxPlotSeries { + id: boxPlotSeries + name: "boxplot" + BoxSet { label: "Jan"; values: [3, 4, 5.1, 6.2, 8.5] } + + SignalSpy { + id: addedSpy + target: boxPlotSeries + signalName: "boxsetsAdded" + } + SignalSpy { + id: removedSpy + target: boxPlotSeries + signalName: "boxsetsRemoved" + } + SignalSpy { + id: countChangedSpy + target: boxPlotSeries + signalName: "countChanged" + } + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis.qml index 5248eeb6..a19c59ae 100644 --- a/tests/auto/qml-qtquicktest/tst_categoryaxis.qml +++ b/tests/auto/qml-qtquicktest/tst_categoryaxis.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 @@ -53,7 +53,7 @@ Rectangle { LineSeries { id: lineSeries1 - axisX: ValuesAxis { + axisX: ValueAxis { id: axisX min: 0 max: 10 diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml index 8b10ad9b..1e865fb3 100644 --- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml index f29b04b2..019fa667 100644 --- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml index 9fbb0b2a..a3899285 100644 --- a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml new file mode 100644 index 00000000..196aec9d --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_categoryaxis_1_4.qml @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest CategoryAxis 1.4" + when: windowShown + + function test_minMax() { + compare(lineSeries1.axisX.min, 0, "AxisX min"); + compare(lineSeries1.axisX.max, 10, "AxisX max"); + compare(lineSeries1.axisY.min, 0, "AxisY min"); + compare(lineSeries1.axisY.max, 10, "AxisY max"); + } + + function test_categories() { + compare(lineSeries1.axisY.startValue, 0, "AxisY start value"); + compare(lineSeries1.axisY.count, 3, "AxisY count"); + compare(lineSeries1.axisY.categoriesLabels[0], "label0", "AxisY categories labels"); + compare(lineSeries1.axisY.categoriesLabels[1], "label1", "AxisY categories labels"); + compare(lineSeries1.axisY.categoriesLabels[2], "label2", "AxisY categories labels"); + } + } + + ChartView { + id: chartView + anchors.fill: parent + + LineSeries { + id: lineSeries1 + axisX: ValueAxis { + id: axisX + min: 0 + max: 10 + } + axisY: CategoryAxis { + id: axisY + min: 0 + max: 10 + startValue: 0 + CategoryRange { + label: "label0" + endValue: 1 + } + CategoryRange { + label: "label1" + endValue: 3 + } + CategoryRange { + label: "label2" + endValue: 10 + } + } + XYPoint { x: -1; y: -1 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 5; y: 5 } + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_chartview.qml b/tests/auto/qml-qtquicktest/tst_chartview.qml index 5b530e73..31e6775b 100644 --- a/tests/auto/qml-qtquicktest/tst_chartview.qml +++ b/tests/auto/qml-qtquicktest/tst_chartview.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml b/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml index a31372be..67e0732f 100644 --- a/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_chartview_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml b/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml index 8a44a58e..3d9dcb5f 100644 --- a/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_chartview_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml b/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml index e2378999..1ed2c6a2 100644 --- a/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_chartview_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartview_1_4.qml b/tests/auto/qml-qtquicktest/tst_chartview_1_4.qml new file mode 100644 index 00000000..d3e032f3 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_chartview_1_4.qml @@ -0,0 +1,80 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest ChartView Properties 1.4" + when: windowShown + + function test_chartViewProperties() { + compare(chartView.animationOptions, ChartView.NoAnimation, "ChartView.animationOptions"); + verify(chartView.backgroundColor != undefined); + verify(chartView.margins.bottom > 0, "ChartView.margins.bottom"); + verify(chartView.margins.top > 0, "ChartView.margins.top"); + verify(chartView.margins.left > 0, "ChartView.margins.left"); + verify(chartView.margins.right > 0, "ChartView.margins.right"); + compare(chartView.count, 0, "ChartView.count"); + compare(chartView.dropShadowEnabled, false, "ChartView.dropShadowEnabled"); + verify(chartView.plotArea.height > 0, "ChartView.plotArea.height"); + verify(chartView.plotArea.width > 0, "ChartView.plotArea.width"); + verify(chartView.plotArea.x > 0, "ChartView.plotArea.x"); + verify(chartView.plotArea.y > 0, "ChartView.plotArea.y"); + compare(chartView.theme, ChartView.ChartThemeLight, "ChartView.theme"); + compare(chartView.title, "", "ChartView.title"); + compare(chartView.title, "", "ChartView.title"); + verify(chartView.titleColor != undefined, "ChartView.titleColor"); + compare(chartView.titleFont.bold, false, "ChartView.titleFont.bold"); + // Legend + compare(chartView.legend.visible, true, "ChartView.legend.visible"); + compare(chartView.legend.alignment, Qt.AlignTop, "ChartView.legend.alignment"); + compare(chartView.legend.backgroundVisible, false, "ChartView.legend.backgroundVisible"); + verify(chartView.legend.borderColor != undefined, "ChartView.legend.borderColor"); + verify(chartView.legend.color != undefined, "ChartView.legend.color"); + compare(chartView.legend.reverseMarkers, false, "ChartView.legend.reverseMarkers"); + // Legend font + compare(chartView.legend.font.bold, false, "ChartView.legend.font.bold"); + compare(chartView.legend.font.capitalization, Font.MixedCase, "ChartView.legend.font.capitalization"); + verify(chartView.legend.font.family != "", "ChartView.legend.font.family"); + compare(chartView.legend.font.italic, false, "ChartView.legend.font.italic"); + compare(chartView.legend.font.letterSpacing, 0.0, "ChartView.legend.font.letterSpacing"); + verify(chartView.legend.font.pixelSize > 0 + && chartView.legend.font.pixelSize < 50, "ChartView.legend.font.pixelSize"); + verify(chartView.legend.font.pointSize > 0 + && chartView.legend.font.pointSize < 50, "ChartView.legend.font.pointSize"); + compare(chartView.legend.font.strikeout, false, "ChartView.legend.font.strikeout"); + compare(chartView.legend.font.underline, false, "ChartView.legend.font.underline"); + compare(chartView.legend.font.weight, Font.Normal, "ChartView.legend.font.weight"); + compare(chartView.legend.font.wordSpacing, 0.0, "ChartView.legend.font.wordSpacing"); + } + } + + ChartView { + id: chartView + anchors.fill: parent + } +} diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml b/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml index 6c694bd5..2fca5639 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewfunctions.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml index 5f26d7d7..d25d8b73 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml index 7e7c1115..9e1e8fda 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml index b56ec21d..a259d2b4 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml new file mode 100644 index 00000000..36745a73 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_chartviewfunctions_1_4.qml @@ -0,0 +1,160 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest ChartView Functions 1.4" + when: windowShown + + function test_chartViewSeriesAndAxes() { + // Create XY series + var line = chartView.createSeries(ChartView.SeriesTypeLine, "line"); + verify(line != null && line != undefined); + var spline = chartView.createSeries(ChartView.SeriesTypeSpline, "spline"); + verify(spline != null && spline != undefined); + var scatter = chartView.createSeries(ChartView.SeriesTypeScatter, "scatter"); + verify(scatter != null && scatter != undefined); + + // Create a series with specific axes + var line2 = chartView.createSeries(ChartView.SeriesTypeLine, "line2", chartView.axisX(line), chartView.axisY(line)); + + // Check that all the XY series use the same axes + verify(chartView.axisX(line) != null); + verify(chartView.axisY(line) != null); + compare(chartView.axisX(line), chartView.axisX(line2)); + compare(chartView.axisY(line), chartView.axisY(line2)); + compare(chartView.axisX(line), chartView.axisX(spline)); + compare(chartView.axisY(line), chartView.axisY(spline)); + compare(chartView.axisX(line), chartView.axisX(scatter)); + compare(chartView.axisY(line), chartView.axisY(scatter)); + + var bar = chartView.createSeries(ChartView.SeriesTypeBar, "bar"); + verify(bar != null && bar != undefined); + var stackedbar = chartView.createSeries(ChartView.SeriesTypeStackedBar, "stackedbar"); + verify(stackedbar != null && stackedbar != undefined); + var percentbar = chartView.createSeries(ChartView.SeriesTypePercentBar, "percentbar"); + verify(percentbar != null && percentbar != undefined); + var horizontalbar = chartView.createSeries(ChartView.SeriesTypeHorizontalBar, "horizontalbar"); + verify(horizontalbar != null && horizontalbar != undefined); + var horizontalstackedbar = chartView.createSeries(ChartView.SeriesTypeHorizontalStackedBar, "horizontalstackedbar"); + verify(horizontalstackedbar != null && horizontalstackedbar != undefined); + var horizontalpercentbar = chartView.createSeries(ChartView.SeriesTypeHorizontalPercentBar, "horizontalpercentbar"); + verify(horizontalpercentbar != null && horizontalpercentbar != undefined); + var area = chartView.createSeries(ChartView.SeriesTypeArea, "area"); + verify(area != null && area != undefined); + + // Remove all series + chartView.removeAllSeries(); + compare(chartView.count, 0); + } + + function test_chartViewRange() { + // Set initial values + chartView.createSeries(ChartView.SeriesTypeLine, "line"); + verify(chartView.axisX() != null); + verify(chartView.axisY() != null); + chartView.axisX().min = 1.0; + chartView.axisX().max = 2.0; + chartView.axisY().min = 1.0; + chartView.axisY().max = 2.0; + + var xMax = chartView.axisX().max; + var xMin = chartView.axisX().min; + var yMax = chartView.axisY().max; + var yMin = chartView.axisY().min; + + // zoom x 2.5 + chartView.zoom(1.5); + verify(chartView.axisX().max < xMax); + verify(chartView.axisX().min > xMin); + verify(chartView.axisY().max < yMax); + verify(chartView.axisY().min > yMin); + xMax = chartView.axisX().max; + xMin = chartView.axisX().min; + yMax = chartView.axisY().max; + yMin = chartView.axisY().min; + + // zoom x 0.5 + chartView.zoom(0.5); + verify(chartView.axisX().max > xMax); + verify(chartView.axisX().min < xMin); + verify(chartView.axisY().max > yMax); + verify(chartView.axisY().min < yMin); + xMax = chartView.axisX().max; + xMin = chartView.axisX().min; + yMax = chartView.axisY().max; + yMin = chartView.axisY().min; + + // Scroll up + chartView.scrollUp(10); + compare(chartView.axisX().max, xMax); + compare(chartView.axisX().min, xMin); + verify(chartView.axisY().max > yMax); + verify(chartView.axisY().min > yMin); + xMax = chartView.axisX().max; + xMin = chartView.axisX().min; + yMax = chartView.axisY().max; + yMin = chartView.axisY().min; + + // Scroll down + chartView.scrollDown(10); + compare(chartView.axisX().max, xMax); + compare(chartView.axisX().min, xMin); + verify(chartView.axisY().max < yMax); + verify(chartView.axisY().min < yMin); + xMax = chartView.axisX().max; + xMin = chartView.axisX().min; + yMax = chartView.axisY().max; + yMin = chartView.axisY().min; + + // Scroll left + chartView.scrollLeft(10); + verify(chartView.axisX().max < xMax); + verify(chartView.axisX().min < xMin); + compare(chartView.axisY().max, yMax); + compare(chartView.axisY().min, yMin); + xMax = chartView.axisX().max; + xMin = chartView.axisX().min; + yMax = chartView.axisY().max; + yMin = chartView.axisY().min; + + // Scroll right + chartView.scrollRight(10); + verify(chartView.axisX().max > xMax); + verify(chartView.axisX().min > xMin); + compare(chartView.axisY().max, yMax); + compare(chartView.axisY().min, yMin); + } + } + + ChartView { + id: chartView + anchors.fill: parent + title: "Chart" + } +} diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml b/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml index db9df5c0..8085bef2 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewsignals.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml index a6bab95d..0dcefeb4 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml index 46c0adcb..954740cf 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml index 66261b39..a4f01c32 100644 --- a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml new file mode 100644 index 00000000..db93c519 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_chartviewsignals_1_4.qml @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest ChartView Signals 1.4" + when: windowShown + + // Verify onSeriesAdded and onSeriesRemoved signals + function test_chartView() { + var series = chartView.createSeries(ChartView.SeriesTypeLine, "line"); + seriesAddedSpy.wait(); + compare(seriesAddedSpy.count, 1, "ChartView.onSeriesAdded"); + + // Modifying layout triggers more than one plotAreaChanged signal + chartView.titleFont.pixelSize = 50; + verify(plotAreaChangedSpy.count > 0, "ChartView.onPlotAreaChanged"); + + chartView.removeSeries(series); + seriesRemovedSpy.wait(); + compare(seriesRemovedSpy.count, 1, "ChartView.onSeriesAdded"); + } + } + + ChartView { + id: chartView + anchors.fill: parent + title: "Chart" + + SignalSpy { + id: plotAreaChangedSpy + target: chartView + signalName: "plotAreaChanged" + } + + SignalSpy { + id: seriesAddedSpy + target: chartView + signalName: "seriesAdded" + } + + SignalSpy { + id: seriesRemovedSpy + target: chartView + signalName: "seriesRemoved" + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_pieseries.qml b/tests/auto/qml-qtquicktest/tst_pieseries.qml index 0a888ee4..5aa83047 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml index b23ab504..c777779f 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml index 0b528d69..09c3d450 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml index 21b29c07..1a50cf85 100644 --- a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml new file mode 100644 index 00000000..5cfab8c9 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml @@ -0,0 +1,135 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest PieSeries 1.4" + when: windowShown + + function test_properties() { + compare(pieSeries.endAngle, 360); + compare(pieSeries.holeSize, 0); + compare(pieSeries.horizontalPosition, 0.5); + compare(pieSeries.size, 0.7); + compare(pieSeries.startAngle, 0); + compare(pieSeries.sum, 0); + compare(pieSeries.verticalPosition, 0.5); + } + + function test_sliceproperties() { + var slice = pieSeries.append("slice", 10); + compare(slice.angleSpan, 360.0); + verify(slice.borderColor != undefined); + compare(slice.borderWidth, 1); + verify(slice.color != undefined); + compare(slice.explodeDistanceFactor, 0.15); + compare(slice.exploded, false); + compare(slice.label, "slice"); + compare(slice.labelArmLengthFactor, 0.15); + verify(slice.labelColor != undefined); + compare(slice.labelFont.bold, false); + compare(slice.labelPosition, PieSlice.LabelOutside); + compare(slice.labelVisible, false); + compare(slice.percentage, 1.0); + compare(slice.startAngle, 0.0); + compare(slice.value, 10.0); + compare(slice.brushFilename, ""); + } + + function test_append() { + addedSpy.clear(); + countChangedSpy.clear(); + sumChangedSpy.clear(); + var count = 50; + for (var i = 0; i < count; i++) + pieSeries.append("slice" + i, Math.random()); + compare(addedSpy.count, count); + compare(countChangedSpy.count, count); + compare(sumChangedSpy.count, count); + pieSeries.clear(); + } + + function test_remove() { + removedSpy.clear(); + countChangedSpy.clear(); + sumChangedSpy.clear(); + var count = 50; + for (var i = 0; i < count; i++) + pieSeries.append("slice" + i, Math.random()); + for (var j = 0; j < count; j++) + pieSeries.remove(pieSeries.at(0)); + compare(removedSpy.count, count); + compare(countChangedSpy.count, 2 * count); + compare(sumChangedSpy.count, 2 * count); + compare(pieSeries.count, 0); + } + + function test_find_and_at() { + var count = 50; + for (var i = 0; i < count; i++) + pieSeries.append("slice" + i, Math.random()); + for (var j = 0; j < count; j++) { + compare(pieSeries.find("slice" + j).label, "slice" + j); + compare(pieSeries.find("slice" + j).brushFilename, ""); + } + compare(pieSeries.at(3).brushFilename,""); + pieSeries.clear(); + } + } + + ChartView { + id: chartView + anchors.fill: parent + + PieSeries { + id: pieSeries + name: "pie" + + SignalSpy { + id: addedSpy + target: pieSeries + signalName: "added" + } + SignalSpy { + id: removedSpy + target: pieSeries + signalName: "removed" + } + SignalSpy { + id: sumChangedSpy + target: pieSeries + signalName: "sumChanged" + } + SignalSpy { + id: countChangedSpy + target: pieSeries + signalName: "countChanged" + } + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis.qml b/tests/auto/qml-qtquicktest/tst_valueaxis.qml index 24f61cad..add8ff6c 100644 --- a/tests/auto/qml-qtquicktest/tst_valueaxis.qml +++ b/tests/auto/qml-qtquicktest/tst_valueaxis.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml b/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml index 481e9494..e54a81d7 100644 --- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_valueaxis_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml b/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml index 24ca3d51..80075ee0 100644 --- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_valueaxis_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml b/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml index 5bc1acb8..2e9528d2 100644 --- a/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_valueaxis_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml b/tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml new file mode 100644 index 00000000..b8bb0da5 --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_valueaxis_1_4.qml @@ -0,0 +1,116 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest ValueAxis 1.4" + when: windowShown + + // test functions are run in alphabetical order, the name has 'a' so that it + // will be the first function to execute. + function test_a_properties() { + // Default properties + verify(axisX.min < 0, "AxisX min"); + verify(axisX.max > 0, "AxisX max"); + verify(axisY.min < 0, "AxisY min"); + verify(axisY.max > 0, "AxisY max"); + verify(axisX.tickCount == 5, "AxisX tick count"); + verify(axisY.tickCount == 5, "AxisY tick count"); + verify(axisX.labelFormat == "", "label format"); + + // Modify properties + axisX.tickCount = 3; + verify(axisX.tickCount == 3, "set tick count"); + } + + function test_functions() { + // Set the axis ranges to not "nice" ones... + var min = 0.032456456; + var max = 10.67845634; + axisX.min = min; + axisX.max = max; + axisY.min = min; + axisY.max = max; + + // ...And then apply nice numbers and verify the range was changed + axisX.applyNiceNumbers(); + axisY.applyNiceNumbers(); + verify(axisX.min != min); + verify(axisX.max != max); + verify(axisY.min != min); + verify(axisY.max != max); + } + + function test_signals() { + minChangedSpy.clear(); + maxChangedSpy.clear(); + axisX.min = 2; + compare(minChangedSpy.count, 1, "onMinChanged"); + compare(maxChangedSpy.count, 0, "onMaxChanged"); + + axisX.max = 8; + compare(minChangedSpy.count, 1, "onMinChanged"); + compare(maxChangedSpy.count, 1, "onMaxChanged"); + + // restore original values + axisX.min = 0; + axisX.max = 10; + compare(minChangedSpy.count, 2, "onMinChanged"); + compare(maxChangedSpy.count, 2, "onMaxChanged"); + } + } + + ChartView { + id: chartView + anchors.fill: parent + + LineSeries { + id: lineSeries1 + axisX: ValueAxis { + id: axisX + } + axisY: ValueAxis { + id: axisY + } + XYPoint { x: -1; y: -1 } + XYPoint { x: 0; y: 0 } + XYPoint { x: 5; y: 5 } + } + + SignalSpy { + id: minChangedSpy + target: axisX + signalName: "minChanged" + } + SignalSpy { + id: maxChangedSpy + target: axisX + signalName: "maxChanged" + } + } +} diff --git a/tests/auto/qml-qtquicktest/tst_xyseries.qml b/tests/auto/qml-qtquicktest/tst_xyseries.qml index 383dcc8b..4a2db2e4 100644 --- a/tests/auto/qml-qtquicktest/tst_xyseries.qml +++ b/tests/auto/qml-qtquicktest/tst_xyseries.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.4 +import QtCharts 2.0 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml b/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml index dca20ca2..2c9f7024 100644 --- a/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml +++ b/tests/auto/qml-qtquicktest/tst_xyseries_1_1.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.1 +import QtCharts 1.1 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml b/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml index 5c1390fc..d20d2898 100644 --- a/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml +++ b/tests/auto/qml-qtquicktest/tst_xyseries_1_2.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.2 +import QtCharts 1.2 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml index 56130d94..0105dda9 100644 --- a/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_xyseries_1_3.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtCommercial.Chart 1.3 +import QtCharts 1.3 Rectangle { width: 400 diff --git a/tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml new file mode 100644 index 00000000..1da8080b --- /dev/null +++ b/tests/auto/qml-qtquicktest/tst_xyseries_1_4.qml @@ -0,0 +1,262 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtCharts 1.4 + +Rectangle { + width: 400 + height: 300 + + TestCase { + id: tc1 + name: "tst_qml-qtquicktest XY Series 1.4" + when: windowShown + + function test_properties() { + verify(lineSeries.color != undefined); + compare(lineSeries.pointsVisible, false); + compare(lineSeries.capStyle, Qt.SquareCap); + compare(lineSeries.style, Qt.SolidLine); + compare(lineSeries.width, 2.0); + + verify(splineSeries.color != undefined); + compare(splineSeries.pointsVisible, false); + compare(splineSeries.capStyle, Qt.SquareCap); + compare(splineSeries.style, Qt.SolidLine); + compare(splineSeries.width, 2.0); + + verify(scatterSeries.color != undefined); + verify(scatterSeries.borderColor != undefined); + compare(scatterSeries.borderWidth, 2.0); + compare(scatterSeries.markerShape, ScatterSeries.MarkerShapeCircle); + compare(scatterSeries.markerSize, 15.0); + compare(scatterSeries.brushFilename, ""); + + verify(areaSeries.color != undefined); + verify(areaSeries.borderColor != undefined); + compare(areaSeries.borderWidth, 2.0); + compare(areaSeries.brushFilename, ""); + } + + function test_axes() { + // Axis initialization + 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); + } + + function test_append() { + lineSeriesPointAddedSpy.clear(); + splineSeriesPointAddedSpy.clear(); + scatterSeriesPointAddedSpy.clear(); + var count = append(); + compare(lineSeries.count, count); + compare(splineSeries.count, count); + compare(scatterSeries.count, count); + compare(lineSeriesPointAddedSpy.count, count); + compare(splineSeriesPointAddedSpy.count, count); + compare(scatterSeriesPointAddedSpy.count, count); + clear(); + compare(lineSeries.count, 0); + compare(splineSeries.count, 0); + compare(scatterSeries.count, 0); + } + + function test_replace() { + var count = append(); + for (var i = 0; i < count; i++) { + lineSeries.replace(lineSeries.at(i).x, lineSeries.at(i).y, i, Math.random()); + splineSeries.replace(splineSeries.at(i).x, splineSeries.at(i).y, i, Math.random()); + scatterSeries.replace(scatterSeries.at(i).x, scatterSeries.at(i).y, i, Math.random()); + } + compare(lineSeries.count, count); + compare(splineSeries.count, count); + compare(scatterSeries.count, count); + compare(lineSeriesPointReplacedSpy.count, count); + compare(splineSeriesPointReplacedSpy.count, count); + compare(scatterSeriesPointReplacedSpy.count, count); + clear(); + } + + function test_insert() { + var count = append(); + lineSeriesPointAddedSpy.clear(); + splineSeriesPointAddedSpy.clear(); + scatterSeriesPointAddedSpy.clear(); + for (var i = 0; i < count; i++) { + lineSeries.insert(i * 2, i, Math.random()); + splineSeries.insert(i * 2, i, Math.random()); + scatterSeries.insert(i * 2, i, Math.random()); + } + compare(lineSeries.count, count * 2); + compare(splineSeries.count, count * 2); + compare(scatterSeries.count, count * 2); + compare(lineSeriesPointAddedSpy.count, count); + compare(splineSeriesPointAddedSpy.count, count); + compare(scatterSeriesPointAddedSpy.count, count); + clear(); + } + + function test_remove() { + lineSeriesPointRemovedSpy.clear(); + splineSeriesPointRemovedSpy.clear(); + scatterSeriesPointRemovedSpy.clear(); + var count = append(); + for (var i = 0; i < count; i++) { + lineSeries.remove(lineSeries.at(0).x, lineSeries.at(0).y); + splineSeries.remove(splineSeries.at(0).x, splineSeries.at(0).y); + scatterSeries.remove(scatterSeries.at(0).x, scatterSeries.at(0).y); + } + compare(lineSeries.count, 0); + compare(splineSeries.count, 0); + compare(scatterSeries.count, 0); + compare(lineSeriesPointRemovedSpy.count, count); + compare(splineSeriesPointRemovedSpy.count, count); + compare(scatterSeriesPointRemovedSpy.count, count); + } + + // Not a test function, called from test functions + function append() { + var count = 100; + chartView.axisX().min = 0; + chartView.axisX().max = 100; + chartView.axisY().min = 0; + chartView.axisY().max = 1; + + for (var i = 0; i < count; i++) { + lineSeries.append(i, Math.random()); + splineSeries.append(i, Math.random()); + scatterSeries.append(i, Math.random()); + } + + return count; + } + + // Not a test function, called from test functions + function clear() { + lineSeries.clear(); + splineSeries.clear(); + scatterSeries.clear(); + } + } + + ChartView { + id: chartView + anchors.fill: parent + + LineSeries { + id: lineSeries + name: "line" + + SignalSpy { + id: lineSeriesPointAddedSpy + target: lineSeries + signalName: "pointAdded" + } + + SignalSpy { + id: lineSeriesPointReplacedSpy + target: lineSeries + signalName: "pointReplaced" + } + + SignalSpy { + id: lineSeriesPointsReplacedSpy + target: lineSeries + signalName: "pointsReplaced" + } + + SignalSpy { + id: lineSeriesPointRemovedSpy + target: lineSeries + signalName: "pointRemoved" + } + } + + AreaSeries { + id: areaSeries + name: "area" + upperSeries: lineSeries + } + + SplineSeries { + id: splineSeries + name: "spline" + + SignalSpy { + id: splineSeriesPointAddedSpy + target: splineSeries + signalName: "pointAdded" + } + + SignalSpy { + id: splineSeriesPointReplacedSpy + target: splineSeries + signalName: "pointReplaced" + } + + SignalSpy { + id: splineSeriesPointsReplacedSpy + target: splineSeries + signalName: "pointsReplaced" + } + + SignalSpy { + id: splineSeriesPointRemovedSpy + target: splineSeries + signalName: "pointRemoved" + } + } + + ScatterSeries { + id: scatterSeries + name: "scatter" + + SignalSpy { + id: scatterSeriesPointAddedSpy + target: scatterSeries + signalName: "pointAdded" + } + + SignalSpy { + id: scatterSeriesPointReplacedSpy + target: scatterSeries + signalName: "pointReplaced" + } + + SignalSpy { + id: scatterSeriesPointsReplacedSpy + target: scatterSeries + signalName: "pointsReplaced" + } + + SignalSpy { + id: scatterSeriesPointRemovedSpy + target: scatterSeries + signalName: "pointRemoved" + } + } + } +} diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 144e5db3..f116195d 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -2,4 +2,4 @@ error( "Couldn't find the auto.pri file!" ) } SOURCES += tst_qml.cpp -QT += declarative +QT += qml quick diff --git a/tests/auto/qml/tst_qml.cpp b/tests/auto/qml/tst_qml.cpp index f33f820b..1078129b 100644 --- a/tests/auto/qml/tst_qml.cpp +++ b/tests/auto/qml/tst_qml.cpp @@ -18,12 +18,11 @@ ** ****************************************************************************/ #include <QtTest/QtTest> -#include <QDeclarativeEngine> -#include <QDeclarativeComponent> -#include <QDir> +#include <QtQml/QQmlEngine> +#include <QtQml/QQmlComponent> #include "tst_definitions.h" -class tst_QML : public QObject +class tst_qml : public QObject { Q_OBJECT @@ -36,57 +35,70 @@ private slots: void checkPlugin_data(); void checkPlugin(); private: - QString componentErrors(const QDeclarativeComponent* component) const; + QString componentErrors(const QQmlComponent* component) const; QString imports_1_1(); QString imports_1_3(); + QString imports_1_4(); + QString imports_2_0(); }; -QString tst_QML::componentErrors(const QDeclarativeComponent* component) const +QString tst_qml::componentErrors(const QQmlComponent* component) const { Q_ASSERT(component); QStringList errors; - foreach (QDeclarativeError const& error, component->errors()) { + foreach (QQmlError const& error, component->errors()) { errors << error.toString(); } return errors.join("\n"); } -QString tst_QML::imports_1_1() +QString tst_qml::imports_1_1() { - return "import QtQuick 1.0 \n" - "import QtCommercial.Chart 1.1 \n"; + return "import QtQuick 2.0 \n" + "import QtCharts 1.1 \n"; } -QString tst_QML::imports_1_3() +QString tst_qml::imports_1_3() { - return "import QtQuick 1.0 \n" - "import QtCommercial.Chart 1.3 \n"; + return "import QtQuick 2.0 \n" + "import QtCharts 1.3 \n"; } +QString tst_qml::imports_1_4() +{ + return "import QtQuick 2.0 \n" + "import QtCharts 1.4 \n"; +} + +QString tst_qml::imports_2_0() +{ + return "import QtQuick 2.0 \n" + "import QtCharts 2.0 \n"; +} -void tst_QML::initTestCase() +void tst_qml::initTestCase() { } -void tst_QML::cleanupTestCase() +void tst_qml::cleanupTestCase() { } -void tst_QML::init() +void tst_qml::init() { } -void tst_QML::cleanup() +void tst_qml::cleanup() { } -void tst_QML::checkPlugin_data() +void tst_qml::checkPlugin_data() { QTest::addColumn<QString>("source"); @@ -121,33 +133,60 @@ void tst_QML::checkPlugin_data() QTest::newRow("createPolarChartView") << imports_1_3() + "PolarChartView{}"; QTest::newRow("LogValueAxis") << imports_1_3() + "LogValueAxis{}"; + QTest::newRow("BoxPlotSeries") << imports_1_3() + "BoxPlotSeries{}"; + QTest::newRow("BoxSet") << imports_1_3() + "BoxSet{}"; + + QTest::newRow("createChartView_2_0") << imports_2_0() + "ChartView{}"; + QTest::newRow("XYPoint_2_0") << imports_2_0() + "XYPoint{}"; + QTest::newRow("scatterSeries_2_0") << imports_2_0() + "ScatterSeries{}"; + QTest::newRow("lineSeries_2_0") << imports_2_0() + "LineSeries{}"; + QTest::newRow("splineSeries_2_0") << imports_2_0() + "SplineSeries{}"; + QTest::newRow("areaSeries_2_0") << imports_2_0() + "AreaSeries{}"; + QTest::newRow("barSeries_2_0") << imports_2_0() + "BarSeries{}"; + QTest::newRow("stackedBarSeries_2_0") << imports_2_0() + "StackedBarSeries{}"; + QTest::newRow("precentBarSeries_2_0") << imports_2_0() + "PercentBarSeries{}"; + QTest::newRow("horizonatlBarSeries_2_0") << imports_2_0() + "HorizontalBarSeries{}"; + QTest::newRow("horizonatlStackedBarSeries_2_0") + << imports_2_0() + "HorizontalStackedBarSeries{}"; + QTest::newRow("horizonatlstackedBarSeries_2_0") + << imports_2_0() + "HorizontalPercentBarSeries{}"; + QTest::newRow("pieSeries_2_0") << imports_2_0() + "PieSeries{}"; + QTest::newRow("PieSlice_2_0") << imports_2_0() + "PieSlice{}"; + QTest::newRow("BarSet_2_0") << imports_2_0() + "BarSet{}"; + QTest::newRow("HXYModelMapper_2_0") << imports_2_0() + "HXYModelMapper{}"; + QTest::newRow("VXYModelMapper_2_0") << imports_2_0() + "VXYModelMapper{}"; + QTest::newRow("HPieModelMapper_2_0") << imports_2_0() + "HPieModelMapper{}"; + QTest::newRow("HPieModelMapper_2_0") << imports_2_0() + "HPieModelMapper{}"; + QTest::newRow("HBarModelMapper_2_0") << imports_2_0() + "HBarModelMapper{}"; + QTest::newRow("VBarModelMapper_2_0") << imports_2_0() + "VBarModelMapper{}"; + QTest::newRow("ValueAxis_2_0") << imports_2_0() + "ValueAxis{}"; +#ifndef QT_ON_ARM + QTest::newRow("DateTimeAxis_2_0") << imports_2_0() + "DateTimeAxis{}"; +#endif + QTest::newRow("CategoryAxis_2_0") << imports_2_0() + "CategoryAxis{}"; + QTest::newRow("CategoryRange_2_0") << imports_2_0() + "CategoryRange{}"; + QTest::newRow("BarCategoryAxis_2_0") << imports_2_0() + "BarCategoryAxis{}"; + QTest::newRow("createPolarChartView_2_0") << imports_2_0() + "PolarChartView{}"; + QTest::newRow("LogValueAxis_2_0") << imports_2_0() + "LogValueAxis{}"; + QTest::newRow("BoxPlotSeries_2_0") << imports_2_0() + "BoxPlotSeries{}"; + QTest::newRow("BoxSet_2_0") << imports_2_0() + "BoxSet{}"; } -void tst_QML::checkPlugin() +void tst_qml::checkPlugin() { QFETCH(QString, source); - QDeclarativeEngine engine; -#ifdef Q_OS_ANDROID - engine.addImportPath(QString::fromLatin1("assets:/imports")); - engine.addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib"))); -#else - engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports"))); -#endif - QDeclarativeComponent component(&engine); + QQmlEngine engine; + engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("qml"))); + QQmlComponent component(&engine); component.setData(source.toLatin1(), QUrl()); QVERIFY2(!component.isError(), qPrintable(componentErrors(&component))); - TRY_COMPARE(component.status(), QDeclarativeComponent::Ready); + TRY_COMPARE(component.status(), QQmlComponent::Ready); QObject *obj = component.create(); QVERIFY(obj != 0); - - // - //TODO: - // QCOMPARE(obj->property("something").toInt(), 0); - delete obj; } -QTEST_MAIN(tst_QML) +QTEST_MAIN(tst_qml) #include "tst_qml.moc" diff --git a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp index caf3eaba..dbe768e9 100644 --- a/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp +++ b/tests/auto/qpercentbarseries/tst_qpercentbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp index 0b672e40..28cf4a29 100644 --- a/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp +++ b/tests/auto/qpiemodelmapper/tst_qpiemodelmapper.cpp @@ -29,7 +29,7 @@ #include <qhpiemodelmapper.h> #include <QStandardItemModel> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_qpiemodelmapper : public QObject { diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp index 06e7022b..3b8f2adb 100644 --- a/tests/auto/qpieseries/tst_qpieseries.cpp +++ b/tests/auto/qpieseries/tst_qpieseries.cpp @@ -27,7 +27,7 @@ #include <QStandardItemModel> #include <tst_definitions.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QPieSlice*) Q_DECLARE_METATYPE(QList<QPieSlice*>) diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 678bf911..3ad5c47d 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -25,7 +25,7 @@ #include <qpieslice.h> #include <qpieseries.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_qpieslice : public QObject { diff --git a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp index 6285aaa1..868a61a1 100644 --- a/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp +++ b/tests/auto/qstackedbarseries/tst_qstackedbarseries.cpp @@ -25,7 +25,7 @@ #include <qchart.h> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE Q_DECLARE_METATYPE(QBarSet*) Q_DECLARE_METATYPE(QAbstractBarSeries::LabelsPosition) diff --git a/tests/auto/quick2/quick2.pro b/tests/auto/quick2/quick2.pro deleted file mode 100644 index 93f8fdfe..00000000 --- a/tests/auto/quick2/quick2.pro +++ /dev/null @@ -1,5 +0,0 @@ -!include( ../auto.pri ) { - error( "Couldn't find the auto.pri file!" ) -} -SOURCES += tst_quick2.cpp -QT += qml quick diff --git a/tests/auto/quick2/tst_quick2.cpp b/tests/auto/quick2/tst_quick2.cpp deleted file mode 100644 index 67b1b2da..00000000 --- a/tests/auto/quick2/tst_quick2.cpp +++ /dev/null @@ -1,142 +0,0 @@ -/**************************************************************************** -** -** 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 <QtTest/QtTest> -#include <QtQml/QQmlEngine> -#include <QtQml/QQmlComponent> -#include "tst_definitions.h" - -class tst_quick2 : public QObject -{ - Q_OBJECT - -public slots: - void initTestCase(); - void cleanupTestCase(); - void init(); - void cleanup(); -private slots: - void checkPlugin_data(); - void checkPlugin(); -private: - QString componentErrors(const QQmlComponent* component) const; - QString imports_1_1(); - QString imports_1_3(); - -}; - -QString tst_quick2::componentErrors(const QQmlComponent* component) const -{ - Q_ASSERT(component); - - QStringList errors; - - foreach (QQmlError const& error, component->errors()) { - errors << error.toString(); - } - - return errors.join("\n"); -} - -QString tst_quick2::imports_1_1() -{ - return "import QtQuick 2.0 \n" - "import QtCommercial.Chart 1.1 \n"; -} - -QString tst_quick2::imports_1_3() -{ - return "import QtQuick 2.0 \n" - "import QtCommercial.Chart 1.3 \n"; -} - - -void tst_quick2::initTestCase() -{ -} - -void tst_quick2::cleanupTestCase() -{ -} - -void tst_quick2::init() -{ - -} - -void tst_quick2::cleanup() -{ - -} - -void tst_quick2::checkPlugin_data() -{ - QTest::addColumn<QString>("source"); - - QTest::newRow("createChartView") << imports_1_1() + "ChartView{}"; - QTest::newRow("XYPoint") << imports_1_1() + "XYPoint{}"; - QTest::newRow("scatterSeries") << imports_1_1() + "ScatterSeries{}"; - QTest::newRow("lineSeries") << imports_1_1() + "LineSeries{}"; - QTest::newRow("splineSeries") << imports_1_1() + "SplineSeries{}"; - QTest::newRow("areaSeries") << imports_1_1() + "AreaSeries{}"; - QTest::newRow("barSeries") << imports_1_1() + "BarSeries{}"; - QTest::newRow("stackedBarSeries") << imports_1_1() + "StackedBarSeries{}"; - QTest::newRow("precentBarSeries") << imports_1_1() + "PercentBarSeries{}"; - QTest::newRow("horizonatlBarSeries") << imports_1_1() + "HorizontalBarSeries{}"; - QTest::newRow("horizonatlStackedBarSeries") << imports_1_1() + "HorizontalStackedBarSeries{}"; - QTest::newRow("horizonatlstackedBarSeries") << imports_1_1() + "HorizontalPercentBarSeries{}"; - QTest::newRow("pieSeries") << imports_1_1() + "PieSeries{}"; - QTest::newRow("PieSlice") << imports_1_1() + "PieSlice{}"; - QTest::newRow("BarSet") << imports_1_1() + "BarSet{}"; - QTest::newRow("HXYModelMapper") << imports_1_1() + "HXYModelMapper{}"; - QTest::newRow("VXYModelMapper") << imports_1_1() + "VXYModelMapper{}"; - QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}"; - QTest::newRow("HPieModelMapper") << imports_1_1() + "HPieModelMapper{}"; - QTest::newRow("HBarModelMapper") << imports_1_1() + "HBarModelMapper{}"; - QTest::newRow("VBarModelMapper") << imports_1_1() + "VBarModelMapper{}"; - QTest::newRow("ValueAxis") << imports_1_1() + "ValueAxis{}"; -#ifndef QT_ON_ARM - QTest::newRow("DateTimeAxis") << imports_1_1() + "DateTimeAxis{}"; -#endif - QTest::newRow("CategoryAxis") << imports_1_1() + "CategoryAxis{}"; - QTest::newRow("CategoryRange") << imports_1_1() + "CategoryRange{}"; - QTest::newRow("BarCategoryAxis") << imports_1_1() + "BarCategoryAxis{}"; - - QTest::newRow("createPolarChartView") << imports_1_3() + "PolarChartView{}"; - QTest::newRow("LogValueAxis") << imports_1_3() + "LogValueAxis{}"; -} - -void tst_quick2::checkPlugin() -{ - QFETCH(QString, source); - QQmlEngine engine; - engine.addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QLatin1String("qml"))); - QQmlComponent component(&engine); - component.setData(source.toLatin1(), QUrl()); - QVERIFY2(!component.isError(), qPrintable(componentErrors(&component))); - TRY_COMPARE(component.status(), QQmlComponent::Ready); - QObject *obj = component.create(); - QVERIFY(obj != 0); - delete obj; -} - -QTEST_MAIN(tst_quick2) - -#include "tst_quick2.moc" - diff --git a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp index e0b17f29..5431d5cf 100644 --- a/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp +++ b/tests/auto/qxymodelmapper/tst_qxymodelmapper.cpp @@ -30,7 +30,7 @@ #include <QStandardItemModel> #include "tst_definitions.h" -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_qxymodelmapper : public QObject { diff --git a/tests/auto/qxyseries/tst_qxyseries.h b/tests/auto/qxyseries/tst_qxyseries.h index 0fad782c..58d6a5c6 100644 --- a/tests/auto/qxyseries/tst_qxyseries.h +++ b/tests/auto/qxyseries/tst_qxyseries.h @@ -27,7 +27,7 @@ #include <QStandardItemModel> #include <tst_definitions.h> -QTCOMMERCIALCHART_USE_NAMESPACE +QT_CHARTS_USE_NAMESPACE class tst_QXYSeries : public QObject { |