tst_combobox: remove the extra ApplicationWindow instance

These tests dealing with multiple windows were just causing failures
and major headache in the CI...

Change-Id: I6d200c87d7efade1e2484c0ef57f95888f196ba6
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 46 insertions, 102 deletions

diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 041e632a..b2782b44 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -39,7 +39,7 @@
 ****************************************************************************/
 
 import QtQuick 2.2
-//import QtQuick.Window 2.2
+import QtQuick.Window 2.2
 import QtTest 1.0
 import Qt.labs.controls 1.0
 
@@ -47,18 +47,10 @@ TestCase {
     id: testCase
     width: 200
     height: 200
-//    visible: true
-//    when: windowShown
+    visible: true
+    when: windowShown
     name: "ComboBox"
 
-    ApplicationWindow {
-        id: applicationWindow
-        visible: true
-        width: 400
-        height: 400
-        font.pixelSize: 25
-    }
-
     SignalSpy {
         id: activatedSpy
         signalName: "activated"
@@ -324,20 +316,11 @@ TestCase {
         control.destroy()
     }
 
-    function test_arrowKeys_data() {
-        return [
-//            { tag: "Window", window: testCase.Window.window },
-            { tag: "ApplicationWindow", window: applicationWindow }
-        ]
-    }
 
-    function test_arrowKeys(data) {
-        var control = comboBox.createObject(data.window.contentItem, {model: 3})
+    function test_arrowKeys() {
+        var control = comboBox.createObject(testCase, {model: 3})
         verify(control)
 
-        data.window.requestActivate()
-        tryCompare(data.window, "active", true)
-
         activatedSpy.target = control
         verify(activatedSpy.valid)
 
@@ -465,33 +448,21 @@ TestCase {
 
     function test_keys_data() {
         return [
-//            { tag: "Window: space-space", window: testCase.Window.window, key1: Qt.Key_Space, key2: Qt.Key_Space, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-//            { tag: "Window: space-enter", window: testCase.Window.window, key1: Qt.Key_Space, key2: Qt.Key_Enter, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-//            { tag: "Window: space-return", window: testCase.Window.window, key1: Qt.Key_Space, key2: Qt.Key_Return, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-//            { tag: "Window: space-escape", window: testCase.Window.window, key1: Qt.Key_Space, key2: Qt.Key_Escape, showPopup: true, showPress: true, hidePopup: true, hidePress: false },
-//            { tag: "Window: space-0", window: testCase.Window.window, key1: Qt.Key_Space, key2: Qt.Key_0, showPopup: true, showPress: true, hidePopup: false, hidePress: false },
-//            { tag: "Window: enter-enter", window: testCase.Window.window, key1: Qt.Key_Enter, key2: Qt.Key_Enter, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
-//            { tag: "Window: return-return", window: testCase.Window.window, key1: Qt.Key_Return, key2: Qt.Key_Return, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
-//            { tag: "Window: escape-escape", window: testCase.Window.window, key1: Qt.Key_Escape, key2: Qt.Key_Escape, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
-
-            { tag: "ApplicationWindow: space-space", window: applicationWindow, key1: Qt.Key_Space, key2: Qt.Key_Space, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-            { tag: "ApplicationWindow: space-enter", window: applicationWindow, key1: Qt.Key_Space, key2: Qt.Key_Enter, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-            { tag: "ApplicationWindow: space-return", window: applicationWindow, key1: Qt.Key_Space, key2: Qt.Key_Return, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
-            { tag: "ApplicationWindow: space-escape", window: applicationWindow, key1: Qt.Key_Space, key2: Qt.Key_Escape, showPopup: true, showPress: true, hidePopup: true, hidePress: false },
-            { tag: "ApplicationWindow: space-0", window: applicationWindow, key1: Qt.Key_Space, key2: Qt.Key_0, showPopup: true, showPress: true, hidePopup: false, hidePress: false },
-            { tag: "ApplicationWindow: enter-enter", window: applicationWindow, key1: Qt.Key_Enter, key2: Qt.Key_Enter, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
-            { tag: "ApplicationWindow: return-return", window: applicationWindow, key1: Qt.Key_Return, key2: Qt.Key_Return, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
-            { tag: "ApplicationWindow: escape-escape", window: applicationWindow, key1: Qt.Key_Escape, key2: Qt.Key_Escape, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
+            { tag: "space-space", key1: Qt.Key_Space, key2: Qt.Key_Space, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
+            { tag: "space-enter", key1: Qt.Key_Space, key2: Qt.Key_Enter, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
+            { tag: "space-return", key1: Qt.Key_Space, key2: Qt.Key_Return, showPopup: true, showPress: true, hidePopup: true, hidePress: true },
+            { tag: "space-escape", key1: Qt.Key_Space, key2: Qt.Key_Escape, showPopup: true, showPress: true, hidePopup: true, hidePress: false },
+            { tag: "space-0", key1: Qt.Key_Space, key2: Qt.Key_0, showPopup: true, showPress: true, hidePopup: false, hidePress: false },
+            { tag: "enter-enter", key1: Qt.Key_Enter, key2: Qt.Key_Enter, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
+            { tag: "return-return", key1: Qt.Key_Return, key2: Qt.Key_Return, showPopup: false, showPress: false, hidePopup: true, hidePress: false },
+            { tag: "escape-escape", key1: Qt.Key_Escape, key2: Qt.Key_Escape, showPopup: false, showPress: false, hidePopup: true, hidePress: false }
         ]
     }
 
     function test_keys(data) {
-        var control = comboBox.createObject(data.window.contentItem, {model: 3})
+        var control = comboBox.createObject(testCase, {model: 3})
         verify(control)
 
-        data.window.requestActivate()
-        tryCompare(data.window, "active", true)
-
         waitForRendering(control)
 
         control.forceActiveFocus()
@@ -519,15 +490,8 @@ TestCase {
         control.destroy()
     }
 
-    function test_popup_data() {
-        return [
-//            { tag: "Window", window: testCase.Window.window },
-            { tag: "ApplicationWindow", window: applicationWindow }
-        ]
-    }
-
-    function test_popup(data) {
-        var control = comboBox.createObject(data.window.contentItem, {model: 3})
+    function test_popup() {
+        var control = comboBox.createObject(testCase, {model: 3})
         verify(control)
 
         // show below
@@ -545,7 +509,7 @@ TestCase {
         tryCompare(control.popup, "visible", false)
 
         // show above
-        control.y = data.window.height - control.height
+        control.y = control.Window.height - control.height
         mousePress(control)
         compare(control.pressed, true)
         compare(control.popup.visible, false)
@@ -557,20 +521,10 @@ TestCase {
         control.destroy()
     }
 
-    function test_mouse_data() {
-        return [
-//            { tag: "Window", window: testCase.Window.window },
-            { tag: "ApplicationWindow", window: applicationWindow }
-        ]
-    }
-
-    function test_mouse(data) {
-        var control = comboBox.createObject(data.window.contentItem, {model: 3})
+    function test_mouse() {
+        var control = comboBox.createObject(testCase, {model: 3})
         verify(control)
 
-        data.window.requestActivate()
-        tryCompare(data.window, "active", true)
-
         activatedSpy.target = control
         verify(activatedSpy.valid)
 
@@ -610,20 +564,10 @@ TestCase {
         control.destroy()
     }
 
-    function test_focus_data() {
-        return [
-//            { tag: "Window", window: testCase.Window.window },
-            { tag: "ApplicationWindow", window: applicationWindow }
-        ]
-    }
-
-    function test_focus(data) {
-        var control = comboBox.createObject(data.window.contentItem, {model: 3})
+    function test_focus() {
+        var control = comboBox.createObject(testCase, {model: 3})
         verify(control)
 
-        data.window.requestActivate()
-        tryCompare(data.window, "active", true)
-
         waitForRendering(control)
 
         // click - gain focus - show popup
@@ -721,7 +665,7 @@ TestCase {
     }
 
     function test_font() { // QTBUG_50984, QTBUG-51696
-        var control = component.createObject(applicationWindow.contentItem)
+        var control = component.createObject(testCase)
         verify(control)
         verify(control.button)
         verify(control.combobox)
@@ -732,44 +676,44 @@ TestCase {
         compare(control.button.font.pixelSize, 20)
         compare(control.combobox.font.pixelSize, 30)
 
-        verify(control.combobox.popup)
-        var popup = control.combobox.popup
-        popup.open()
+//        verify(control.combobox.popup)
+//        var popup = control.combobox.popup
+//        popup.open()
 
-        verify(popup.contentItem)
+//        verify(popup.contentItem)
 
-        var listview = popup.contentItem
-        verify(listview.contentItem)
-        waitForRendering(listview)
+//        var listview = popup.contentItem
+//        verify(listview.contentItem)
+//        waitForRendering(listview)
 
-        var idx1 = getChild(listview.contentItem, "delegate", -1)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
-        var idx2 = getChild(listview.contentItem, "delegate", idx1)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
+//        var idx1 = getChild(listview.contentItem, "delegate", -1)
+//        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
+//        var idx2 = getChild(listview.contentItem, "delegate", idx1)
+//        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
 
-        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
+//        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
+//        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
 
         control.font.pixelSize = control.font.pixelSize + 10
         compare(control.combobox.font.pixelSize, 40)
-        waitForRendering(listview)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
+//        waitForRendering(listview)
+//        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
+//        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
 
         control.combobox.font.pixelSize = control.combobox.font.pixelSize + 5
         compare(control.combobox.font.pixelSize, 45)
-        waitForRendering(listview)
+//        waitForRendering(listview)
 
-        idx1 = getChild(listview.contentItem, "delegate", -1)
-        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
-        idx2 = getChild(listview.contentItem, "delegate", idx1)
-        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
+//        idx1 = getChild(listview.contentItem, "delegate", -1)
+//        compare(listview.contentItem.children[idx1].font.pixelSize, 25)
+//        idx2 = getChild(listview.contentItem, "delegate", idx1)
+//        compare(listview.contentItem.children[idx2].font.pixelSize, 25)
 
         control.destroy()
     }
 
-    function test_wheel(data) {
-        var control = comboBox.createObject(applicationWindow.contentItem, {model: 2, wheelEnabled: true})
+    function test_wheel() {
+        var control = comboBox.createObject(testCase, {model: 2, wheelEnabled: true})
         verify(control)
 
         var delta = 120
@@ -802,7 +746,7 @@ TestCase {
 
     // QTBUG-51645
     function test_activation(data) {
-        var control = comboBox.createObject(applicationWindow.contentItem, {currentIndex: 1, model: ["Apple", "Orange", "Banana"]})
+        var control = comboBox.createObject(testCase, {currentIndex: 1, model: ["Apple", "Orange", "Banana"]})
         verify(control)
 
         waitForRendering(control)