diff options
author | Sami Nurmenniemi <sami.nurmenniemi@qt.io> | 2018-01-05 16:38:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-08 08:47:26 +0000 |
commit | c053e8aa063fa679b712935cc1495a51f2ddaf6b (patch) | |
tree | 09196d9bc19d5a6bf57c90d84c8c9f1ee093e8ff /tests/auto/controls/data | |
parent | 0be966ba560ec11d3835e2ad5925b59666ad200c (diff) | |
download | qtquickcontrols-c053e8aa063fa679b712935cc1495a51f2ddaf6b.tar.gz |
Re-enable skipped tests
QtDeclarative was fixed with 781caafe1fde71b059c0e3a42bda77ce0d7e4c2a
and tests pass now.
Task-number: QTBUG-65521
Change-Id: Ibb88e17a182786f8299a6ab00bd74862aba548ce
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/controls/data')
-rw-r--r-- | tests/auto/controls/data/tst_combobox.qml | 7 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_menubar.qml | 2 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 5 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_splitview.qml | 5 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tableview.qml | 6 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_tabview.qml | 5 | ||||
-rw-r--r-- | tests/auto/controls/data/tst_treeview.qml | 6 |
7 files changed, 1 insertions, 35 deletions
diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 03ed6c7a..415d3ad3 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -192,9 +192,7 @@ TestCase { } function test_append_find() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.2; \ + var comboBox = Qt.createQmlObject( 'import QtQuick.Controls 1.2; \ import QtQuick 2.2; \ ComboBox { \ model:ListModel{ListElement{text:"first"}} \ @@ -229,9 +227,6 @@ TestCase { } function test_editable() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - var arrayModel = ['Banana', 'Coco', 'Coconut', 'Apple', 'Cocomuffin' ] var comboBox = Qt.createQmlObject('import QtQuick.Controls 1.2; \ ComboBox { \ diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index 1aac4c0a..ca608475 100644 --- a/tests/auto/controls/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -160,8 +160,6 @@ TestCase { function test_keyNavigation() { if (Qt.platform.os === "osx") skip("MenuBar cannot be reliably tested on OS X") - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") var window = createTemporaryObject(windowComponent) waitForRendering(window.contentItem) diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 72f8a7c7..e95d26d9 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -81,11 +81,6 @@ Item { Slider {} } - function init() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - } - function test_vertical() { var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); verify(slider.height < slider.width) diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index 17a632d9..631e7925 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -110,11 +110,6 @@ TestCase { } } - function init() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - } - function test_01_splitView() { var view = splitView.createObject(testCase); verify (view !== null, "splitview created is null") diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index 074cd6ec..fe50f241 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -70,12 +70,6 @@ TestCase { TableViewColumn { } } - function init() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - - } - function test_usingqmlmodel_data() { return [ {tag: "listmodel", a: "tableview/table5_listmodel.qml", expected: "A"}, diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml index 98d747de..c45eab6f 100644 --- a/tests/auto/controls/data/tst_tabview.qml +++ b/tests/auto/controls/data/tst_tabview.qml @@ -79,11 +79,6 @@ TestCase { Item {} } - function init() { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - } - function test_changeIndex() { var tabView = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); compare(tabView.count, 3) diff --git a/tests/auto/controls/data/tst_treeview.qml b/tests/auto/controls/data/tst_treeview.qml index 19ec4b9e..dad10a6b 100644 --- a/tests/auto/controls/data/tst_treeview.qml +++ b/tests/auto/controls/data/tst_treeview.qml @@ -82,12 +82,6 @@ Item { property var instance_selectionModel: 'import QtQml.Models 2.2; ItemSelectionModel {}' property var semiIndent: 20/2 // PM_TreeViewIndentation 20 in commonStyle - function init() - { - if (Qt.platform.pluginName === "offscreen") - skip("QTBUG-65211") - } - function cleanup() { // Make sure to delete all children even when the test has failed. |