git.iko.soy/unity8
on xenial help sign in
Merge pull request #240 from ubports/xenial_-_unityTestSpeedup
31d9e49Marius Gripsgard
tests/qmltests/Stage/tst_PhoneStage.qml−9
compare with xenial
unifiedsplit
@@ -77,15 +77,6 @@ Item {
77 Column {
77 Column {
78 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
78 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
79 spacing: units.gu(1)
79 spacing: units.gu(1)
80− EdgeBarrierControls {
81− id: edgeBarrierControls
82− text: "Drag here to pull out spread"
83− backgroundColor: "blue"
84− onDragged: { stage.pushRightEdge(amount); }
85− Component.onCompleted: {
86− edgeBarrierControls.target = testCase.findChild(stage, "edgeBarrierController");
87− }
88− }
89 Repeater {
80 Repeater {
90 model: ApplicationManager.availableApplications
81 model: ApplicationManager.availableApplications
91 ApplicationCheckBox { appId: modelData }
82 ApplicationCheckBox { appId: modelData }
tests/qmltests/Stage/tst_TabletStage.qml−10
@@ -85,16 +85,6 @@ Rectangle {
85 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
85 anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
86 spacing: units.gu(1)
86 spacing: units.gu(1)
87
87
88− EdgeBarrierControls {
89− id: edgeBarrierControls
90− text: "Drag here to pull out spread"
91− backgroundColor: "blue"
92− onDragged: { stage.pushRightEdge(amount); }
93− Component.onCompleted: {
94− edgeBarrierControls.target = testCase.findChild(stage, "edgeBarrierController");
95− }
96− }
97−
98 Button {
88 Button {
99 text: testCase.sideStage ? testCase.sideStage.shown ? "Hide Side-stage" : "Show Side-stage" : ""
89 text: testCase.sideStage ? testCase.sideStage.shown ? "Hide Side-stage" : "Show Side-stage" : ""
100 enabled: testCase.sideStage
90 enabled: testCase.sideStage
tests/qmltests/tst_Shell.qml+4−4
@@ -2114,7 +2114,7 @@ Rectangle {
2114 {tag: "forceClose", replug: false, tabletMode: false, screenSize: Qt.size(units.gu(20), units.gu(40)) },
2114 {tag: "forceClose", replug: false, tabletMode: false, screenSize: Qt.size(units.gu(20), units.gu(40)) },
2115 {tag: "replug", replug: true, tabletMode: false, screenSize: Qt.size(units.gu(20), units.gu(40)) },
2115 {tag: "replug", replug: true, tabletMode: false, screenSize: Qt.size(units.gu(20), units.gu(40)) },
2116 {tag: "forceClose+tablet", replug: false, tabletMode: true, screenSize: Qt.size(units.gu(90), units.gu(65)) },
2116 {tag: "forceClose+tablet", replug: false, tabletMode: true, screenSize: Qt.size(units.gu(90), units.gu(65)) },
2117− {tag: "replug+tablet", replug: true, tabletMode: true, screenSize: Qt.size(units.gu(90), units.gu(65)) }
2117+ {tag: "replug+tablet", replug: true, tabletMode: true, screenSize: Qt.size(units.gu(90), units.gu(65)) },
2118 ];
2118 ];
2119 }
2119 }
2120
2120
@@ -2134,7 +2134,7 @@ Rectangle {
2134 waitForRendering(shell);
2134 waitForRendering(shell);
2135
2135
2136 // No legacy app running yet... Popup must *not* show.
2136 // No legacy app running yet... Popup must *not* show.
2137− var popup = findChild(root, "modeSwitchWarningDialog");
2137+ var popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2138 compare(popup, null);
2138 compare(popup, null);
2139
2139
2140 shell.usageScenario = "desktop"
2140 shell.usageScenario = "desktop"
@@ -2147,7 +2147,7 @@ Rectangle {
2147 waitForRendering(shell);
2147 waitForRendering(shell);
2148
2148
2149 // The popup must appear now, unless in "tablet" mode
2149 // The popup must appear now, unless in "tablet" mode
2150− popup = findChild(root, "modeSwitchWarningDialog");
2150+ popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2151 if (data.tabletMode) {
2151 if (data.tabletMode) {
2152 verify(!popup);
2152 verify(!popup);
2153 } else {
2153 } else {
@@ -2164,7 +2164,7 @@ Rectangle {
2164 }
2164 }
2165
2165
2166 // Popup must be gone now
2166 // Popup must be gone now
2167− popup = findChild(root, "modeSwitchWarningDialog");
2167+ popup = findChild(dialogs, "modeSwitchWarningDialog", 1000);
2168 tryCompareFunction(function() { return popup === null}, true);
2168 tryCompareFunction(function() { return popup === null}, true);
2169
2169
2170 if (data.replug || data.tabletMode) {
2170 if (data.replug || data.tabletMode) {