aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/test-indicator-sound-dbus-client.c75
-rw-r--r--tests/test-indicator-sound-dbus-server.c24
-rw-r--r--tests/test-indicator-sound.c4
3 files changed, 36 insertions, 67 deletions
diff --git a/tests/test-indicator-sound-dbus-client.c b/tests/test-indicator-sound-dbus-client.c
index 1c23dc5..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"
@@ -34,59 +33,42 @@ static DBusGProxy * proxy= NULL;
static void
test_fetch_mute(DBusGProxy * proxy)
{
- GError * error = NULL;
- gboolean *fetched_mute_value;
- fetched_mute_value = g_new0(gboolean, 1);
- org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
+ GError * error = NULL;
+ gboolean *fetched_mute_value;
+ fetched_mute_value = g_new0(gboolean, 1);
+ org_ayatana_indicator_sound_get_sink_mute(proxy, fetched_mute_value, &error);
if (error != NULL) {
g_warning("test-indicator-sound-dbus-client::test_fetch_mute - Unable to fetch mute: %s", error->message);
g_error_free(error);
- g_free(fetched_mute_value);
- return;
- }
- g_assert(TEST_MUTE_VALUE == *fetched_mute_value);
g_free(fetched_mute_value);
+ return;
+ }
+ g_assert(TEST_MUTE_VALUE == *fetched_mute_value);
+ g_free(fetched_mute_value);
}
-static void
-test_fetch_volume(DBusGProxy * proxy)
+static void
+test_fetch_availability(DBusGProxy * proxy)
{
GError * error = NULL;
- gdouble *volume_percent_input;
- volume_percent_input = g_new0(gdouble, 1);
- org_ayatana_indicator_sound_get_sink_volume(proxy, volume_percent_input, &error);
+ gboolean * available_input;
+ available_input = g_new0(gboolean, 1);
+ org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
if (error != NULL) {
- g_warning("test-indicator-sound-dbus-client::test_fetch_volume - Unable to fetch VOLUME: %s", error->message);
+ g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
g_error_free(error);
- g_free(volume_percent_input);
- return;
+ g_free(available_input);
+ return;
}
- g_assert(TEST_VOLUME_VALUE == *volume_percent_input);
- g_free(volume_percent_input);
-}
-
-static void
-test_fetch_availability(DBusGProxy * proxy)
-{
- GError * error = NULL;
- gboolean * available_input;
- available_input = g_new0(gboolean, 1);
- org_ayatana_indicator_sound_get_sink_availability(proxy, available_input, &error);
- if (error != NULL) {
- g_warning("test-indicator-sound-dbus-client::test_fetch_availability - unable to fetch availability %s", error->message);
- g_error_free(error);
- g_free(available_input);
- return;
- }
- g_assert(TEST_AVAILABLE_VALUE == *available_input);
- g_free(available_input);
+ g_assert(TEST_AVAILABLE_VALUE == *available_input);
+ g_free(available_input);
}
gboolean
kill_func (gpointer userdata)
{
- g_free(proxy);
+ g_free(proxy);
g_main_loop_quit(mainloop);
return FALSE;
}
@@ -107,24 +89,17 @@ main (gint argc, gchar * argv[])
}
DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
- ":1.0",
- INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
- INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
- &error);
+ ":1.0",
+ INDICATOR_SOUND_SERVICE_DBUS_OBJECT,
+ INDICATOR_SOUND_SERVICE_DBUS_INTERFACE,
+ &error);
if (error != NULL) {
g_error("Unable to get property proxy: %s", error->message);
return 1;
}
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-mute", test_fetch_mute);*/
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-volume", test_fetch_volume);*/
-/* g_test_add_func("/test-indicator-sound-dbus/test-fetch-availability", test_fetch_availability);*/
-/* g_test_queue_free(proxy);*/
-/* return g_test_run();*/
-
- test_fetch_mute(proxy);
- test_fetch_volume(proxy);
- test_fetch_availability(proxy);
+ test_fetch_mute(proxy);
+ test_fetch_availability(proxy);
g_timeout_add_seconds(2, kill_func, NULL);
diff --git a/tests/test-indicator-sound-dbus-server.c b/tests/test-indicator-sound-dbus-server.c
index 6912dc4..b1e3d9c 100644
--- a/tests/test-indicator-sound-dbus-server.c
+++ b/tests/test-indicator-sound-dbus-server.c
@@ -35,33 +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_volume(dbus_interface, TEST_VOLUME_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 ();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 15:47:10 +0000