git.iko.soy/unity8
on xenial help sign in
Fix broken tests
commitc8c0a0192dac40be55b44aef4de7701684e3fb25 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 1 Oct 2015, 09:19 (11 years ago) parent3794592
3 files changed+3−5
compare with xenial
unifiedsplit
tests/qmltests/Stages/tst_PhoneStage.qml−2 tests/qmltests/Stages/tst_TabletStage.qml+2−2 tests/qmltests/tst_Shell.qml+1−1
tests/qmltests/Stages/tst_PhoneStage.qml−2
@@ -34,8 +34,6 @@ Item {
3434 maximizedAppTopMargin: units.gu(3) + units.dp(2)
3535 interactive: true
3636 shellOrientation: Qt.PortraitOrientation
37− shellPrimaryOrientation: Qt.PortraitOrientation
38− nativeOrientation: Qt.PortraitOrientation
3937 }
4038
4139 Binding {
tests/qmltests/Stages/tst_TabletStage.qml+2−2
@@ -22,6 +22,7 @@ import Unity.Application 0.1
2222import Unity.Test 0.1
2323
2424import "../../../qml/Stages"
25+import "../../../qml/Components"
2526
2627Rectangle {
2728 id: root
@@ -50,10 +51,9 @@ Rectangle {
5051 maximizedAppTopMargin: units.gu(3) + units.dp(2)
5152 interactive: true
5253 shellOrientation: Qt.LandscapeOrientation
53− shellPrimaryOrientation: Qt.LandscapeOrientation
54− nativeOrientation: Qt.LandscapeOrientation
5554 nativeWidth: width
5655 nativeHeight: height
56+ orientations: Orientations{} // Defaults are fine for testing
5757 focus: true
5858 }
5959 }
tests/qmltests/tst_Shell.qml+1−1
@@ -98,7 +98,7 @@ Rectangle {
9898 id: __shell
9999 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
100100 orientation: Qt.PortraitOrientation
101− orientations: Orientations{ id: orientations }
101+ orientations: Orientations{} // Defaults are fine for testing
102102 Component.onDestruction: {
103103 shellLoader.itemDestroyed = true;
104104 }