2755f7f · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Finally get testScenario working

2755f7fJosh Arenson11 years ago

plugins/LightDM/SessionsModel.cpp+1

compare with xenial

unifiedsplit

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

76 m_roleNames[IconRole] = "icon_url";

78 setModel(m_model);

79+ setSourceModel(m_model);

79 setSortCaseSensitivity(Qt::CaseInsensitive);

80 setSortCaseSensitivity(Qt::CaseInsensitive);

80 setSortLocaleAware(true);

81 setSortLocaleAware(true);

81 setSortRole(Qt::DisplayRole);

82 setSortRole(Qt::DisplayRole);

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

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

18#include "MockSessionsModel.h"

19#include <QLightDM/SessionsModel>

20#include <QSortFilterProxyModel>

21−#include <QDebug>

21+

22QString MockSessionsModel::testScenario() const

23{

24− /*QLightDM::UsersModel* qUsersModel =

24+ QLightDM::SessionsModel* qSessionsModel =

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

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

27− return QString("Hello MockSessionsModel");

27+ return qSessionsModel->testScenario();

28}

30void MockSessionsModel::setTestScenario(QString testScenario)

31{

32− /*QLightDM::UsersModel* qUsersModel =

32+ QLightDM::SessionsModel* qSessionsModel =

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

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

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

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

36− qUsersModel->setMockMode(mockMode);

36+ qSessionsModel->setTestScenario(testScenario);

37− Q_EMIT mockModeChanged(mockMode);

38− }*/

37+ }

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

40}

38}