Merge lp:~pete-woods/hud/window-stack-fix into lp:hud/14.04

[Pete Woods]

Fix window stack breakage introduced by last commit

Fix window stack breakage introduced by last commit

[lp:~pete-woods/hud/window-stack-fix]

355. By Pete Woods on 2013-12-18

Add regression test

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/hud-ci/192/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-armhf-ci/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-trusty-i386-ci/42

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/hud-ci/192/rebuild

review: Approve (continuous-integration)

=== modified file 'common/WindowInfo.h'
--- common/WindowInfo.h	2013-12-18 10:12:17 +0000
+++ common/WindowInfo.h	2013-12-18 15:35:01 +0000
@@ -62,5 +62,6 @@
 		hud::common::WindowInfo &aidf);
 
 Q_DECLARE_METATYPE(hud::common::WindowInfo)
+Q_DECLARE_METATYPE(hud::common::WindowInfoList)
 
 #endif /* HUD_COMMON_WINDOWINFO_H_ */

=== modified file 'tests/unit/window-stack-bridge/TestBamfWindowStack.cpp'
--- tests/unit/window-stack-bridge/TestBamfWindowStack.cpp	2013-11-18 11:09:33 +0000
+++ tests/unit/window-stack-bridge/TestBamfWindowStack.cpp	2013-12-18 15:35:01 +0000
@@ -200,6 +200,33 @@
 	EXPECT_TRUE(windowInfos.empty());
 }
 
+TEST_F(TestBamfWindowStack, OverDBus) {
+	createApplication(0);
+	createWindow(0, 0);
+	createWindow(1, 0);
+	createMatcherMethods(2, 0);
+
+	BamfWindowStack windowStack(dbus.sessionConnection());
+
+	ComCanonicalUnityWindowStackInterface windowStackInterface(
+			DBusTypes::WINDOW_STACK_DBUS_NAME,
+			DBusTypes::WINDOW_STACK_DBUS_PATH, dbus.sessionConnection());
+
+	QDBusPendingReply<WindowInfoList> reply(
+			windowStackInterface.GetWindowStack());
+	QDBusPendingCallWatcher watcher(reply);
+	QSignalSpy spy(&watcher, SIGNAL(finished(QDBusPendingCallWatcher *)));
+	spy.wait();
+	EXPECT_FALSE(spy.isEmpty());
+
+	QList<WindowInfo> windowInfos(reply);
+	ASSERT_EQ(2, windowInfos.size());
+	EXPECT_EQ(WindowInfo(0, "appid-0", true, WindowInfo::MAIN),
+			windowInfos.at(0));
+	EXPECT_EQ(WindowInfo(1, "appid-0", false, WindowInfo::MAIN),
+			windowInfos.at(1));
+}
+
 TEST_F(TestBamfWindowStack, HandlesTwoWindows) {
 	createApplication(0);
 	createWindow(0, 0);

=== modified file 'window-stack-bridge/AbstractWindowStack.h'
--- window-stack-bridge/AbstractWindowStack.h	2013-10-25 15:22:38 +0000
+++ window-stack-bridge/AbstractWindowStack.h	2013-12-18 15:35:01 +0000
@@ -47,7 +47,7 @@
 public Q_SLOTS:
 	virtual QString GetAppIdFromPid(uint pid) = 0;
 
-	virtual QList<hud::common::WindowInfo> GetWindowStack() = 0;
+	virtual hud::common::WindowInfoList GetWindowStack() = 0;
 
 	virtual QStringList GetWindowProperties(uint windowId, const QString &appId,
 			const QStringList &names) = 0;

=== modified file 'window-stack-bridge/BamfWindowStack.cpp'
--- window-stack-bridge/BamfWindowStack.cpp	2013-11-27 14:32:44 +0000
+++ window-stack-bridge/BamfWindowStack.cpp	2013-12-18 15:35:01 +0000
@@ -173,8 +173,8 @@
 	return QString();
 }
 
-QList<WindowInfo> BamfWindowStack::GetWindowStack() {
-	QList<WindowInfo> results;
+WindowInfoList BamfWindowStack::GetWindowStack() {
+	WindowInfoList results;
 
 	QDBusPendingReply<QStringList> stackReply(
 			m_matcher.WindowStackForMonitor(-1));

=== modified file 'window-stack-bridge/BamfWindowStack.h'
--- window-stack-bridge/BamfWindowStack.h	2013-12-17 16:37:55 +0000
+++ window-stack-bridge/BamfWindowStack.h	2013-12-18 15:35:01 +0000
@@ -65,7 +65,7 @@
 public Q_SLOTS:
 	QString GetAppIdFromPid(uint pid) override;
 
-	QList<hud::common::WindowInfo> GetWindowStack() override;
+	hud::common::WindowInfoList GetWindowStack() override;
 
 	QStringList GetWindowProperties(uint windowId, const QString &appId,
 			const QStringList &names) override;