1
=== modified file 'qml/Greeter/LoginList.qml'
2
--- qml/Greeter/LoginList.qml	2016-11-16 02:13:48 +0000
3
+++ qml/Greeter/LoginList.qml	2016-11-16 02:13:50 +0000
4
@@ -165,7 +165,7 @@
5
165
        }
165
        }
6
166
166
7
167
        delegate: Item {
167
        delegate: Item {
9
168
            width: parent.width
168
            width: userList.width
10
169
            height: root.cellHeight
169
            height: root.cellHeight
11
170
170
12
171
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
171
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
13
172
172
14
=== modified file 'qml/Greeter/WideView.qml'
15
--- qml/Greeter/WideView.qml	2016-11-16 02:13:48 +0000
16
+++ qml/Greeter/WideView.qml	2016-11-16 02:13:50 +0000
17
@@ -125,6 +125,8 @@
18
125
            id: loginList
125
            id: loginList
19
126
            objectName: "loginList"
126
            objectName: "loginList"
20
127
127
21
128
            property int selectedUserIndex: 0
22
129
23
128
            width: units.gu(40)
130
            width: units.gu(40)
24
129
            anchors {
131
            anchors {
25
130
                left: parent.left
132
                left: parent.left
26
@@ -139,12 +141,30 @@
27
139
            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
141
            Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
28
140
142
29
141
            model: root.userModel
143
            model: root.userModel
31
142
            currentSession: LightDM.Greeter.defaultSession
144
            currentSession: LightDM.Users.data(selectedUserIndex,
32
145
                                               LightDM.UserRoles.SessionRole);
33
143
            onResponded: root.responded(response)
146
            onResponded: root.responded(response)
35
144
            onSelected: root.selected(index)
147
            onSelected: {
36
148
                if (LightDM.Users.mock) {
37
149
                    LightDM.Users.mock.currentUsername = currentUser;
38
150
                }
39
151
40
152
                loginList.selectedUserIndex = index;
41
153
                root.selected(index)
42
154
            }
43
145
            onSessionChooserButtonClicked: parent.state = "SessionsList"
155
            onSessionChooserButtonClicked: parent.state = "SessionsList"
44
146
156
45
147
            Keys.forwardTo: [sessionChooserLoader.item]
157
            Keys.forwardTo: [sessionChooserLoader.item]
46
158
47
159
            // This is only for testing
48
160
            Connections {
49
161
                // TODO when Qt 5.7
50
162
                //enabled: LightDM.Users.mock
51
163
                target: LightDM.Users
52
164
                onModelReset: {
53
165
                    loginList.currentSession = LightDM.Users.data(loginList.selectedUserIndex, LightDM.UserRoles.SessionRole);
54
166
                 }
55
167
            }
56
148
        }
168
        }
57
149
169
58
150
        Loader {
170
        Loader {
59
151
171
60
=== modified file 'tests/mocks/liblightdm/MockController.cpp'
61
--- tests/mocks/liblightdm/MockController.cpp	2016-11-16 02:13:48 +0000
62
+++ tests/mocks/liblightdm/MockController.cpp	2016-11-16 02:13:50 +0000
63
@@ -98,6 +98,30 @@
64
98
    }
98
    }
65
99
}
99
}
66
100
100
67
101
QString MockController::sessionName() const
68
102
{
69
103
    return QString("INVALID - Please read directly from the UserModel");
70
104
}
71
105
72
106
void MockController::setSessionName(const QString &sessionName)
73
107
{
74
108
        // Let the user model deal with this
75
109
        Q_EMIT sessionNameChanged(sessionName, m_currentUsername);
76
110
}
77
111
78
112
QString MockController::currentUsername() const
79
113
{
80
114
    return m_currentUsername;
81
115
}
82
116
83
117
void MockController::setCurrentUsername(const QString &username)
84
118
{
85
119
    if (m_currentUsername != username) {
86
120
        m_currentUsername = username;
87
121
        Q_EMIT currentUsernameChanged();
88
122
    }
89
123
}
90
124
91
101
const QList<MockController::SessionItem> &MockController::fullSessionItems() const
125
const QList<MockController::SessionItem> &MockController::fullSessionItems() const
92
102
{
126
{
93
103
    return m_fullSessions;
127
    return m_fullSessions;
94
104
128
95
=== modified file 'tests/mocks/liblightdm/MockController.h'
96
--- tests/mocks/liblightdm/MockController.h	2016-11-16 02:13:48 +0000
97
+++ tests/mocks/liblightdm/MockController.h	2016-11-16 02:13:50 +0000
98
@@ -35,6 +35,11 @@
99
35
    // single, none, full
35
    // single, none, full
100
36
    Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)
36
    Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)
