git.iko.soy/unity8
on xenial help sign in
Fix broken tests
c8c0a01Josh Arenson
tests/qmltests/Stages/tst_PhoneStage.qml−2
compare with xenial
unifiedsplit
@@ -34,8 +34,6 @@ Item {
34 maximizedAppTopMargin: units.gu(3) + units.dp(2)
34 maximizedAppTopMargin: units.gu(3) + units.dp(2)
35 interactive: true
35 interactive: true
36 shellOrientation: Qt.PortraitOrientation
36 shellOrientation: Qt.PortraitOrientation
37− shellPrimaryOrientation: Qt.PortraitOrientation
38− nativeOrientation: Qt.PortraitOrientation
39 }
37 }
40
38
41 Binding {
39 Binding {
tests/qmltests/Stages/tst_TabletStage.qml+2−2
@@ -22,6 +22,7 @@ import Unity.Application 0.1
22import Unity.Test 0.1
22import Unity.Test 0.1
23
23
24import "../../../qml/Stages"
24import "../../../qml/Stages"
25+import "../../../qml/Components"
25
26
26Rectangle {
27Rectangle {
27 id: root
28 id: root
@@ -50,10 +51,9 @@ Rectangle {
50 maximizedAppTopMargin: units.gu(3) + units.dp(2)
51 maximizedAppTopMargin: units.gu(3) + units.dp(2)
51 interactive: true
52 interactive: true
52 shellOrientation: Qt.LandscapeOrientation
53 shellOrientation: Qt.LandscapeOrientation
53− shellPrimaryOrientation: Qt.LandscapeOrientation
54− nativeOrientation: Qt.LandscapeOrientation
55 nativeWidth: width
54 nativeWidth: width
56 nativeHeight: height
55 nativeHeight: height
56+ orientations: Orientations{} // Defaults are fine for testing
57 focus: true
57 focus: true
58 }
58 }
59 }
59 }
tests/qmltests/tst_Shell.qml+1−1
@@ -98,7 +98,7 @@ Rectangle {
98 id: __shell
98 id: __shell
99 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
99 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
100 orientation: Qt.PortraitOrientation
100 orientation: Qt.PortraitOrientation
101− orientations: Orientations{ id: orientations }
101+ orientations: Orientations{} // Defaults are fine for testing
102 Component.onDestruction: {
102 Component.onDestruction: {
103 shellLoader.itemDestroyed = true;
103 shellLoader.itemDestroyed = true;
104 }
104 }