git.iko.soy/unity8
on xenial help sign in
Implement tests
commite225248288cd77b9bce27245195c2d970b8584d9 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 19 Nov 2015, 13:09 (11 years ago) parentbffb8fb
3 files changed+18−2
compare with xenial
unifiedsplit
plugins/LightDM/SessionsModel.cpp+6 plugins/LightDM/SessionsModel.h+2−1 tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+10−1
plugins/LightDM/SessionsModel.cpp+6
@@ -28,6 +28,12 @@ int SessionsModel::rowCount(const QModelIndex& parent) const
2828 return m_model->rowCount(parent);
2929}
3030
31+// Used for testing
32+QList<QUrl> SessionsModel::iconSearchDirectories() const
33+{
34+ return m_iconSearchDirectories;
35+}
36+
3137QModelIndex SessionsModel::sessionIndex(QString sessionName) const
3238{
3339 for (int i = 0; i < rowCount(QModelIndex()); i ++) {
plugins/LightDM/SessionsModel.h+2−1
@@ -47,15 +47,16 @@ public:
4747 int rowCount(const QModelIndex& parent) const override;
4848 QModelIndex sessionIndex(QString sessionName) const;
4949 QVariant data(const QModelIndex& index, int role) const override;
50+ QList<QUrl> iconSearchDirectories() const;
5051 Q_INVOKABLE QUrl iconUrl(QString sessionName) const;
5152
5253private:
5354 QLightDM::SessionsModel* m_model;
5455 QHash<int, QByteArray> m_roleNames;
55−
5656 const QList<QUrl> m_iconSearchDirectories{QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),
5757 QUrl("/usr/local/share/unity-greeter"),
5858 QUrl("/usr/share/unity-greeter/")};
59+
5960};
6061
6162#endif // UNITY_SESSIONSMODEL_H
tests/plugins/LightDM/IntegratedLightDM/sessionsmodel.cpp+10−1
@@ -19,7 +19,8 @@
1919#include <QLightDM/SessionsModel>
2020#include <QtCore/QModelIndex>
2121#include <QtTest>
22−
22+#include <QString>
23+#include <QDebug>
2324class GreeterSessionsModelTest : public QObject
2425{
2526 Q_OBJECT
@@ -40,6 +41,14 @@ private Q_SLOTS:
4041 delete sourceModel;
4142 }
4243
44+ void testIconDirectoriesAreValid()
45+ {
46+ Q_FOREACH(const QUrl& searchDirectory, model->iconSearchDirectories())
47+ {
48+ QVERIFY(searchDirectory.isValid());
49+ }
50+ }
51+
4352 void testMultupleSessionsCountIsCorrect()
4453 {
4554 sourceModel->setTestScenario("multipleSessions");