git.iko.soy/unity8
on xenial help sign in
fixed testShell
ecfff3aNick Dedekind
tests/qmltests/ApplicationMenuDataLoader.qml+2−2
compare with xenial
unifiedsplit
@@ -6,10 +6,10 @@ import Unity.Indicators 0.1 as Indicators
6
6
7Object {
7Object {
8
8
9− property var surfaceManager: null
9+ property alias surfaceManager: sMgrHandler.target
10
10
11 Connections {
11 Connections {
12− target: surfaceManager
12+ id: sMgrHandler
13 onSurfaceCreated: {
13 onSurfaceCreated: {
14 var fakeMenuPath = "/" + surface.persistentId.replace(/\W+/g, "");
14 var fakeMenuPath = "/" + surface.persistentId.replace(/\W+/g, "");
15
15
tests/qmltests/tst_Shell.qml+2−2
@@ -53,18 +53,18 @@ Rectangle {
53 shellLoader.active = true;
53 shellLoader.active = true;
54 }
54 }
55
55
56− SurfaceManager { id: sMgr }
57 ApplicationMenuDataLoader {
56 ApplicationMenuDataLoader {
58 id: appMenuData
57 id: appMenuData
59− surfaceManager: sMgr
60 }
58 }
61
59
62 property var shell: shellLoader.item ? shellLoader.item : null
60 property var shell: shellLoader.item ? shellLoader.item : null
63 onShellChanged: {
61 onShellChanged: {
64 if (shell) {
62 if (shell) {
65 topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
63 topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");
64+ appMenuData.surfaceManager = testCase.findInvisibleChild(shell, "surfaceManager");
66 } else {
65 } else {
67 topLevelSurfaceList = null;
66 topLevelSurfaceList = null;
67+ appMenuData.surfaceManager = null;
68 }
68 }
69 }
69 }
70
70