aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2010-08-18 11:16:13 +0100
committerConor Curran <conor.curran@canonical.com>2010-08-18 11:16:13 +0100
commit75ba919b383a4da5d2634e4f9b85a3cdcbaa907d (patch)
treeb7015db674904cc667da07c28e0c3e65c785c52b /tests
parent8c5284005a19897d5e07fdb9bfe62b0a5d126058 (diff)
downloadayatana-indicator-sound-75ba919b383a4da5d2634e4f9b85a3cdcbaa907d.tar.gz
ayatana-indicator-sound-75ba919b383a4da5d2634e4f9b85a3cdcbaa907d.tar.bz2
ayatana-indicator-sound-75ba919b383a4da5d2634e4f9b85a3cdcbaa907d.zip
tests fixed, and metadata height reset readjustment fixed
Diffstat (limited to 'tests')
-rw-r--r--tests/test-indicator-sound-dbus-client.c1
-rw-r--r--tests/test-indicator-sound-dbus-server.c23
-rw-r--r--tests/test-indicator-sound.c4
3 files changed, 11 insertions, 17 deletions
diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c
index a9ac9ff..265a36d 100644
--- a/tests/test-indicator-sound-dbus-client.c
+++ b/tests/test-indicator-sound-dbus-client.c
@@ -21,7 +21,6 @@ You should have received a copy of the GNU General Public License along
with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#include <glib.h>
#include <dbus/dbus-glib.h>
#include "../src/dbus-shared-names.h"
diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c
index 49da136..b1e3d9c 100644
--- a/tests/test-indicator-sound-dbus-server.c
+++ b/tests/test-indicator-sound-dbus-server.c
@@ -35,32 +35,29 @@ gboolean
kill_func (gpointer userdata)
{
g_main_loop_quit(mainloop);
- // TODO free the dbus interface !!
return FALSE;
}
gint
main (gint argc, gchar * argv[])
{
- g_type_init();
-
- //g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
+ g_type_init();
- dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
+ dbus_interface = g_object_new(SOUND_SERVICE_DBUS_TYPE, NULL);
- // Set the mute value
- sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
- sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
+ // Set the mute value
+ sound_service_dbus_update_sink_mute(dbus_interface, TEST_MUTE_VALUE);
+ sound_service_dbus_update_sink_availability(dbus_interface, TEST_AVAILABLE_VALUE);
- g_timeout_add_seconds(4, kill_func, NULL);
+ g_timeout_add_seconds(4, kill_func, NULL);
- // Run the loop
- mainloop = g_main_loop_new(NULL, FALSE);
- g_main_loop_run(mainloop);
+ // Run the loop
+ mainloop = g_main_loop_new(NULL, FALSE);
+ g_main_loop_run(mainloop);
g_debug("Quiting");
- return 0;
+ return 0;
}
diff --git a/tests/test-indicator-sound.c b/tests/test-indicator-sound.c
index cd28587..e5d4657 100644
--- a/tests/test-indicator-sound.c
+++ b/tests/test-indicator-sound.c
@@ -91,9 +91,7 @@ gint main (gint argc, gchar * argv[])
g_type_init();
g_test_init(&argc, &argv, NULL);
-/* g_test_add_func("/indicator-sound/indicator-sound/init", test_libindicator_sound_init);*/
-/* g_test_add_func("/indicator-sound/indicator-sound/state_machine", test_libindicator_determine_state);*/
- g_test_add_func("/indicator-sound/indicator-sound/image_names", test_libindicator_image_names);
+ g_test_add_func("/indicator-sound/indicator-sound/image_names", test_libindicator_image_names);
return g_test_run ();
}