101
37
37
102
38
    // This would be best as a Q_INVOKABLE, but using a property allows for
103
39
    // keeping the mock cleaner
104
40
    Q_PROPERTY(QString sessionName READ sessionName WRITE setSessionName NOTIFY sessionNameChanged)
105
41
    Q_PROPERTY(QString currentUsername READ currentUsername WRITE setCurrentUsername NOTIFY currentUsernameChanged)
106
42
107
38
    Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)
43
    Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)
108
39
    Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
44
    Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
109
40
45
110
@@ -51,6 +56,12 @@
111
51
    QString sessionMode() const;
56
    QString sessionMode() const;
112
52
    void setSessionMode(const QString &sessionMode);
57
    void setSessionMode(const QString &sessionMode);
113
53
58
114
59
    QString sessionName() const;
115
60
    void setSessionName(const QString &sessionName);
116
61
117
62
    QString currentUsername() const;
118
63
    void setCurrentUsername(const QString &userIndex);
119
64
120
54
    class SessionItem
65
    class SessionItem
121
55
    {
66
    {
122
56
    public:
67
    public:
123
@@ -64,14 +75,18 @@
124
64
    void setNumSessions(int numSessions);
75
    void setNumSessions(int numSessions);
125
65
76
126
66
Q_SIGNALS:
77
Q_SIGNALS:
127
78
    void currentUsernameChanged();
128
67
    void selectUserHintChanged();
79
    void selectUserHintChanged();
129
68
    void userModeChanged();
80
    void userModeChanged();
130
69
    void sessionModeChanged();
81
    void sessionModeChanged();
131
82
    void sessionNameChanged(const QString &sessionName, const QString &username);
132
70
    void numSessionsChanged();
83
    void numSessionsChanged();
133
71
84
134
72
private:
85
private:
135
73
    explicit MockController(QObject* parent=0);
86
    explicit MockController(QObject* parent=0);
136
74
87
137
88
    QString m_currentUsername;
138
89
    QString m_sessionName;
139
75
    QString m_selectUserHint;
90
    QString m_selectUserHint;
140
76
    QString m_userMode;
91
    QString m_userMode;
141
77
    QString m_sessionMode;
92
    QString m_sessionMode;
142
78
93
143
=== modified file 'tests/mocks/liblightdm/MockUsersModel.cpp'
144
--- tests/mocks/liblightdm/MockUsersModel.cpp	2016-11-16 02:13:48 +0000
145
+++ tests/mocks/liblightdm/MockUsersModel.cpp	2016-11-16 02:13:50 +0000
146
@@ -67,6 +67,8 @@
147
67
67
148
68
    connect(MockController::instance(), &MockController::userModeChanged,
68
    connect(MockController::instance(), &MockController::userModeChanged,
149
69
            this, &UsersModel::resetEntries);
69
            this, &UsersModel::resetEntries);
150
70
    connect(MockController::instance(), &MockController::sessionNameChanged,
151
71
            this, &UsersModel::setCurrentSessionName);
152
70
    resetEntries();
72
    resetEntries();
153
71
}
73
}
154
72
74
155
@@ -75,6 +77,22 @@
156
75
    delete d_ptr;
77
    delete d_ptr;
157
76
}
78
}
158
77
79
159
80
void UsersModel::setCurrentSessionName(const QString &sessionName, const QString &username)
160
81
{
161
82
    Q_D(UsersModel);
162
83
163
84
    beginResetModel();
164
85
165
86
    for (auto &entry : d->entries) {
166
87
        if (username == entry.username) {
167
88
            entry.session = sessionName;
168
89
            break;
169
90
        }
170
91
    }
171
92
172
93
    endResetModel();
173
94
}
174
95
175
78
int UsersModel::rowCount(const QModelIndex &parent) const
96
int UsersModel::rowCount(const QModelIndex &parent) const
176
79
{
97
{
177
80
    Q_D(const UsersModel);
98
    Q_D(const UsersModel);
178
@@ -138,28 +156,33 @@
179
138
    } else if (userMode == "single-pin") {
156
    } else if (userMode == "single-pin") {
180
139
        d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};
157
        d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};
