git.iko.soy/unity8
on xenial help sign in
Fix icon test
commit0fbc6ba03cb2e888f7b2ff12db7f7b3172bd403f authorJosh Arenson <joshua.arenson@canonical.com> dateFri 20 Nov 2015, 17:29 (11 years ago) parentc4f95c4
3 files changed+13−26
compare with xenial
unifiedsplit
qml/Greeter/SessionsList.qml+2−7 tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1 tests/qmltests/Greeter/tst_WideView.qml+10−18
qml/Greeter/SessionsList.qml+2−7
@@ -21,6 +21,7 @@ import "." 0.1
2121
2222Item {
2323 id: root
24+ objectName: "sessionsList"
2425
2526 property string initiallySelectedSession
2627 property alias selectedIndex: sessionsList.selectedIndex
@@ -37,7 +38,7 @@ Item {
3738
3839 ItemSelector {
3940 id: sessionsList
40− objectName: "sessionsList"
41+ objectName: "sessionsListSelector"
4142
4243 property color originalBackground
4344 anchors.centerIn: parent
@@ -51,12 +52,6 @@ Item {
5152 iconSource: icon_url
5253 text: display
5354 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− }
6055 }
6156
6257 Component.onCompleted: {
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
@@ -49,7 +49,7 @@ void SessionsModelPrivate::resetEntries_multipleSessions()
4949 {"", "", "Ubuntu", ""},
5050 {"", "", "GNOME", ""},
5151 {"", "", "Plasma", ""},
52− {"", "", "Unknown?", ""}
52+ {"", "", "Unknown", ""}
5353 };
5454}
5555
tests/qmltests/Greeter/tst_WideView.qml+10−18
@@ -391,7 +391,7 @@ Item {
391391 }
392392
393393 function test_sessionIconsAreValid() {
394− /*LightDM.Sessions.testScenario = "multipleSessions"
394+ LightDM.Sessions.testScenario = "multipleSessions"
395395 var originalDirectories = LightDM.Sessions.iconSearchDirectories
396396 LightDM.Sessions.iconSearchDirectories = [testIconDirectory]
397397
@@ -401,31 +401,23 @@ Item {
401401
402402 var session = String(view.sessionToStart).toLowerCase()
403403 var icon = String(sessionChooserButton.icon)
404− compare(icon.indexOf(session) > -1, true)*/
404+ compare(icon.indexOf(session) > -1, true)
405+
405406 // 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
413407 view.loginListShown = false
414− var sessionList = findChild(view, "sessionsList");
415− compare(sessionList.expanded, true)
416− compare(sessionList.visible, true)
417−
408+ var sessionsList = findChild(view, "sessionsList");
409+ var sessionsListSelector = findChild(view, "sessionsListSelector");
410+ waitForRendering(sessionsList)
411+ compare(sessionsListSelector.expanded, true)
412+ compare(sessionsList.visible, true)
418413
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++) {
422415 var delegateName = "sessionDelegate" + String(i);
423416 var currentDelegate = findChild(view, delegateName)
424417 var session = String(currentDelegate.text).toLowerCase()
425− console.log("\n\n SESSION NAME: " + session)
426418 var icon = String(currentDelegate.iconSource)
427419 compare(icon.indexOf(session) > -1, true)
428− } */
420+ }
429421 }
430422
431423 function test_noSessionsDoesntBreakView() {