dfa22e1 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Complete weird test

dfa22e1Josh Arenson10 years ago

qml/Greeter/WideView.qml+16−3

compare with xenial

unifiedsplit

@@ -142,16 +142,29 @@ FocusScope {

142

143 model: root.userModel

144 currentSession: LightDM.Users.data(selectedUserIndex,

145− LightDM.UserRoles.SessionRole);

145+ LightDM.UserRoles.SessionRole);

146 onResponded: root.responded(response)

147 onSelected: {

148+ if (LightDM.Users.mock) {

148− LightDM.Users.mock.currentUsername = currentUser;

149+ LightDM.Users.mock.currentUsername = currentUser;

150+ }

151+

152+ loginList.selectedUserIndex = index;

149 root.selected(index)

153 root.selected(index)

150− selectedUserIndex = index;

151 }

154 }

152 onSessionChooserButtonClicked: parent.state = "SessionsList"

155 onSessionChooserButtonClicked: parent.state = "SessionsList"

153

156

154 Keys.forwardTo: [sessionChooserLoader.item]

157 Keys.forwardTo: [sessionChooserLoader.item]

158+

159+ // This is only for testing

160+ Connections {

161+ // TODO when Qt 5.7

162+ //enabled: LightDM.Users.mock

163+ target: LightDM.Users

164+ onModelReset: {

165+ loginList.currentSession = LightDM.Users.data(loginList.selectedUserIndex, LightDM.UserRoles.SessionRole);

166+ }

167+ }

155 }

168 }

156

169

157 Loader {

170 Loader {

tests/mocks/liblightdm/MockUsersModel.cpp+24−18

@@ -81,15 +81,16 @@ void UsersModel::setCurrentSessionName(const QString &sessionName, const QString

81{

82 Q_D(UsersModel);

84+ beginResetModel();

85+

84 for (auto &entry : d->entries) {

86 for (auto &entry : d->entries) {

85 if (username == entry.username) {

87 if (username == entry.username) {

86 entry.session = sessionName;

88 entry.session = sessionName;

87−

89+ break;

88− // Since the incides are mangled, there is no easy way to emit dataChanged

89− // and that doesn't matter for the limited use of this function

90− return;

91 }

90 }

92 }

91 }

92+

93+ endResetModel();

93}

94}

95int UsersModel::rowCount(const QModelIndex &parent) const

96int UsersModel::rowCount(const QModelIndex &parent) const

@@ -155,28 +156,33 @@ void UsersModel::resetEntries()

155 } else if (userMode == "single-pin") {

156 } else if (userMode == "single-pin") {

156 d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};

157 d->entries = {{"has-pin", "Has PIN", "", 0, false, false, "ubuntu", 0}};

157 } else if (userMode == "full") {

158 } else if (userMode == "full") {

159+ /*

160+ * Since the real model sorts these entries alphabetically, the model indices

161+ * don't line up correctly. The easiest way to fix this is to ensure that this

162+ * list of entries REMAINS IN ALPHABETICAL ORDER at all times.

163+ */

158 d->entries = {

164 d->entries = {

165+ { "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },

166+ { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },

167+ { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },

168+ { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },

169+ { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },

170+ { "empty-name", "", 0, 0, false, false, "ubuntu", 0 },

159 { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },

171 { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },

160 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },

172 { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },

161− { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },

162− { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },

163− { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },

164− { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },

165− { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },

166 { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },

173 { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },

174+ { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },

167 { "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 },

168− { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },

169− { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },

170 { "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 },

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 },

177+ { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },

171− { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },

178+ { "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },

179+ { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },

180+ { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },

181+ { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },

182+ { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },

172 // 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

173 { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },

184 { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },

174− { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },

175− { "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },

176− { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },

177− { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },

178− { "empty-name", "", 0, 0, false, false, "ubuntu", 0 },

185+ { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 }

179− { "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },

180 };

186 };

181 }

187 }

182

188

tests/qmltests/Greeter/tst_WideView.qml+8−5

@@ -409,18 +409,21 @@ StyledItem {

409 waitForRendering(view);

410 }

411

412− function test_stuff() {

412+ function test_changingSessionSticksToUser() {

413 LightDM.Sessions.mock.sessionMode = "full";

414 var loginList = findChild(view, "loginList");

415−

416− var currentUser = loginList.currentUser

417 var fakeSessionName = "ASessionWillNeverBeCalledThis"

415 var fakeSessionName = "ASessionWillNeverBeCalledThis"

418

416

419− compare(LightDM.Users.data(getIndexOf(currentUser), LightDM.UserRoles.SessionRole) != fakeSessionName, true);

417+ compare(LightDM.Sessions.count > 1, true);

418+ compare(loginList.currentSession != fakeSessionName, true);

420

419

421 LightDM.Users.mock.sessionName = fakeSessionName;

420 LightDM.Users.mock.sessionName = fakeSessionName;

421+ tryCompare(loginList, "currentSession", fakeSessionName);

422+

423+ // Force a model reset

424+ LightDM.Users.mock.userMode = "single";

425+ LightDM.Users.mock.userMode = "full";

422

426

423− compare(LightDM.Users.data(getIndexOf(currentUser), LightDM.UserRoles.SessionRole) == fakeSessionName, true);

424 }

427 }

425

428

426 function test_tease_data() {

429 function test_tease_data() {