Merge lp:~ted/indicator-sound/null-selected-user into lp:indicator-sound/14.04

[Ted Gould]

Check the username has been gotten before using it.

Seems that in some cases on startup we can get asked for the list of players before we get the information from the greeter on the selected user. Adding a test that fails on trunk, but is fixed by this branch where we test the greeter list with nothing else on DBus so we can ensure it'll never have the username.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:438
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/119/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-amd64-ci/59/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-trusty-armhf-ci/58/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/119/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/indicator-sound/null-selected-user]

439. By Ted Gould on 2014-03-25

Grab test fix

Unmerged revisions

=== modified file 'src/media-player-list-greeter.vala'
--- src/media-player-list-greeter.vala	2014-03-03 19:28:24 +0000
+++ src/media-player-list-greeter.vala	2014-03-25 13:55:39 +0000
@@ -108,7 +108,7 @@
 		public override MediaPlayer? next_value () {
 			MediaPlayer? retval = null;
 
-			if (i == 0) {
+			if (i == 0 && list.selected_user != null) {
 				retval = list.players.lookup(list.selected_user);
 			}
 			i++;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-03-04 21:24:10 +0000
+++ tests/CMakeLists.txt	2014-03-25 13:55:39 +0000
@@ -158,3 +158,26 @@
 	media-player-user-test  --gtest_filter=MediaPlayerUserTest.TimeoutTest
 )
 
+###########################
+# Greeter List
+###########################
+
+include_directories(${CMAKE_SOURCE_DIR}/src)
+add_executable (greeter-list-test greeter-list.cc)
+target_link_libraries (
+	greeter-list-test
+	indicator-sound-service-lib
+	vala-mocks-lib
+	gtest
+	${SOUNDSERVICE_LIBRARIES}
+	${TEST_LIBRARIES}
+)
+
+# Split tests to work around libaccountservice sucking
+add_test(greeter-list-test-basic
+	greeter-list-test  --gtest_filter=GreeterListTest.BasicObject
+)
+add_test(greeter-list-test-iterator
+	greeter-list-test  --gtest_filter=GreeterListTest.BasicIterator
+)
+

=== added file 'tests/greeter-list.cc'
--- tests/greeter-list.cc	1970-01-01 00:00:00 +0000
+++ tests/greeter-list.cc	2014-03-25 13:55:39 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gio/gio.h>
+
+extern "C" {
+#include "indicator-sound-service.h"
+#include "vala-mocks.h"
+}
+
+class GreeterListTest : public ::testing::Test
+{
+	protected:
+		GTestDBus * bus = nullptr;
+
+		virtual void SetUp() {
+			bus = g_test_dbus_new(G_TEST_DBUS_NONE);
+			g_test_dbus_up(bus);
+		}
+
+		virtual void TearDown() {
+			g_test_dbus_down(bus);
+			g_clear_object(&bus);
+		}
+
+};
+
+TEST_F(GreeterListTest, BasicObject) {
+	MediaPlayerListGreeter * list = media_player_list_greeter_new();
+
+	ASSERT_NE(nullptr, list);
+
+	g_clear_object(&list);
+	return;
+}
+
+TEST_F(GreeterListTest, BasicIterator) {
+	MediaPlayerListGreeter * list = media_player_list_greeter_new();
+	ASSERT_NE(nullptr, list);
+
+	MediaPlayerListGreeterIterator * iter = media_player_list_greeter_iterator_new(list);
+	ASSERT_NE(nullptr, iter);
+
+	MediaPlayer * player = media_player_list_iterator_next_value (MEDIA_PLAYER_LIST_ITERATOR(iter));
+	ASSERT_EQ(nullptr, player);
+
+	g_clear_object(&iter);
+	g_clear_object(&list);
+	return;
+}
+