2493bd6 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

fix tests, add copyright headers

2493bd6Michael Zanetti12 years ago

plugins/Unity/Launcher/dbusinterface.cpp+23−4

compare with xenial

unifiedsplit

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#include "dbusinterface.h"

20#include "dbusinterface.h"

2#include "launchermodel.h"

21#include "launchermodel.h"

3#include "launcheritem.h"

22#include "launcheritem.h"

@@ -19,6 +38,7 @@ DBusInterface::DBusInterface(LauncherModel *parent):

19 if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {

38 if (!con.registerVirtualObject("/com/canonical/Unity/Launcher", this, QDBusConnection::VirtualObjectRegisterOption::SubPath)) {

20 qWarning() << "Unable to register launcher object";

39 qWarning() << "Unable to register launcher object";

21 }

40 }

41+ qDebug() << "DBusInterface set up!";

22}

42}

24DBusInterface::~DBusInterface()

44DBusInterface::~DBusInterface()

@@ -31,7 +51,6 @@ DBusInterface::~DBusInterface()

32QString DBusInterface::introspect(const QString &path) const

52QString DBusInterface::introspect(const QString &path) const

33{

53{

34− qDebug() << "introspecting" << path;

35 /* This case we should just list the nodes */

54 /* This case we should just list the nodes */

36 if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {

55 if (path == "/com/canonical/Unity/Launcher/" || path == "/com/canonical/Unity/Launcher") {

37 QString nodes;

56 QString nodes;

@@ -165,13 +184,13 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec

165 }

184 }

166 } else if (message.member() == "Set") {

185 } else if (message.member() == "Set") {

167 if (message.arguments()[1].toString() == "count") {

186 if (message.arguments()[1].toString() == "count") {

168− int newCount = message.arguments()[2].value<QDBusVariant>().variant().toInt();

187+ int newCount = message.arguments()[2].toInt();

169 if (!item || newCount != item->count()) {

188 if (!item || newCount != item->count()) {

170 Q_EMIT countChanged(appid, newCount);

189 Q_EMIT countChanged(appid, newCount);

171 emitPropChangedDbus(appid, "count", QVariant(newCount));

190 emitPropChangedDbus(appid, "count", QVariant(newCount));

172 }

191 }

173 } else if (message.arguments()[1].toString() == "countVisible") {

192 } else if (message.arguments()[1].toString() == "countVisible") {

174− bool newVisible = message.arguments()[2].value<QDBusVariant>().variant().toBool();

193+ bool newVisible = message.arguments()[2].toBool();

175 if (!item || newVisible != item->countVisible()) {

194 if (!item || newVisible != item->countVisible()) {

176 Q_EMIT countVisibleChanged(appid, newVisible);

195 Q_EMIT countVisibleChanged(appid, newVisible);

177 emitPropChangedDbus(appid, "countVisible", newVisible);

196 emitPropChangedDbus(appid, "countVisible", newVisible);

@@ -181,7 +200,7 @@ bool DBusInterface::handleMessage(const QDBusMessage& message, const QDBusConnec

181 if (item) {

200 if (item) {

182 QVariantMap all;

201 QVariantMap all;

183 all.insert("count", item->count());

202 all.insert("count", item->count());

184− all.insert("countVisible", item->count());

203+ all.insert("countVisible", item->countVisible());

185 retval.append(all);

204 retval.append(all);

186 }

205 }

187 } else {

206 } else {

plugins/Unity/Launcher/dbusinterface.h+19

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#include "launcheritem.h"

20#include "launcheritem.h"

3#include <QDBusVirtualObject>

22#include <QDBusVirtualObject>

plugins/Unity/Launcher/desktopfilehandler.cpp+19

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#include "desktopfilehandler.h"

20#include "desktopfilehandler.h"

3#include <QStringList>

22#include <QStringList>

plugins/Unity/Launcher/desktopfilehandler.h+19

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#ifndef DESKTOPFILEHANDLER_H

20#ifndef DESKTOPFILEHANDLER_H

2#define DESKTOPFILEHANDLER_H

21#define DESKTOPFILEHANDLER_H

plugins/Unity/Launcher/gsettings.cpp+19

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#include "gsettings.h"

20#include "gsettings.h"

3#include <QGSettings>

22#include <QGSettings>

plugins/Unity/Launcher/gsettings.h+19

@@ -1,3 +1,22 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

1#ifndef GSETTINGS_H

20#ifndef GSETTINGS_H

2#define GSETTINGS_H

21#define GSETTINGS_H

tests/plugins/Unity/Launcher/CMakeLists.txt+5−6

@@ -6,7 +6,6 @@ include_directories(

6 ${CMAKE_CURRENT_BINARY_DIR}

7 ${CMAKE_SOURCE_DIR}/plugins/AccountsService

8 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher

9− ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend

10 ${GSETTINGS_QT_INCLUDE_DIRS}

9 ${GSETTINGS_QT_INCLUDE_DIRS}

11 )

10 )

@@ -15,17 +14,17 @@ add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

15add_definitions(-DLAUNCHER_TESTING)

14add_definitions(-DLAUNCHER_TESTING)

17### LauncherModelTest

16### LauncherModelTest

18−set(testModelCommand ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec

17+set(testModelCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec

19− -o ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

18+ --parameter -o --parameter ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

20− -o -,txt)

19+ --parameter -o --parameter -,txt)

21add_test(NAME launchermodeltest COMMAND ${testModelCommand})

20add_test(NAME launchermodeltest COMMAND ${testModelCommand})

22add_custom_target(launchermodeltest ${testModelCommand})

21add_custom_target(launchermodeltest ${testModelCommand})

23add_executable(launchermodeltestExec

22add_executable(launchermodeltestExec

24 launchermodeltest.cpp

23 launchermodeltest.cpp

24+ gsettings.cpp

25 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp

26 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp

28− ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/gsettings.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/dbusinterface.cpp

28 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/dbusinterface.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/desktopfilehandler.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/desktopfilehandler.cpp

31 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistentry.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistentry.cpp

@@ -36,7 +35,7 @@ add_executable(launchermodeltestExec

36 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

35 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

37 )

36 )

38target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})

37target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})

39−qt5_use_modules(launchermodeltestExec Test Core DBus)

38+qt5_use_modules(launchermodeltestExec Test Core DBus Xml)

41# copy .desktop files into build directory for shadow builds

40# copy .desktop files into build directory for shadow builds

42file(GLOB DESKTOP_FILES *.desktop)

41file(GLOB DESKTOP_FILES *.desktop)

tests/plugins/Unity/Launcher/gsettings.cppnew file+40

@@ -0,0 +1,40 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

20+#include "gsettings.h"

21+

22+#include <QDebug>

23+

24+// This is a mock implementation to not touch GSettings for real during tests

25+

26+GSettings::GSettings(QObject *parent):

27+ QObject(parent)

28+{

29+

30+}

31+

32+QStringList GSettings::storedApplications() const

33+{

34+ return QStringList();

35+}

36+

37+void GSettings::setStoredApplications(const QStringList &storedApplications)

38+{

39+ Q_UNUSED(storedApplications)

40+}

tests/plugins/Unity/Launcher/gsettings.hnew file+38

@@ -0,0 +1,38 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Authors:

17+ * Michael Zanetti <michael.zanetti@canonical.com>

18+ */

19+

20+#ifndef GSETTINGS_H

21+#define GSETTINGS_H

22+

23+#include <QObject>

24+#include <QStringList>

25+

26+// This is a mock implementation to not touch GSettings for real during tests

27+

28+class GSettings: public QObject

29+{

30+ Q_OBJECT

31+public:

32+ GSettings(QObject *parent = nullptr);

33+

34+ QStringList storedApplications() const;

35+ void setStoredApplications(const QStringList &storedApplications);

36+};

37+

38+#endif

tests/plugins/Unity/Launcher/launcherbackendtest.cppdeleted−239

@@ -1,239 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Michael Terry <michael.terry@canonical.com>

18− */

19−

20−#include "launcherbackend.h"

21−

22−#include <QtTest>

23−#include <QDBusConnection>

24−#include <QDBusMessage>

25−#include <QDBusVariant>

26−

27−

28−class LauncherBackendTest : public QObject

29−{

30− Q_OBJECT

31−

32−private Q_SLOTS:

33−

34− void initTestCase()

35− {

36− // As we want to test absolute file paths in the .desktop file, we need to modify the

37− // sample file and replace the path in there with the current build dir.

38− QSettings settings(QDir::currentPath() + "/click-icon.desktop", QSettings::IniFormat);

39− settings.setValue("Desktop Entry/Path", QDir::currentPath());

40− }

41−

42− void testFileNames()

43− {

44− LauncherBackend backend;

45−

46− backend.setStoredApplications(QStringList() << "rel-icon" << "abs-icon" << "invalid");

47− QCOMPARE(backend.storedApplications(), QStringList() << "rel-icon" << "abs-icon");

48− }

49−

50− void testIcon_data() {

51− QTest::addColumn<QString>("appId");

52− QTest::addColumn<QString>("expectedIcon");

53−

54− // Needs to expand a relative icon to the absolute path

55− QTest::newRow("relative icon path") << "rel-icon" << QDir::currentPath() + "/rel-icon.svg";

56−

57− // In case an icon is not found on disk, it needs to fallback on image://theme/ for it

58− QTest::newRow("fallback on theme") << "abs-icon" << "image://theme//path/to/icon.png";

59−

60− // Click packages have a relative icon path but an absolute path as a separate entry

61− QTest::newRow("click package icon") << "click-icon" << QDir::currentPath() + "/click-icon.svg";

62− }

63−

64− void testIcon() {

65− QFETCH(QString, appId);

66− QFETCH(QString, expectedIcon);

67−

68− LauncherBackend backend;

69− backend.setStoredApplications(QStringList() << appId);

70−

71− QCOMPARE(backend.icon(appId), expectedIcon);

72− }

73−

74− void testGetItem_data() {

75− QTest::addColumn<QString>("appId");

76− QTest::addColumn<bool>("exists");

77−

78− QTest::newRow("Exists") << "rel-icon" << true;

79− QTest::newRow("Doesn't Exist") << "does-not-exist" << false;

80− }

81−

82− void testGetItem() {

83− QFETCH(QString, appId);

84− QFETCH(bool, exists);

85−

86− LauncherBackend backend;

87− auto item = backend.getItem(appId);

88−

89− if (exists) {

90− QVERIFY(item != nullptr);

91− } else {

92− QVERIFY(item == nullptr);

93− }

94− }

95−

96−// void testCount_data() {

97−// QTest::addColumn<QString>("appId");

98−// QTest::addColumn<bool>("setCount");

99−// QTest::addColumn<int>("inCount");

100−// QTest::addColumn<bool>("countVisible");

101−// QTest::addColumn<int>("expectedCount");

102−

103−// /* Get baseline data on things working */

104−// QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;

105−

106−// /* Valid count, but not visible */

107−// QTest::newRow("Not visible") << "rel-icon" << true << 42 << false << -1;

108−

109−// /* Turn it on */

110−// QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;

111−

112−// /* Invalide app to load */

113−// QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;

114−// }

115−

116−// void testCount() {

117−// QFETCH(QString, appId);

118−// QFETCH(bool, setCount);

119−// QFETCH(int, inCount);

120−// QFETCH(bool, countVisible);

121−// QFETCH(int, expectedCount);

122−

123−// LauncherBackend backend;

124−

125−// if (setCount)

126−// backend.setCount(appId, inCount);

127−// backend.setCountVisible(appId, countVisible);

128−

129−// QCOMPARE(backend.count(appId), expectedCount);

130−// }

131−

132−// void testDbusName_data() {

133−// QTest::addColumn<QString>("decoded");

134−// QTest::addColumn<QString>("encoded");

135−

136−// /* Passthrough test */

137−// QTest::newRow("Passthrough") << "fine" << "fine";

138−

139−// /* Number as first characeter */

140−// QTest::newRow("Number first") << "31337" << "_331337";

141−

142−// /* Underscore test */

143−// QTest::newRow("Underscore test") << "this_is_c_style_namespacing" << "this_5Fis_5Fc_5Fstyle_5Fnamespacing";

144−

145−// /* Hyphen test */

146−// QTest::newRow("Hyphen test") << "typical-application" << "typical_2Dapplication";

147−

148−// /* Japanese test */

149−// QTest::newRow("日本語 test") << "日本語" << "_E6_97_A5_E6_9C_AC_E8_AA_9E";

150−// }

151−

152−// void testDbusName() {

153−// QFETCH(QString, decoded);

154−// QFETCH(QString, encoded);

155−

156−// QString encodeOut = LauncherBackend::encodeAppId(decoded);

157−// QCOMPARE(encoded, encodeOut);

158−

159−// QString decodeOut = LauncherBackend::decodeAppId(encoded);

160−// QCOMPARE(decoded, decodeOut);

161−// }

162−

163−// void testDbusIface_data() {

164−// QTest::addColumn<QString>("appId");

165−// QTest::addColumn<bool>("setCount");

166−// QTest::addColumn<int>("inCount");

167−// QTest::addColumn<bool>("countVisible");

168−// QTest::addColumn<int>("expectedCount");

169−

170−// /* Get baseline data on things working */

171−// QTest::newRow("Baseline") << "rel-icon" << false << 0 << false << -1;

172−

173−// /* Turn it on */

174−// QTest::newRow("Visible Count") << "rel-icon" << true << 42 << true << 42;

175−

176−// /* Invalide app to load */

177−// QTest::newRow("Invalid App ID") << "this-app-doesnt-exist" << true << 42 << true << -1;

178−// }

179−

180−// void testDbusIface() {

181−// QFETCH(QString, appId);

182−// QFETCH(bool, setCount);

183−// QFETCH(int, inCount);

184−// QFETCH(bool, countVisible);

185−// QFETCH(int, expectedCount);

186−

187−// QDBusConnection con = QDBusConnection::sessionBus();

188−// QDBusMessage message;

189−// QDBusMessage reply;

190−

191−// LauncherBackend backend;

192−

193−// if (setCount) {

194−// message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

195−// "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

196−// "org.freedesktop.DBus.Properties",

197−// "Set");

198−// QVariantList cargs;

199−// cargs.append(QString("com.canonical.Unity.Launcher.Item"));

200−// cargs.append(QString("count"));

201−// cargs.append(QVariant::fromValue(QDBusVariant(inCount)));

202−

203−// message.setArguments(cargs);

204−// reply = con.call(message);

205−// QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

206−// }

207−

208−// /* Set countVisible */

209−// message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

210−// "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

211−// "org.freedesktop.DBus.Properties",

212−// "Set");

213−// QVariantList cvargs;

214−// cvargs.append(QString("com.canonical.Unity.Launcher.Item"));

215−// cvargs.append(QString("countVisible"));

216−// cvargs.append(QVariant::fromValue(QDBusVariant(countVisible)));

217−

218−// message.setArguments(cvargs);

219−// reply = con.call(message);

220−// QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

221−

222−// /* Get value */

223−// message = QDBusMessage::createMethodCall("com.canonical.Unity.Launcher",

224−// "/com/canonical/Unity/Launcher/" + LauncherBackend::encodeAppId(appId),

225−// "org.freedesktop.DBus.Properties",

226−// "Get");

227−// QVariantList getargs;

228−// getargs.append(QString("com.canonical.Unity.Launcher.Item"));

229−// getargs.append(QString("count"));

230−

231−// message.setArguments(getargs);

232−// reply = con.call(message);

233−// QCOMPARE(reply.type(), QDBusMessage::ReplyMessage);

234−// QCOMPARE(reply.arguments()[0].value<QDBusVariant>().variant().toInt(), expectedCount);

235−// }

236−};

237−

238−QTEST_GUILESS_MAIN(LauncherBackendTest)

239−#include "launcherbackendtest.moc"

tests/plugins/Unity/Launcher/launchermodeltest.cpp+260−180

@@ -23,8 +23,12 @@

24#include "launcheritem.h"

25#include "launchermodel.h"

26+#include "dbusinterface.h"

27#include <QtTest>

28#include <QtTest>

29+#include <QDBusInterface>

30+#include <QDBusReply>

31+#include <QDomDocument>

29// This is a mock, specifically to test the LauncherModel

33// This is a mock, specifically to test the LauncherModel

30class MockApp: public unity::shell::application::ApplicationInfoInterface

34class MockApp: public unity::shell::application::ApplicationInfoInterface

@@ -111,186 +115,262 @@ private:

111

115

112private Q_SLOTS:

116private Q_SLOTS:

113

117

114−// void initTestCase() {

118+ void initTestCase() {

115−// launcherModel = new LauncherModel(this);

119+ launcherModel = new LauncherModel(this);

116−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

120+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 0);

117−

121+

118−// appManager = new MockAppManager(this);

122+ appManager = new MockAppManager(this);

119−// launcherModel->setApplicationManager(appManager);

123+ launcherModel->setApplicationManager(appManager);

120−// }

124+ }

121−

125+

122−// // Adding 2 apps to the mock appmanager. Both should appear in the launcher.

126+ // Adding 2 apps to the mock appmanager. Both should appear in the launcher.

123−// void init() {

127+ void init() {

124−// appManager->addApplication(new MockApp("abs-icon"));

128+ appManager->addApplication(new MockApp("abs-icon"));

125−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

129+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

126−

130+

127−// appManager->addApplication(new MockApp("no-icon"));

131+ appManager->addApplication(new MockApp("no-icon"));

128−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

132+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

129−// }

133+ }

130−

134+

131−// // Removing apps from appmanager and launcher as pinned ones would stick

135+ // Removing apps from appmanager and launcher as pinned ones would stick

132−// void cleanup() {

136+ void cleanup() {

133−// while (appManager->count() > 0) {

137+ while (appManager->count() > 0) {

134−// appManager->removeApplication(0);

138+ appManager->removeApplication(0);

135−// }

139+ }

136−// while (launcherModel->rowCount(QModelIndex()) > 0) {

140+ while (launcherModel->rowCount(QModelIndex()) > 0) {

137−// launcherModel->requestRemove(launcherModel->get(0)->appId());

141+ launcherModel->requestRemove(launcherModel->get(0)->appId());

138−// }

142+ }

139−// }

143+ }

140−

144+

141−// void testMove() {

145+ void testMove() {

142−// QCOMPARE(launcherModel->get(0)->pinned(), false);

146+ QCOMPARE(launcherModel->get(0)->pinned(), false);

143−// QCOMPARE(launcherModel->get(1)->pinned(), false);

147+ QCOMPARE(launcherModel->get(1)->pinned(), false);

144−

148+

145−// LauncherItemInterface *item0BeforeMove = launcherModel->get(0);

149+ LauncherItemInterface *item0BeforeMove = launcherModel->get(0);

146−// LauncherItemInterface *item1BeforeMove = launcherModel->get(1);

150+ LauncherItemInterface *item1BeforeMove = launcherModel->get(1);

147−// launcherModel->move(1, 0);

151+ launcherModel->move(1, 0);

148−

152+

149−// QCOMPARE(item0BeforeMove, launcherModel->get(1));

153+ QCOMPARE(item0BeforeMove, launcherModel->get(1));

150−// QCOMPARE(item1BeforeMove, launcherModel->get(0));

154+ QCOMPARE(item1BeforeMove, launcherModel->get(0));

151−

155+

152−// // moved item must be pinned now

156+ // moved item must be pinned now

153−// QCOMPARE(item0BeforeMove->pinned(), false);

157+ QCOMPARE(item0BeforeMove->pinned(), false);

154−// QCOMPARE(item1BeforeMove->pinned(), true);

158+ QCOMPARE(item1BeforeMove->pinned(), true);

155−// }

159+ }

156−

160+

157−// void testPinning() {

161+ void testPinning() {

158−// QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));

162+ QSignalSpy spy(launcherModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)));

159−// QCOMPARE(launcherModel->get(0)->pinned(), false);

163+ QCOMPARE(launcherModel->get(0)->pinned(), false);

160−// QCOMPARE(launcherModel->get(1)->pinned(), false);

164+ QCOMPARE(launcherModel->get(1)->pinned(), false);

161−// launcherModel->pin(launcherModel->get(0)->appId());

165+ launcherModel->pin(launcherModel->get(0)->appId());

162−// QCOMPARE(launcherModel->get(0)->pinned(), true);

166+ QCOMPARE(launcherModel->get(0)->pinned(), true);

163−// QCOMPARE(launcherModel->get(1)->pinned(), false);

167+ QCOMPARE(launcherModel->get(1)->pinned(), false);

164−// QCOMPARE(spy.count(), 1);

168+ QCOMPARE(spy.count(), 1);

165−// QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

169+ QCOMPARE(spy.at(0).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

166−

170+

167−// launcherModel->requestRemove(launcherModel->get(0)->appId());

171+ launcherModel->requestRemove(launcherModel->get(0)->appId());

168−// QCOMPARE(launcherModel->get(0)->pinned(), false);

172+ QCOMPARE(launcherModel->get(0)->pinned(), false);

169−// QCOMPARE(launcherModel->get(1)->pinned(), false);

173+ QCOMPARE(launcherModel->get(1)->pinned(), false);

170−// QCOMPARE(spy.count(), 2);

174+ QCOMPARE(spy.count(), 2);

171−// QCOMPARE(spy.at(1).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

175+ QCOMPARE(spy.at(1).at(2).value<QVector<int>>().first(), (int)LauncherModelInterface::RolePinned);

172−// }

176+ }

173−

177+

174−// void testRemove_data() {

178+ void testRemove_data() {

175−

179+

176−// QTest::addColumn<bool>("pinned");

180+ QTest::addColumn<bool>("pinned");

177−// QTest::addColumn<bool>("running");

181+ QTest::addColumn<bool>("running");

178−

182+

179−// QTest::newRow("non-pinned, running") << false << true;

183+ QTest::newRow("non-pinned, running") << false << true;

180−// QTest::newRow("pinned, running") << true << false;

184+ QTest::newRow("pinned, running") << true << false;

181−// QTest::newRow("pinned, non-running") << true << false;

185+ QTest::newRow("pinned, non-running") << true << false;

182−// }

186+ }

183−

187+

184−// void testRemove() {

188+ void testRemove() {

185−// QFETCH(bool, pinned);

189+ QFETCH(bool, pinned);

186−// QFETCH(bool, running);

190+ QFETCH(bool, running);

187−

191+

188−// // In the beginning we always have two items

192+ // In the beginning we always have two items

189−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

193+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

190−

194+

191−// // pin one if required

195+ // pin one if required

192−// if (pinned) {

196+ if (pinned) {

193−// launcherModel->pin(launcherModel->get(1)->appId());

197+ launcherModel->pin(launcherModel->get(1)->appId());

194−// }

198+ }

195−

199+

196−// // stop it if required

200+ // stop it if required

197−// if (!running) {

201+ if (!running) {

198−// appManager->removeApplication(1);

202+ appManager->removeApplication(1);

199−// }

203+ }

200−

204+

201−// // Now remove it

205+ // Now remove it

202−// launcherModel->requestRemove(launcherModel->get(1)->appId());

206+ launcherModel->requestRemove(launcherModel->get(1)->appId());

203−

207+

204−// if (running) {

208+ if (running) {

205−// // both apps are running, both apps must still be here

209+ // both apps are running, both apps must still be here

206−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

210+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

207−

211+

208−// // Item must be unpinned now

212+ // Item must be unpinned now

209−// QCOMPARE(launcherModel->get(1)->pinned(), false);

213+ QCOMPARE(launcherModel->get(1)->pinned(), false);

210−

214+

211−// } else if (pinned) {

215+ } else if (pinned) {

212−// // Item 1 must go away, item 0 is here to stay

216+ // Item 1 must go away, item 0 is here to stay

213−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

217+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

214−// }

218+ }

215−

219+

216−// // done our checks. now stop the app if was still running

220+ // done our checks. now stop the app if was still running

217−// if (running) {

221+ if (running) {

218−// appManager->removeApplication(1);

222+ appManager->removeApplication(1);

219−// }

223+ }

220−

224+

221−// // It needs to go away in any case now

225+ // It needs to go away in any case now

222−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

226+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

223−// }

227+ }

224−

228+

225−// void testQuickListPinningRemoving() {

229+ void testQuickListPinningRemoving() {

226−// // we start with 2 unpinned items

230+ // we start with 2 unpinned items

227−// QCOMPARE(launcherModel->get(0)->pinned(), false);

231+ QCOMPARE(launcherModel->get(0)->pinned(), false);

228−// QCOMPARE(launcherModel->get(1)->pinned(), false);

232+ QCOMPARE(launcherModel->get(1)->pinned(), false);

229−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

233+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

230−

234+

231−// // find the Pin item in the quicklist

235+ // find the Pin item in the quicklist

232−// QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());

236+ QuickListModel *model = qobject_cast<QuickListModel*>(launcherModel->get(0)->quickList());

233−// int pinActionIndex = -1;

237+ int pinActionIndex = -1;

234−// for (int i = 0; i < model->rowCount(QModelIndex()); ++i) {

238+ for (int i = 0; i < model->rowCount(QModelIndex()); ++i) {

235−// if (model->get(i).actionId() == "pin_item") {

239+ if (model->get(i).actionId() == "pin_item") {

236−// pinActionIndex = i;

240+ pinActionIndex = i;

237−// break;

241+ break;

238−// }

242+ }

239−// }

243+ }

240−// QVERIFY(pinActionIndex >= 0);

244+ QVERIFY(pinActionIndex >= 0);

241−

245+

242−// // trigger pin item quicklist action => Item must be pinned now.

246+ // trigger pin item quicklist action => Item must be pinned now.

243−// launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

247+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

244−// QCOMPARE(launcherModel->get(0)->pinned(), true);

248+ QCOMPARE(launcherModel->get(0)->pinned(), true);

245−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

249+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

246−

250+

247−// // quicklist needs to transform to remove item. trigger it and check it item goes away

251+ // quicklist needs to transform to remove item. trigger it and check it item goes away

248−// launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

252+ launcherModel->quickListActionInvoked(launcherModel->get(0)->appId(), pinActionIndex);

249−// QCOMPARE(launcherModel->get(0)->pinned(), false);

253+ QCOMPARE(launcherModel->get(0)->pinned(), false);

250−

254+

251−// // still needs to be here as the app is still here

255+ // still needs to be here as the app is still here

252−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

256+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

253−// // close the app

257+ // close the app

254−// appManager->removeApplication(0);

258+ appManager->removeApplication(0);

255−// // Now it needs to go away

259+ // Now it needs to go away

256−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

260+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

257−// }

261+ }

258−

262+

259−// void testApplicationFocused() {

263+ void testApplicationFocused() {

260−// // all apps unfocused at beginning...

264+ // all apps unfocused at beginning...

261−// QCOMPARE(launcherModel->get(0)->focused(), false);

265+ QCOMPARE(launcherModel->get(0)->focused(), false);

262−// QCOMPARE(launcherModel->get(1)->focused(), false);

266+ QCOMPARE(launcherModel->get(1)->focused(), false);

263−

267+

264−// appManager->focusApplication("abs-icon");

268+ appManager->focusApplication("abs-icon");

265−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

269+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

266−// QCOMPARE(launcherModel->get(0)->focused(), true);

270+ QCOMPARE(launcherModel->get(0)->focused(), true);

267−// QCOMPARE(launcherModel->get(1)->focused(), false);

271+ QCOMPARE(launcherModel->get(1)->focused(), false);

268−

272+

269−// appManager->focusApplication("no-icon");

273+ appManager->focusApplication("no-icon");

270−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

274+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 2);

271−// QCOMPARE(launcherModel->get(0)->focused(), false);

275+ QCOMPARE(launcherModel->get(0)->focused(), false);

272−// QCOMPARE(launcherModel->get(1)->focused(), true);

276+ QCOMPARE(launcherModel->get(1)->focused(), true);

273−// }

277+ }

