git.iko.soy/unity8
on xenial help sign in
Making the test class a friend so that we can make the functions protected
e0a1f8aTed Gould
plugins/Unity/Launcher/backend/launcherbackend.h+3−3
compare with xenial
unifiedsplit
@@ -33,11 +33,13 @@ class AccountsServiceDBusAdaptor;
33 */
33 */
34
34
35class LauncherBackendItem;
35class LauncherBackendItem;
36+class LauncherBackendTest;
36
37
37class LauncherBackend : public QDBusVirtualObject
38class LauncherBackend : public QDBusVirtualObject
38{
39{
39 Q_OBJECT
40 Q_OBJECT
40
41
42+ friend LauncherBackendTest;
41
43
42public:
44public:
43 LauncherBackend(QObject *parent = 0);
45 LauncherBackend(QObject *parent = 0);
@@ -184,9 +186,7 @@ private:
184
186
185 void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
187 void emitPropChangedDbus(const QString& appId, const QString& property, QVariant &value) const;
186
188
187−#ifdef LAUNCHER_TESTING
189+protected: /* Protected to allow testing */
188−public: /* Only public to make them easier to test independently */
189−#endif
190 LauncherBackendItem* getItem(const QString& appId) const;
190 LauncherBackendItem* getItem(const QString& appId) const;
191
191
192 static QString decodeAppId(const QString& path);
192 static QString decodeAppId(const QString& path);