aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2012-03-29 17:12:25 +0100
committerConor Curran <conor.curran@canonical.com>2012-03-29 17:12:25 +0100
commit463ab5619c10b48153911685d78d8c8194096943 (patch)
tree225f071629e2244445cdf0fad56341e70b1ae581
parent747b46525f2cdae3e906edd064ee4ad022d88ff1 (diff)
downloadayatana-indicator-sound-463ab5619c10b48153911685d78d8c8194096943.tar.gz
ayatana-indicator-sound-463ab5619c10b48153911685d78d8c8194096943.tar.bz2
ayatana-indicator-sound-463ab5619c10b48153911685d78d8c8194096943.zip
tests reactivated, now for them to be actually useful
-rw-r--r--configure.ac1
-rw-r--r--tests/test-indicator-sound.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 5d99802..0e2f9ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,7 @@ AC_OUTPUT([
Makefile
src/Makefile
data/Makefile
+tests/Makefile
data/icons/Makefile
data/icons/16x16/Makefile
data/icons/16x16/status/Makefile
diff --git a/tests/test-indicator-sound.c b/tests/test-indicator-sound.c
index e5d4657..088ddb4 100644
--- a/tests/test-indicator-sound.c
+++ b/tests/test-indicator-sound.c
@@ -40,7 +40,6 @@ void test_libindicator_sound_init()
void test_libindicator_determine_state()
{
IndicatorObject * sound_menu = indicator_object_new_from_file(TOP_BUILD_DIR "/src/.libs/libsoundmenu.so");
- prepare_for_tests(sound_menu);
determine_state_from_volume(40);
g_assert(get_state() == STATE_MEDIUM);
@@ -59,7 +58,6 @@ void test_libindicator_determine_state()
void test_libindicator_image_names()
{
- prepare_state_machine();
gchar* muted_name = get_state_image_name(STATE_MUTED);
g_assert(g_ascii_strncasecmp("audio-volume-muted-panel", muted_name, strlen("audio-volume-muted-panel")) == 0);
@@ -82,7 +80,7 @@ void test_libindicator_image_names()
gchar* none_name = get_state_image_name(STATE_SINKS_NONE);
g_assert(g_ascii_strncasecmp("audio-output-none-panel", none_name, strlen("audio-output-none-panel")) == 0);
- tidy_up_hash();
+ //tidy_up_hash();
}