274−

278+

275−// void testClosingApps() {

279+ void testClosingApps() {

276−// // At the start there are 2 items. Let's pin one.

280+ // At the start there are 2 items. Let's pin one.

277−// launcherModel->pin("abs-icon");

281+ launcherModel->pin("abs-icon");

278−// while (appManager->count() > 0) {

282+ while (appManager->count() > 0) {

279−// appManager->removeApplication(0);

283+ appManager->removeApplication(0);

280−// }

284+ }

281−// // The pinned one needs to stay, the other needs to disappear

285+ // The pinned one needs to stay, the other needs to disappear

282−// QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

286+ QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);

283−// QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));

287+ QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));

284−// }

288+ }

285−

289+

286−// void testGetUrlForAppId() {

290+ void testGetUrlForAppId() {

287−// QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());

291+ QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());

288−// QCOMPARE(launcherModel->getUrlForAppId(""), QString());

292+ QCOMPARE(launcherModel->getUrlForAppId(""), QString());

289−// QCOMPARE(launcherModel->getUrlForAppId("no-name"), QString("application:///no-name.desktop"));

293+ QCOMPARE(launcherModel->getUrlForAppId("no-name"), QString("application:///no-name.desktop"));

290−// QCOMPARE(launcherModel->getUrlForAppId("com.test.good"), QString("appid://com.test.good/first-listed-app/current-user-version"));

