diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-10-23 11:35:02 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-10-23 11:40:41 +0300 |
commit | 0679c92560c13b97a23dc7d9c70a54f669e3de18 (patch) | |
tree | 4f3e68874134d52f7ce1ca5526da75473b670c83 /tests/auto | |
parent | 14ba79846a1e8a63df47b374f7808ae2447c7e2f (diff) |
Autotests ES2 fix
Some properties have different default values, or cannot be
changed at all on ES2.
Change-Id: Ieb3951f5692a645eafab492819ce18de19134335
Change-Id: Ieb3951f5692a645eafab492819ce18de19134335
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qmltest/bars3d/tst_basic.qml | 21 | ||||
-rw-r--r-- | tests/auto/qmltest/scatter3d/tst_basic.qml | 21 | ||||
-rw-r--r-- | tests/auto/qmltest/surface3d/tst_basic.qml | 21 |
3 files changed, 45 insertions, 18 deletions
diff --git a/tests/auto/qmltest/bars3d/tst_basic.qml b/tests/auto/qmltest/bars3d/tst_basic.qml index cfba9b4a..bf27ae8c 100644 --- a/tests/auto/qmltest/bars3d/tst_basic.qml +++ b/tests/auto/qmltest/bars3d/tst_basic.qml @@ -131,8 +131,10 @@ Item { function test_1_common() { compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - compare(common.shadowsSupported, true, "shadowsSupported") - compare(common.msaaSamples, 4, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -156,7 +158,10 @@ Item { common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - compare(common.msaaSamples, 8, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -209,9 +214,13 @@ Item { function test_4_common_initialized() { compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") - compare(common_init.shadowsSupported, true, "shadowsSupported") - compare(common_init.msaaSamples, 2, "msaaSamples") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") diff --git a/tests/auto/qmltest/scatter3d/tst_basic.qml b/tests/auto/qmltest/scatter3d/tst_basic.qml index 985236be..b7221701 100644 --- a/tests/auto/qmltest/scatter3d/tst_basic.qml +++ b/tests/auto/qmltest/scatter3d/tst_basic.qml @@ -94,8 +94,10 @@ Item { function test_1_common() { compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - compare(common.shadowsSupported, true, "shadowsSupported") - compare(common.msaaSamples, 4, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -119,7 +121,10 @@ Item { common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - compare(common.msaaSamples, 8, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -172,9 +177,13 @@ Item { function test_4_common_initialized() { compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") - compare(common_init.shadowsSupported, true, "shadowsSupported") - compare(common_init.msaaSamples, 2, "msaaSamples") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") diff --git a/tests/auto/qmltest/surface3d/tst_basic.qml b/tests/auto/qmltest/surface3d/tst_basic.qml index ba82a524..dfcc4542 100644 --- a/tests/auto/qmltest/surface3d/tst_basic.qml +++ b/tests/auto/qmltest/surface3d/tst_basic.qml @@ -102,8 +102,10 @@ Item { function test_1_common() { compare(common.selectionMode, AbstractGraph3D.SelectionItem, "selectionMode") compare(common.shadowQuality, AbstractGraph3D.ShadowQualityMedium, "shadowQuality") - compare(common.shadowsSupported, true, "shadowsSupported") - compare(common.msaaSamples, 4, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 4, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") compare(common.theme.type, Theme3D.ThemeQt, "theme") compare(common.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common.measureFps, false, "measureFps") @@ -127,7 +129,10 @@ Item { common.shadowQuality = AbstractGraph3D.ShadowQualitySoftHigh compare(common.shadowQuality, AbstractGraph3D.ShadowQualitySoftHigh, "shadowQuality") common.msaaSamples = 8 - compare(common.msaaSamples, 8, "msaaSamples") + if (common.shadowsSupported === true) + compare(common.msaaSamples, 8, "msaaSamples") + else + compare(common.msaaSamples, 0, "msaaSamples") common.theme.type = Theme3D.ThemeRetro common.renderingMode = AbstractGraph3D.RenderDirectToBackground_NoClear common.measureFps = true @@ -180,9 +185,13 @@ Item { function test_4_common_initialized() { compare(common_init.selectionMode, AbstractGraph3D.SelectionNone, "selectionMode") - compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") - compare(common_init.shadowsSupported, true, "shadowsSupported") - compare(common_init.msaaSamples, 2, "msaaSamples") + if (common_init.shadowsSupported === true) { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityLow, "shadowQuality") + compare(common_init.msaaSamples, 2, "msaaSamples") + } else { + compare(common_init.shadowQuality, AbstractGraph3D.ShadowQualityNone, "shadowQuality") + compare(common_init.msaaSamples, 0, "msaaSamples") + } compare(common_init.theme.type, Theme3D.ThemeUserDefined, "theme") compare(common_init.renderingMode, AbstractGraph3D.RenderIndirect, "renderingMode") compare(common_init.measureFps, true, "measureFps") |