diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-20 13:18:59 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-10-22 10:08:51 +0000 |
commit | 31f9c57bc50ae053cfaf039a1dfdb128e2494458 (patch) | |
tree | 316138cb73c49877f5a80a8496c2f1b737122fb5 /tests/auto/qmltest/bars3d/tst_basic.qml | |
parent | 4162ddeb02ee41fd4217d7f3d93d45cab3313ba8 (diff) |
Fix issues with COIN builds
-Fix miscellaneous compile errors
-Move manual tests to manual folder and enable export of autotests
-Added widgets requirement
-Fixed autotests
-Fixed renderer and controller synchronization in QML case
-Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL
Change-Id: If6619733725d079e339bef16262e5ea1450ab20f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Diffstat (limited to 'tests/auto/qmltest/bars3d/tst_basic.qml')
-rw-r--r-- | tests/auto/qmltest/bars3d/tst_basic.qml | 124 |
1 files changed, 86 insertions, 38 deletions
diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml index b7d4ec0d..a3028453 100644 --- a/tests/auto/qmltest/bars3d/tst_basic.qml +++ b/tests/auto/qmltest/bars3d/tst_basic.qml @@ -28,51 +28,77 @@ Item { height: 150 width: 150 - Bars3D { - id: empty + property var empty: null + property var basic: null + property var common: null + property var common_init: null + + function constructEmpty() { + empty = Qt.createQmlObject(" + import QtQuick 2.2 + import QtDataVisualization 1.2 + Bars3D { + }", top) } - Bars3D { - id: basic - anchors.fill: parent - multiSeriesUniform: true - barThickness: 0.1 - barSpacing.width: 0.1 - barSpacing.height: 0.1 - barSpacingRelative: false - floorLevel: 1.0 + function constructBasic() { + basic = Qt.createQmlObject(" + import QtQuick 2.2 + import QtDataVisualization 1.2 + Bars3D { + anchors.fill: parent + multiSeriesUniform: true + barThickness: 0.1 + barSpacing.width: 0.1 + barSpacing.height: 0.1 + barSpacingRelative: false + floorLevel: 1.0 + }", top) + basic.anchors.fill = top } - Bars3D { - id: common - anchors.fill: parent + function constructCommon() { + common = Qt.createQmlObject(" + import QtQuick 2.2 + import QtDataVisualization 1.2 + Bars3D { + anchors.fill: parent + }", top) + common.anchors.fill = top } - Bars3D { - id: common_init - anchors.fill: parent - selectionMode: AbstractGraph3D.SelectionNone - shadowQuality: AbstractGraph3D.ShadowQualityLow - msaaSamples: 2 - theme: Theme3D { } - renderingMode: AbstractGraph3D.RenderIndirect - measureFps: true - orthoProjection: false - aspectRatio: 3.0 - optimizationHints: AbstractGraph3D.OptimizationStatic - polar: false - radialLabelOffset: 2 - horizontalAspectRatio: 0.2 - reflection: true - reflectivity: 0.1 - locale: Qt.locale("UK") - margin: 0.2 + function constructCommonInit() { + common_init = Qt.createQmlObject(" + import QtQuick 2.2 + import QtDataVisualization 1.2 + Bars3D { + anchors.fill: parent + selectionMode: AbstractGraph3D.SelectionNone + shadowQuality: AbstractGraph3D.ShadowQualityLow + msaaSamples: 2 + theme: Theme3D { } + renderingMode: AbstractGraph3D.RenderIndirect + measureFps: true + orthoProjection: false + aspectRatio: 3.0 + optimizationHints: AbstractGraph3D.OptimizationStatic + polar: false + radialLabelOffset: 2 + horizontalAspectRatio: 0.2 + reflection: true + reflectivity: 0.1 + locale: Qt.locale(\"UK\") + margin: 0.2 + }", top) + common_init.anchors.fill = top } TestCase { name: "Bars3D Empty" + when: windowShown function test_empty() { + constructEmpty() compare(empty.width, 0, "width") compare(empty.height, 0, "height") compare(empty.multiSeriesUniform, false, "multiSeriesUniform") @@ -89,6 +115,9 @@ Item { compare(empty.columnAxis.type, AbstractAxis3D.AxisTypeCategory) compare(empty.rowAxis.type, AbstractAxis3D.AxisTypeCategory) compare(empty.valueAxis.type, AbstractAxis3D.AxisTypeValue) + waitForRendering(top) + empty.destroy() + waitForRendering(top) } } @@ -96,7 +125,8 @@ Item { name: "Bars3D Basic" when: windowShown - function test_basic() { + function test_1_basic() { + constructBasic() compare(basic.width, 150, "width") compare(basic.height, 150, "height") compare(basic.multiSeriesUniform, true, "multiSeriesUniform") @@ -104,9 +134,10 @@ Item { compare(basic.barSpacing, Qt.size(0.1, 0.1), "barSpacing") compare(basic.barSpacingRelative, false, "barSpacingRelative") compare(basic.floorLevel, 1.0, "floorLevel") + waitForRendering(top) } - function test_change_basic() { + function test_2_basic_change() { basic.multiSeriesUniform = false basic.barThickness = 0.5 basic.barSpacing = Qt.size(1.0, 0.0) @@ -117,13 +148,17 @@ Item { compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing") compare(basic.barSpacingRelative, true, "barSpacingRelative") compare(basic.floorLevel, 0.2, "floorLevel") + waitForRendering(top) } - function test_change_invalid_basic() { + function test_3_basic_change_invalid() { basic.barThickness = -1 basic.barSpacing = Qt.size(-1.0, -1.0) compare(basic.barThickness, -1/*0.5*/, "barThickness") // TODO: Fix once QTRD-3367 is done compare(basic.barSpacing, Qt.size(1.0, 0.0), "barSpacing") + waitForRendering(top) + basic.destroy() + waitForRendering(top) } } @@ -132,6 +167,7 @@ Item { when: windowShown function test_1_common() { + constructCommon() compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") if (common.shadowsSupported === true) @@ -154,6 +190,7 @@ Item { compare(common.locale, Qt.locale("C"), "locale") compare(common.queriedGraphPosition, Qt.vector3d(0, 0, 0), "queriedGraphPosition") compare(common.margin, -1, "margin") + waitForRendering(top) } function test_2_change_common() { @@ -194,6 +231,7 @@ Item { compare(common.reflectivity, 1.0, "reflectivity") compare(common.locale, Qt.locale("FI"), "locale") compare(common.margin, 1.0, "margin") + waitForRendering(top) } function test_3_change_invalid_common() { @@ -213,15 +251,21 @@ Item { compare(common.aspectRatio, -1.0/*1.0*/, "aspectRatio") // TODO: Fix once QTRD-3367 is done compare(common.horizontalAspectRatio, -2/*1*/, "horizontalAspectRatio") // TODO: Fix once QTRD-3367 is done compare(common.reflectivity, -1.0/*1.0*/, "reflectivity") // TODO: Fix once QTRD-3367 is done + + waitForRendering(top) + common.destroy() + waitForRendering(top) } function test_4_common_initialized() { + constructCommonInit() + compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") if (common_init.shadowsSupported === true) { - compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityLow) compare(common_init.msaaSamples, 2, "msaaSamples") } else { - compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + tryCompare(common_init, "shadowQuality", AbstractGraph3D.ShadowQualityNone) compare(common_init.msaaSamples, 0, "msaaSamples") } compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") @@ -238,6 +282,10 @@ Item { compare(common_init.reflectivity, 0.1, "reflectivity") compare(common_init.locale, Qt.locale("UK"), "locale") compare(common_init.margin, 0.2, "margin") + + waitForRendering(top) + common_init.destroy(); + waitForRendering(top) } } } |