294+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good"), QString("application:///com.test.good.desktop"));

291−// QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application"), QString("appid://com.test.good/application/current-user-version"));

295+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application"), QString("appid://com.test.good/application/current-user-version"));

292−// QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application_1.2.3"), QString("appid://com.test.good/application/current-user-version"));

296+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application_1.2.3"), QString("appid://com.test.good/application/current-user-version"));

297+ }

298+

299+ void testIntrospection() {

300+ QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "org.freedesktop.DBus.Introspectable");

301+ QDBusReply<QString> reply = interface.call("Introspect");

302+ QStringList nodes = extractNodes(reply.value());

303+ QCOMPARE(nodes.count(), launcherModel->rowCount());

304+

305+ appManager->addApplication(new MockApp("foobar"));

306+ reply = interface.call("Introspect");

307+ nodes = extractNodes(reply.value());

308+ QCOMPARE(nodes.contains("foobar"), true);

309+

310+ appManager->removeApplication(2);

311+ reply = interface.call("Introspect");

312+ nodes = extractNodes(reply.value());

313+ QCOMPARE(nodes.contains("foobar"), false);

314+ }

315+

316+ QStringList extractNodes(const QString &introspectionXml) {

317+ QXmlStreamReader introspectReply(introspectionXml);

318+

319+ QStringList ret;

320+ while (!introspectReply.atEnd() && !introspectReply.hasError()) {

321+ QXmlStreamReader::TokenType token = introspectReply.readNext();

322+

323+ if (token == QXmlStreamReader::StartElement) {

324+ if (introspectReply.name() == "node" && introspectReply.attributes().count() > 0) {

325+ ret << introspectReply.attributes().value("name").toString();

326+ }

327+ }

328+ }

329+ return ret;

330+ }