181
140
    } else if (userMode == "full") {
158
    } else if (userMode == "full") {
182
159
        /*
183
160
         * Since the real model sorts these entries alphabetically, the model indices
184
161
         * don't line up correctly. The easiest way to fix this is to ensure that this
185
162
         * list of entries REMAINS IN ALPHABETICAL ORDER at all times.
186
163
         */
187
141
        d->entries = {
164
        d->entries = {
188
165
            { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
189
166
            { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
190
167
            { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
191
168
            { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
192
169
            { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
193
170
            { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
194
142
            { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
171
            { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
195
143
            { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
172
            { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
200
144
            { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
173
            { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
197
145
            { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
198
146
            { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
199
147
            { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
201
148
            { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
174
            { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
202
149
            { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
203
150
            { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
175
            { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
205
151
            { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
176
            { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
206
152
            { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
177
            { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
209
153
            { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
178
            { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
210
154
            { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
179
            { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
211
180
            { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
212
181
            { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
213
182
            { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
214
155
            // white and black are a bit redundant, but useful for manually testing if UI is still readable
183
            // white and black are a bit redundant, but useful for manually testing if UI is still readable
215
156
            { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
184
            { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
222
157
            { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
185
            { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 }
217
158
            { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
218
159
            { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
219
160
            { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
220
161
            { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
221
162
            { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
223
163
        };
186
        };
224
164
    }
187
    }
225
165
188
226
166
189
227
=== modified file 'tests/mocks/liblightdm/MockUsersModel.h'
228
--- tests/mocks/liblightdm/MockUsersModel.h	2016-11-16 02:13:48 +0000
229
+++ tests/mocks/liblightdm/MockUsersModel.h	2016-11-16 02:13:50 +0000
230
@@ -52,6 +52,8 @@
231
52
    int rowCount(const QModelIndex &parent) const override;
52
    int rowCount(const QModelIndex &parent) const override;
232
53
    QVariant data(const QModelIndex &index, int role) const override;
53
    QVariant data(const QModelIndex &index, int role) const override;
233
54
54
234
55
    void setCurrentSessionName(const QString &sessionName, const QString &username);
235
56
236
55
    QObject *mock();
57
    QObject *mock();
237
56
58
238
57
private Q_SLOTS:
59
private Q_SLOTS:
239
58
60
240
=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
241
--- tests/qmltests/Greeter/tst_WideView.qml	2016-11-16 02:13:48 +0000
242
+++ tests/qmltests/Greeter/tst_WideView.qml	2016-11-16 02:13:50 +0000
243
@@ -409,6 +409,23 @@
244
409
            waitForRendering(view);
409
            waitForRendering(view);
245
410
        }
410
        }
246
411
411
247
412
        function test_changingSessionSticksToUser() {
248
413
            LightDM.Sessions.mock.sessionMode = "full";
249
414
            var loginList = findChild(view, "loginList");
250
415
            var fakeSessionName = "ASessionWillNeverBeCalledThis"
251
416
252
417
            compare(LightDM.Sessions.count > 1, true);
253
418
            compare(loginList.currentSession != fakeSessionName, true);
254
419
255
420
            LightDM.Users.mock.sessionName = fakeSessionName;
256
421
            tryCompare(loginList, "currentSession", fakeSessionName);
257
422
258
423
            // Force a model reset
259
424
            LightDM.Users.mock.userMode = "single";
260
425
            LightDM.Users.mock.userMode = "full";
261
426
262
427
        }
263
428
264
412
        function test_tease_data() {
429
        function test_tease_data() {
265
413
            return [
430
            return [
266
414
                {tag: "locked", x: 0, offset: 0, count: 0, locked: true},
431
                {tag: "locked", x: 0, offset: 0, count: 0, locked: true},
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-11-08	Needs Fixing on 2016-11-16
Michael Terry		2016-11-08	Pending
Albert Astals Cid		2016-11-08	Pending
Review via email: mp+310381@code.launchpad.net
1	=== modified file 'qml/Greeter/LoginList.qml'
2	--- qml/Greeter/LoginList.qml 2016-11-16 02:13:48 +0000
3	+++ qml/Greeter/LoginList.qml 2016-11-16 02:13:50 +0000
4	@@ -165,7 +165,7 @@
5	165	}	165	}
6	166		166
7	167	delegate: Item {	167	delegate: Item {
9	168	width: parent.width	168	width: userList.width
10	169	height: root.cellHeight	169	height: root.cellHeight
11	170		170
12	171	readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) \|\| (userList.currentIndex >= 0 && index > userList.currentIndex)	171	readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) \|\| (userList.currentIndex >= 0 && index > userList.currentIndex)
13	172		172
14	=== modified file 'qml/Greeter/WideView.qml'
15	--- qml/Greeter/WideView.qml 2016-11-16 02:13:48 +0000
16	+++ qml/Greeter/WideView.qml 2016-11-16 02:13:50 +0000
17	@@ -125,6 +125,8 @@
18	125	id: loginList	125	id: loginList
19	126	objectName: "loginList"	126	objectName: "loginList"
20	127		127
21			128	property int selectedUserIndex: 0
22			129
23	128	width: units.gu(40)	130	width: units.gu(40)
24	129	anchors {	131	anchors {
25	130	left: parent.left	132	left: parent.left
26	@@ -139,12 +141,30 @@
27	139	Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }	141	Behavior on boxVerticalOffset { UbuntuNumberAnimation {} }
28	140		142
29	141	model: root.userModel	143	model: root.userModel
31	142	currentSession: LightDM.Greeter.defaultSession	144	currentSession: LightDM.Users.data(selectedUserIndex,
32			145	LightDM.UserRoles.SessionRole);
33	143	onResponded: root.responded(response)	146	onResponded: root.responded(response)
35	144	onSelected: root.selected(index)	147	onSelected: {
36			148	if (LightDM.Users.mock) {
37			149	LightDM.Users.mock.currentUsername = currentUser;
38			150	}
39			151
40			152	loginList.selectedUserIndex = index;
41			153	root.selected(index)
42			154	}
43	145	onSessionChooserButtonClicked: parent.state = "SessionsList"	155	onSessionChooserButtonClicked: parent.state = "SessionsList"
44	146		156
45	147	Keys.forwardTo: [sessionChooserLoader.item]	157	Keys.forwardTo: [sessionChooserLoader.item]
46			158
47			159	// This is only for testing
48			160	Connections {
49			161	// TODO when Qt 5.7
50			162	//enabled: LightDM.Users.mock
51			163	target: LightDM.Users
52			164	onModelReset: {
53			165	loginList.currentSession = LightDM.Users.data(loginList.selectedUserIndex, LightDM.UserRoles.SessionRole);
54			166	}
55			167	}
56	148	}	168	}
57	149		169
58	150	Loader {	170	Loader {
59	151		171
60	=== modified file 'tests/mocks/liblightdm/MockController.cpp'
61	--- tests/mocks/liblightdm/MockController.cpp 2016-11-16 02:13:48 +0000
62	+++ tests/mocks/liblightdm/MockController.cpp 2016-11-16 02:13:50 +0000
63	@@ -98,6 +98,30 @@
64	98	}	98	}
65	99	}	99	}
66	100		100
67			101	QString MockController::sessionName() const
68			102	{
69			103	return QString("INVALID - Please read directly from the UserModel");
70			104	}
71			105
72			106	void MockController::setSessionName(const QString &sessionName)
73			107	{
74			108	// Let the user model deal with this
75			109	Q_EMIT sessionNameChanged(sessionName, m_currentUsername);
76			110	}
77			111
78			112	QString MockController::currentUsername() const
79			113	{
80			114	return m_currentUsername;
81			115	}
82			116
83			117	void MockController::setCurrentUsername(const QString &username)
84			118	{
85			119	if (m_currentUsername != username) {
86			120	m_currentUsername = username;
87			121	Q_EMIT currentUsernameChanged();
88			122	}
89			123	}
90			124
91	101	const QList<MockController::SessionItem> &MockController::fullSessionItems() const	125	const QList<MockController::SessionItem> &MockController::fullSessionItems() const
92	102	{	126	{
93	103	return m_fullSessions;	127	return m_fullSessions;
94	104		128
95	=== modified file 'tests/mocks/liblightdm/MockController.h'
96	--- tests/mocks/liblightdm/MockController.h 2016-11-16 02:13:48 +0000
97	+++ tests/mocks/liblightdm/MockController.h 2016-11-16 02:13:50 +0000
98	@@ -35,6 +35,11 @@
99	35	// single, none, full	35	// single, none, full
100	36	Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)	36	Q_PROPERTY(QString sessionMode READ sessionMode WRITE setSessionMode NOTIFY sessionModeChanged)
101	37		37
102			38	// This would be best as a Q_INVOKABLE, but using a property allows for
103			39	// keeping the mock cleaner
104			40	Q_PROPERTY(QString sessionName READ sessionName WRITE setSessionName NOTIFY sessionNameChanged)
105			41	Q_PROPERTY(QString currentUsername READ currentUsername WRITE setCurrentUsername NOTIFY currentUsernameChanged)
106			42
107	38	Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)	43	Q_PROPERTY(int numAvailableSessions READ numFullSessions CONSTANT)
108	39	Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)	44	Q_PROPERTY(int numSessions READ numSessions WRITE setNumSessions NOTIFY numSessionsChanged)
109	40		45
110	@@ -51,6 +56,12 @@
111	51	QString sessionMode() const;	56	QString sessionMode() const;
112	52	void setSessionMode(const QString &sessionMode);	57	void setSessionMode(const QString &sessionMode);
113	53		58
114			59	QString sessionName() const;
115			60	void setSessionName(const QString &sessionName);
116			61
117			62	QString currentUsername() const;
118			63	void setCurrentUsername(const QString &userIndex);
119			64
120	54	class SessionItem	65	class SessionItem
121	55	{	66	{
122	56	public:	67	public:
123	@@ -64,14 +75,18 @@
124	64	void setNumSessions(int numSessions);	75	void setNumSessions(int numSessions);
125	65		76
126	66	Q_SIGNALS:	77	Q_SIGNALS:
127			78	void currentUsernameChanged();
128	67	void selectUserHintChanged();	79	void selectUserHintChanged();
129	68	void userModeChanged();	80	void userModeChanged();
130	69	void sessionModeChanged();	81	void sessionModeChanged();
131			82	void sessionNameChanged(const QString &sessionName, const QString &username);
132	70	void numSessionsChanged();	83	void numSessionsChanged();
133	71		84
134	72	private:	85	private:
135	73	explicit MockController(QObject* parent=0);	86	explicit MockController(QObject* parent=0);
136	74		87
137			88	QString m_currentUsername;
138			89	QString m_sessionName;
139	75	QString m_selectUserHint;	90	QString m_selectUserHint;
140	76	QString m_userMode;	91	QString m_userMode;
141	77	QString m_sessionMode;	92	QString m_sessionMode;
142	78		93
143	=== modified file 'tests/mocks/liblightdm/MockUsersModel.cpp'
144	--- tests/mocks/liblightdm/MockUsersModel.cpp 2016-11-16 02:13:48 +0000
145	+++ tests/mocks/liblightdm/MockUsersModel.cpp 2016-11-16 02:13:50 +0000
146	@@ -67,6 +67,8 @@
147	67		67
148	68	connect(MockController::instance(), &MockController::userModeChanged,	68	connect(MockController::instance(), &MockController::userModeChanged,
149	69	this, &UsersModel::resetEntries);	69	this, &UsersModel::resetEntries);
150			70	connect(MockController::instance(), &MockController::sessionNameChanged,
151			71	this, &UsersModel::setCurrentSessionName);
152	70	resetEntries();	72	resetEntries();
153	71	}	73	}
154	72		74
155	@@ -75,6 +77,22 @@
156	75	delete d_ptr;	77	delete d_ptr;
157	76	}	78	}
158	77		79
159			80	void UsersModel::setCurrentSessionName(const QString &sessionName, const QString &username)
160			81	{
161			82	Q_D(UsersModel);
162			83
163			84	beginResetModel();
164			85
165			86	for (auto &entry : d->entries) {
166			87	if (username == entry.username) {
167			88	entry.session = sessionName;
168			89	break;
169			90	}
170			91	}
171			92
172			93	endResetModel();
173			94	}
174			95
175	78	int UsersModel::rowCount(const QModelIndex &parent) const	96	int UsersModel::rowCount(const QModelIndex &parent) const
176	79	{	97	{
177	80	Q_D(const UsersModel);	98	Q_D(const UsersModel);
178	@@ -138,28 +156,33 @@
179	138	} else if (userMode == "single-pin") {	156	} else if (userMode == "single-pin") {
180	139	d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};	157	d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};
181	140	} else if (userMode == "full") {	158	} else if (userMode == "full") {
182			159	/*
183			160	* Since the real model sorts these entries alphabetically, the model indices
184			161	* don't line up correctly. The easiest way to fix this is to ensure that this
185			162	* list of entries REMAINS IN ALPHABETICAL ORDER at all times.
186			163	*/
187	141	d->entries = {	164	d->entries = {
188			165	{ "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },
189			166	{ "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },
190			167	{ "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
191			168	{ "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
192			169	{ "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
193			170	{ "empty-name", "", 0, 0, false, false, "ubuntu", 0 },
194	142	{ "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },	171	{ "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },
195	143	{ "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },	172	{ "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
200	144	{ "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },	173	{ "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
197	145	{ "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },
198	146	{ "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },
199	147	{ "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },
201	148	{ "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },	174	{ "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
202	149	{ "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
203	150	{ "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },	175	{ "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
205	151	{ "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },	176	{ "long-name", "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
206	152	{ "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },	177	{ "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
209	153	{ "long-name", "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },	178	{ "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },
210	154	{ "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },	179	{ "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },
211			180	{ "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },
212			181	{ "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },
213			182	{ "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },
214	155	// white and black are a bit redundant, but useful for manually testing if UI is still readable	183	// white and black are a bit redundant, but useful for manually testing if UI is still readable
215	156	{ "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },	184	{ "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
222	157	{ "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },	185	{ "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 }
217	158	{ "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },
218	159	{ "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },
219	160	{ "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },
220	161	{ "empty-name", "", 0, 0, false, false, "ubuntu", 0 },
221	162	{ "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },
223	163	};	186	};
224	164	}	187	}
225	165		188
226	166		189
227	=== modified file 'tests/mocks/liblightdm/MockUsersModel.h'
228	--- tests/mocks/liblightdm/MockUsersModel.h 2016-11-16 02:13:48 +0000
229	+++ tests/mocks/liblightdm/MockUsersModel.h 2016-11-16 02:13:50 +0000
230	@@ -52,6 +52,8 @@
231	52	int rowCount(const QModelIndex &parent) const override;	52	int rowCount(const QModelIndex &parent) const override;
232	53	QVariant data(const QModelIndex &index, int role) const override;	53	QVariant data(const QModelIndex &index, int role) const override;
233	54		54
234			55	void setCurrentSessionName(const QString &sessionName, const QString &username);
235			56
236	55	QObject *mock();	57	QObject *mock();
237	56		58
238	57	private Q_SLOTS:	59	private Q_SLOTS:
239	58		60
240	=== modified file 'tests/qmltests/Greeter/tst_WideView.qml'
241	--- tests/qmltests/Greeter/tst_WideView.qml 2016-11-16 02:13:48 +0000
242	+++ tests/qmltests/Greeter/tst_WideView.qml 2016-11-16 02:13:50 +0000
243	@@ -409,6 +409,23 @@
244	409	waitForRendering(view);	409	waitForRendering(view);
245	410	}	410	}
246	411		411
247			412	function test_changingSessionSticksToUser() {
248			413	LightDM.Sessions.mock.sessionMode = "full";
249			414	var loginList = findChild(view, "loginList");
250			415	var fakeSessionName = "ASessionWillNeverBeCalledThis"
251			416
252			417	compare(LightDM.Sessions.count > 1, true);
253			418	compare(loginList.currentSession != fakeSessionName, true);
254			419
255			420	LightDM.Users.mock.sessionName = fakeSessionName;
256			421	tryCompare(loginList, "currentSession", fakeSessionName);
257			422
258			423	// Force a model reset
259			424	LightDM.Users.mock.userMode = "single";
260			425	LightDM.Users.mock.userMode = "full";
261			426
262			427	}
263			428
264	412	function test_tease_data() {	429	function test_tease_data() {
265	413	return [	430	return [
266	414	{tag: "locked", x: 0, offset: 0, count: 0, locked: true},	431	{tag: "locked", x: 0, offset: 0, count: 0, locked: true},