git.iko.soy/unity8
on xenial help sign in
Fix tests from bad merge
cde4128Josh Arenson
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.cpp−6
compare with xenial
unifiedsplit
@@ -17,12 +17,6 @@
17
17
18#include "MockSessionsModel.h"
18#include "MockSessionsModel.h"
19#include <QLightDM/SessionsModel>
19#include <QLightDM/SessionsModel>
20−#include <QDebug>
21−QUrl MockSessionsModel::iconUrl(QString sessionName) const
22−{
23− qDebug() << "JOSH INSIDE THE MOCK ICONURL";
24− return QUrl();
25−}
26
20
27QString MockSessionsModel::testScenario() const
21QString MockSessionsModel::testScenario() const
28{
22{
tests/mocks/LightDM/IntegratedLightDM/MockSessionsModel.h−1
@@ -27,7 +27,6 @@ class MockSessionsModel : public SessionsModel
27 Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
27 Q_PROPERTY(QString testScenario READ testScenario WRITE setTestScenario)
28
28
29public:
29public:
30− QUrl iconUrl(QString sessionName) const override;
31 QString testScenario() const;
30 QString testScenario() const;
32 void setTestScenario(QString testScenario);
31 void setTestScenario(QString testScenario);
33};
32};