331+

332+ void testCountEmblems() {

333+ // Call GetAll on abs-icon

334+ QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher/abs_2Dicon", "org.freedesktop.DBus.Properties");

335+ QDBusReply<QVariantMap> reply = interface.call("GetAll");

336+ QVariantMap map = reply.value();

337+

338+ // Make sure GetAll returns a map with count and countVisible props

339+ QCOMPARE(map.contains("count"), true);

340+ QCOMPARE(map.contains("countVisible"), true);

341+

342+ // Make sure count is intitilized to 0 and non-visible

343+ QCOMPARE(map.value("count").toInt(), 0);

344+ QCOMPARE(map.value("countVisible").toBool(), false);

345+

346+ // Now make it visible and set it to 55 through D-Bus

347+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "count", 55);

348+ interface.call("Set", "com.canonical.Unity.Launcher.Item", "countVisible", true);

349+

350+ // Fetch it again using GetAll

351+ reply = interface.call("GetAll");

352+ map = reply.value();

353+

354+ // Make sure values have changed on the D-Bus interface

355+ QCOMPARE(map.value("count").toInt(), 55);

356+ QCOMPARE(map.value("countVisible").toBool(), true);

357+

358+ // Now the item on the upper side of the API

359+ int index = launcherModel->findApplication("abs-icon");

360+ QCOMPARE(index >= 0, true);

361+

362+ // And make sure values have changed there as well

363+ QCOMPARE(launcherModel->get(index)->countVisible(), true);

364+ QCOMPARE(launcherModel->get(index)->count(), 55);

365+ }

366+

367+ void testRefresh() {

368+ QDBusInterface interface("com.canonical.Unity.Launcher", "/com/canonical/Unity/Launcher", "com.canonical.Unity.Launcher");

369+ QDBusReply<void> reply = interface.call("Refresh");

370+

371+ // Make sure the call to Refresh returned without error.

372+ QCOMPARE(reply.isValid(), true);

293−// }

373+ }

294};

374};

295

375

296QTEST_GUILESS_MAIN(LauncherModelTest)

376QTEST_GUILESS_MAIN(LauncherModelTest)