git.iko.soy/unity8
on xenial help sign in
Fix icon test
0fbc6baJosh Arenson
qml/Greeter/SessionsList.qml+2−7
compare with xenial
unifiedsplit
@@ -21,6 +21,7 @@ import "." 0.1
21
21
22Item {
22Item {
23 id: root
23 id: root
24+ objectName: "sessionsList"
24
25
25 property string initiallySelectedSession
26 property string initiallySelectedSession
26 property alias selectedIndex: sessionsList.selectedIndex
27 property alias selectedIndex: sessionsList.selectedIndex
@@ -37,7 +38,7 @@ Item {
37
38
38 ItemSelector {
39 ItemSelector {
39 id: sessionsList
40 id: sessionsList
40− objectName: "sessionsList"
41+ objectName: "sessionsListSelector"
41
42
42 property color originalBackground
43 property color originalBackground
43 anchors.centerIn: parent
44 anchors.centerIn: parent
@@ -51,12 +52,6 @@ Item {
51 iconSource: icon_url
52 iconSource: icon_url
52 text: display
53 text: display
53 selected: display.toLowerCase() === initiallySelectedSession.toLowerCase()
54 selected: display.toLowerCase() === initiallySelectedSession.toLowerCase()
54− Component.onCompleted: {
55− console.log("ADDED A SESSION DELEGATE: " + display)
56− if (text === "Plasma") {
57− console.log("PLASMA PLASMA PLASMA PLASMA!!!!!")
58− }
59− }
60 }
55 }
61
56
62 Component.onCompleted: {
57 Component.onCompleted: {
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
@@ -49,7 +49,7 @@ void SessionsModelPrivate::resetEntries_multipleSessions()
49 {"", "", "Ubuntu", ""},
49 {"", "", "Ubuntu", ""},
50 {"", "", "GNOME", ""},
50 {"", "", "GNOME", ""},
51 {"", "", "Plasma", ""},
51 {"", "", "Plasma", ""},
52− {"", "", "Unknown?", ""}
52+ {"", "", "Unknown", ""}
53 };
53 };
54}
54}
55
55
tests/qmltests/Greeter/tst_WideView.qml+10−18
@@ -391,7 +391,7 @@ Item {
391 }
391 }
392
392
393 function test_sessionIconsAreValid() {
393 function test_sessionIconsAreValid() {
394− /*LightDM.Sessions.testScenario = "multipleSessions"
394+ LightDM.Sessions.testScenario = "multipleSessions"
395 var originalDirectories = LightDM.Sessions.iconSearchDirectories
395 var originalDirectories = LightDM.Sessions.iconSearchDirectories
396 LightDM.Sessions.iconSearchDirectories = [testIconDirectory]
396 LightDM.Sessions.iconSearchDirectories = [testIconDirectory]
397
397
@@ -401,31 +401,23 @@ Item {
401
401
402 var session = String(view.sessionToStart).toLowerCase()
402 var session = String(view.sessionToStart).toLowerCase()
403 var icon = String(sessionChooserButton.icon)
403 var icon = String(sessionChooserButton.icon)
404− compare(icon.indexOf(session) > -1, true)*/
404+ compare(icon.indexOf(session) > -1, true)
405+
405 // Test the session list icons are valid
406 // Test the session list icons are valid
406− //mouseClick(sessionChooserButton)
407− //view.loginListShown = false
408− view.testThing = false
409− sleep(50000)
410− console.log("\n\n\n\n\n\n\n\n\n\n\n\n\n")
411− loader.active = false
412− loader.active = true
413 view.loginListShown = false
407 view.loginListShown = false
414− var sessionList = findChild(view, "sessionsList");
408+ var sessionsList = findChild(view, "sessionsList");
409+ var sessionsListSelector = findChild(view, "sessionsListSelector");
410+ waitForRendering(sessionsList)
415− compare(sessionList.expanded, true)
411+ compare(sessionsListSelector.expanded, true)
416− compare(sessionList.visible, true)
412+ compare(sessionsList.visible, true)
417−
418
413
419− //compare(true, false)
420−
421−/* for (var i = 0; i < LightDM.Sessions.count; i++) {
414+ for (var i = 0; i < LightDM.Sessions.count; i++) {
422 var delegateName = "sessionDelegate" + String(i);
415 var delegateName = "sessionDelegate" + String(i);
423 var currentDelegate = findChild(view, delegateName)
416 var currentDelegate = findChild(view, delegateName)
424 var session = String(currentDelegate.text).toLowerCase()
417 var session = String(currentDelegate.text).toLowerCase()
425− console.log("\n\n SESSION NAME: " + session)
426 var icon = String(currentDelegate.iconSource)
418 var icon = String(currentDelegate.iconSource)
427 compare(icon.indexOf(session) > -1, true)
419 compare(icon.indexOf(session) > -1, true)
428− } */
420+ }
429 }
421 }
430
422
431 function test_noSessionsDoesntBreakView() {
423 function test_noSessionsDoesntBreakView() {