2755f7f · unity8 · git.iko.soy

git.iko.soy/unity8

Finally get testScenario working

commit2755f7fa91ddfe766f8049f25b089a320cc23a17 authorJosh Arenson <joshua.arenson@canonical.com> dateWed 18 Nov 2015, 17:20 (11 years ago) parentf8b2886

2 files changed+10−11

compare with xenial

unifiedsplit

plugins/LightDM/SessionsModel.cpp+1 tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+9−11

plugins/LightDM/SessionsModel.cpp+1

@@ -76,6 +76,7 @@ SessionsModel::SessionsModel(QObject* parent)

7676 m_roleNames[IconRole] = "icon_url";

7777

7878 setModel(m_model);

79+ setSourceModel(m_model);

7980 setSortCaseSensitivity(Qt::CaseInsensitive);

8081 setSortLocaleAware(true);

8182 setSortRole(Qt::DisplayRole);

tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp+9−11

@@ -18,23 +18,21 @@

1818#include "MockSessionsModel.h"

1919#include <QLightDM/SessionsModel>

2020#include <QSortFilterProxyModel>

21−#include <QDebug>

21+

2222QString MockSessionsModel::testScenario() const

2323{

24− /*QLightDM::UsersModel* qUsersModel =

25− static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());*/

24+ QLightDM::SessionsModel* qSessionsModel =

25+ static_cast<QLightDM::SessionsModel*>(sourceModel());

2626

27− return QString("Hello MockSessionsModel");

27+ return qSessionsModel->testScenario();

2828}

2929

3030void MockSessionsModel::setTestScenario(QString testScenario)

3131{

32− /*QLightDM::UsersModel* qUsersModel =

33− static_cast<QLightDM::UsersModel*>(static_cast<QSortFilterProxyModel*>(sourceModel())->sourceModel());

32+ QLightDM::SessionsModel* qSessionsModel =

33+ static_cast<QLightDM::SessionsModel*>(sourceModel());

3434

35− if (qUsersModel->mockMode() != mockMode) {

36− qUsersModel->setMockMode(mockMode);

37− Q_EMIT mockModeChanged(mockMode);

38− }*/

39− qDebug() << "Setting MockSessionsModel::testScenario";

35+ if (qSessionsModel->testScenario() != testScenario) {

36+ qSessionsModel->setTestScenario(testScenario);

37+ }

4038}