From fa946df247f0e16de3a355dd5696f4671277348a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:18:23 -0400 Subject: Adding in a tests folder --- tests/Makefile.am | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/Makefile.am (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..8ac6544 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1 @@ +#Something should go here -- cgit v1.2.3 From c314d6040b93da70359e19a8b7475c94fc86fb1c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 12:29:12 -0400 Subject: Adding in a simple little test. --- tests/Makefile.am | 25 ++++++++++++++++++++++++- tests/test-loader.c | 7 +++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/test-loader.c (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ac6544..a04855c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1 +1,24 @@ -#Something should go here + +noinst_PROGRAMS = \ + test-loader + +test_loader_SOURCES = \ + test-loader.c + +test_loader_CFLAGS = \ + -Wall -Werror \ + $(UPANEL_CFLAGS) -I$(top_srcdir) + +test_loader_LDADD = \ + $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + +XML_REPORT = loader-check-results.xml +HTML_REPORT = loader-check-results.html + +loader-tester: test-loader + @gtester -o=$(XML_REPORT) ./test-loader + +check-local: loader-tester + +DISTCLEANFILES = $(XML_REPORT) $(HTML_REPORT) + diff --git a/tests/test-loader.c b/tests/test-loader.c new file mode 100644 index 0000000..63590c7 --- /dev/null +++ b/tests/test-loader.c @@ -0,0 +1,7 @@ + +int +main (int argc, char ** argv) +{ + + return 0; +} -- cgit v1.2.3 From 1386478a87fd0f228dd31a00d8f3d969d6a6a98c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 13:00:00 -0400 Subject: Fleshing out the test a little bit. --- tests/Makefile.am | 6 +++--- tests/test-loader.c | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index a04855c..2779ad7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -noinst_PROGRAMS = \ +check_PROGRAMS = \ test-loader test_loader_SOURCES = \ @@ -7,10 +7,10 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(UPANEL_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) test_loader_LDADD = \ - $(UPANEL_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a + $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html diff --git a/tests/test-loader.c b/tests/test-loader.c index 63590c7..7e77195 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,7 +1,29 @@ +#include +#include "libindicator/indicator-object.h" + +void +test_loader_refunref (void) +{ + + return; +} + +void +test_loader_creation_deletion_suite (void) +{ + g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); + + return; +} + int main (int argc, char ** argv) { + g_type_init (); + g_test_init (&argc, &argv, NULL); + + test_loader_creation_deletion_suite(); - return 0; + return g_test_run(); } -- cgit v1.2.3 From 4658844f6c1d0e4352ee7baf0e7fcf56bde01d10 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:29:36 -0400 Subject: Test to build the object and unref it. --- tests/test-loader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 7e77195..68bfe48 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,9 +1,25 @@ #include #include "libindicator/indicator-object.h" +void +destroy_cb (gpointer data) +{ + gboolean * bob = (gboolean *)data; + *bob = TRUE; + return; +} + void test_loader_refunref (void) { + GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); + + gboolean unreffed = FALSE; + g_signal_connect(object, "destroy", G_CALLBACK(destroy_cb), &unreffed); + + g_object_unref(object); + + g_assert(unreffed == TRUE); return; } -- cgit v1.2.3 From 26ced5cdf75d022c4b40cc3ef8658bf486a0dba1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 16:34:13 -0400 Subject: Using a weak ref instead of connecting to a signal that doesn't exist --- tests/test-loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 68bfe48..f754685 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -2,7 +2,7 @@ #include "libindicator/indicator-object.h" void -destroy_cb (gpointer data) +destroy_cb (gpointer data, GObject * object) { gboolean * bob = (gboolean *)data; *bob = TRUE; @@ -15,7 +15,7 @@ test_loader_refunref (void) GObject * object = g_object_new(INDICATOR_OBJECT_TYPE, NULL); gboolean unreffed = FALSE; - g_signal_connect(object, "destroy", G_CALLBACK(destroy_cb), &unreffed); + g_object_weak_ref(object, destroy_cb, &unreffed); g_object_unref(object); -- cgit v1.2.3 From c594126850cb7b59294069f2711fa0a5d96febbb Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:03:20 -0400 Subject: Creating a dummy indicator that returns null --- tests/Makefile.am | 31 ++++++++++++++++++++++++++++++- tests/dummy-indicator-null.c | 23 +++++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 tests/dummy-indicator-null.c (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 2779ad7..ad5e5c6 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,13 @@ check_PROGRAMS = \ test-loader +check_LTLIBRARIES = \ + libdummy-indicator-null.la + +############################# +# Test Loader +############################# + test_loader_SOURCES = \ test-loader.c @@ -12,10 +19,32 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator +############################# + +libdummy_indicator_null_la_SOURCES = \ + dummy-indicator-null.c + +libdummy_indicator_null_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_null_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_null_la_LDFLAGS = \ + -module \ + -avoid-version + +############################# +# Test stuff +############################# + XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader +loader-tester: test-loader libdummy-indicator-null.la @gtester -o=$(XML_REPORT) ./test-loader check-local: loader-tester diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c new file mode 100644 index 0000000..ff99d71 --- /dev/null +++ b/tests/dummy-indicator-null.c @@ -0,0 +1,23 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-null") + +GtkLabel * +get_label (void) +{ + return NULL; +} + +GtkImage * +get_icon (void) +{ + return NULL; +} + +GtkMenu * +get_menu (void) +{ + return NULL; +} -- cgit v1.2.3 From d946049ea36d1c6a0946750655eac070566f4974 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:11:47 -0400 Subject: Adding a test that should pass as given a bad filename we should get no object back. --- tests/test-loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index f754685..85cb924 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,6 +1,14 @@ #include #include "libindicator/indicator-object.h" +void +test_loader_filename_bad (void) +{ + IndicatorObject * object = indicator_object_new_from_file("/this/file/should/not/exist.so"); + g_assert(object == NULL); + return; +} + void destroy_cb (gpointer data, GObject * object) { @@ -28,6 +36,7 @@ void test_loader_creation_deletion_suite (void) { g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); + g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); return; } -- cgit v1.2.3 From 1b828c9f669ce1364618387d13fc8a134244e2ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:53:01 -0400 Subject: Apparently they have to be installable to get the .so. Fail. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index ad5e5c6..52cc224 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ check_PROGRAMS = \ test-loader -check_LTLIBRARIES = \ +lib_LTLIBRARIES = \ libdummy-indicator-null.la ############################# -- cgit v1.2.3 From bce9f5143bfbe49972aebe3fa3e0a4566e2502b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 17:57:14 -0400 Subject: A test to load the dummy indicator --- tests/test-loader.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 85cb924..3e94981 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,6 +1,23 @@ #include #include "libindicator/indicator-object.h" +void destroy_cb (gpointer data, GObject * object); + +void +test_loader_filename_dummy_null (void) +{ + IndicatorObject * object = indicator_object_new_from_file("./.libs/libdummy-indicator-null.so"); + g_assert(object != NULL); + + gboolean unreffed = FALSE; + g_object_weak_ref(G_OBJECT(object), destroy_cb, &unreffed); + + g_object_unref(object); + g_assert(unreffed == TRUE); + + return; +} + void test_loader_filename_bad (void) { @@ -37,6 +54,7 @@ test_loader_creation_deletion_suite (void) { g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); + g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); return; } -- cgit v1.2.3 From 376658695b00a0d272b9463722a9d7914a7d7ffc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:48:59 -0400 Subject: Build dir fix and making gtester run all of them even if one fails. --- tests/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 52cc224..2048a9a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,8 @@ test_loader_SOURCES = \ test_loader_CFLAGS = \ -Wall -Werror \ - $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \ + -DBUILD_DIR="\"$(builddir)\"" test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a @@ -45,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -o=$(XML_REPORT) ./test-loader + @gtester -k -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 3bafca747c5c9a1508bc93fdcf9efa77af99710b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 18:49:08 -0400 Subject: Use the new build dir flag --- tests/test-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 3e94981..16c0292 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -6,7 +6,7 @@ void destroy_cb (gpointer data, GObject * object); void test_loader_filename_dummy_null (void) { - IndicatorObject * object = indicator_object_new_from_file("./.libs/libdummy-indicator-null.so"); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); g_assert(object != NULL); gboolean unreffed = FALSE; -- cgit v1.2.3 From 56450cfd530c876adc4ad33b1a5ab53a6a6078fa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:49:23 -0400 Subject: Making it so that the null test checks for failure as we shoudln't have a null image and label. Also making it so that warnings don't cause the test to fail. --- tests/test-loader.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 16c0292..3dcc595 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -4,9 +4,9 @@ void destroy_cb (gpointer data, GObject * object); void -test_loader_filename_dummy_null (void) +test_loader_filename_dummy_simple (void) { - IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); g_assert(object != NULL); gboolean unreffed = FALSE; @@ -18,6 +18,14 @@ test_loader_filename_dummy_null (void) return; } +void +test_loader_filename_dummy_null (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-null.so"); + g_assert(object == NULL); + return; +} + void test_loader_filename_bad (void) { @@ -68,5 +76,7 @@ main (int argc, char ** argv) test_loader_creation_deletion_suite(); + g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL); + return g_test_run(); } -- cgit v1.2.3 From a28e917b914b07de67027c97eb29d533e3fe9393 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 19:50:40 -0400 Subject: Being a bit more verbose --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 2048a9a..461bb51 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -46,7 +46,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la - @gtester -k -o=$(XML_REPORT) ./test-loader + @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester -- cgit v1.2.3 From 97a4004d26cd5ebec0b25b51d4793d1df51b5dba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:12:48 -0400 Subject: Create a very simple indicator and testing it. --- tests/Makefile.am | 25 ++++++++++++++++++++++--- tests/dummy-indicator-simple.c | 23 +++++++++++++++++++++++ tests/test-loader.c | 1 + 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 tests/dummy-indicator-simple.c (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 461bb51..c21ff09 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,7 +3,8 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ - libdummy-indicator-null.la + libdummy-indicator-null.la \ + libdummy-indicator-simple.la ############################# # Test Loader @@ -21,7 +22,7 @@ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a ############################# -# Dummy Indicator +# Dummy Indicator NULL ############################# libdummy_indicator_null_la_SOURCES = \ @@ -38,6 +39,24 @@ libdummy_indicator_null_la_LDFLAGS = \ -module \ -avoid-version +############################# +# Dummy Indicator Simple +############################# + +libdummy_indicator_simple_la_SOURCES = \ + dummy-indicator-simple.c + +libdummy_indicator_simple_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_simple_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_simple_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Test stuff ############################# @@ -45,7 +64,7 @@ libdummy_indicator_null_la_LDFLAGS = \ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html -loader-tester: test-loader libdummy-indicator-null.la +loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la @gtester -k --verbose -o=$(XML_REPORT) ./test-loader check-local: loader-tester diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c new file mode 100644 index 0000000..d939141 --- /dev/null +++ b/tests/dummy-indicator-simple.c @@ -0,0 +1,23 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-simple") + +GtkLabel * +get_label (void) +{ + return GTK_LABEL(gtk_label_new("Simple Item")); +} + +GtkImage * +get_icon (void) +{ + return GTK_IMAGE(gtk_image_new()); +} + +GtkMenu * +get_menu (void) +{ + return GTK_MENU(gtk_menu_new()); +} diff --git a/tests/test-loader.c b/tests/test-loader.c index 3dcc595..1d6a7c3 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -63,6 +63,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); + g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); return; } -- cgit v1.2.3 From 9c16e7c9708c757c46be1e96d58ab6430d729b0a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:17:04 -0400 Subject: A better dummy menu. --- tests/dummy-indicator-simple.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index d939141..cee4eac 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -19,5 +19,10 @@ get_icon (void) GtkMenu * get_menu (void) { - return GTK_MENU(gtk_menu_new()); + GtkMenu * main_menu = GTK_MENU(gtk_menu_new()); + GtkWidget * loading_item = gtk_menu_item_new_with_label("Loading..."); + gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item); + gtk_widget_show(GTK_WIDGET(loading_item)); + + return main_menu; } -- cgit v1.2.3 From 32fc4b833fd948270eaa16f33d5b80eafef6f281 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 20:18:20 -0400 Subject: We need to use GTK. --- tests/test-loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 1d6a7c3..0409a6f 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -1,4 +1,4 @@ -#include +#include #include "libindicator/indicator-object.h" void destroy_cb (gpointer data, GObject * object); @@ -74,6 +74,7 @@ main (int argc, char ** argv) { g_type_init (); g_test_init (&argc, &argv, NULL); + gtk_init(&argc, &argv); test_loader_creation_deletion_suite(); -- cgit v1.2.3 From bb7b49ae82deb1f551ec8892511e4a19c881f6cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 8 Oct 2009 21:03:30 -0400 Subject: Testing the accessors --- tests/test-loader.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index 0409a6f..ecbf502 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -3,6 +3,21 @@ void destroy_cb (gpointer data, GObject * object); +void +test_loader_filename_dummy_simple_accessors (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-simple.so"); + g_assert(object != NULL); + + g_assert(indicator_object_get_label(object) != NULL); + g_assert(indicator_object_get_menu(object) != NULL); + g_assert(indicator_object_get_icon(object) != NULL); + + g_object_unref(object); + + return; +} + void test_loader_filename_dummy_simple (void) { @@ -64,6 +79,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); + g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); return; } -- cgit v1.2.3 From a2f4f868e8744fd6aea1ffb0b335e70c54e039ea Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 21:49:22 -0500 Subject: Building a new dummy indicator that doesn't have any symbols in it. --- tests/Makefile.am | 19 +++++++++++++++++++ tests/dummy-indicator-blank.c | 6 ++++++ 2 files changed, 25 insertions(+) create mode 100644 tests/dummy-indicator-blank.c (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index c21ff09..8121136 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ check_PROGRAMS = \ test-loader lib_LTLIBRARIES = \ + libdummy-indicator-blank.la \ libdummy-indicator-null.la \ libdummy-indicator-simple.la @@ -21,6 +22,24 @@ test_loader_CFLAGS = \ test_loader_LDADD = \ $(LIBINDICATOR_LIBS) $(top_builddir)/libindicator/.libs/libindicator.a +############################# +# Dummy Indicator Blank +############################# + +libdummy_indicator_blank_la_SOURCES = \ + dummy-indicator-blank.c + +libdummy_indicator_blank_la_CFLAGS = \ + -Wall -Werror \ + $(LIBINDICATOR_CFLAGS) -I$(top_srcdir) + +libdummy_indicator_blank_la_LIBADD = \ + $(LIBINDICATOR_LIBS) + +libdummy_indicator_blank_la_LDFLAGS = \ + -module \ + -avoid-version + ############################# # Dummy Indicator NULL ############################# diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c new file mode 100644 index 0000000..41249f2 --- /dev/null +++ b/tests/dummy-indicator-blank.c @@ -0,0 +1,6 @@ + +#include "libindicator/indicator.h" + +INDICATOR_SET_VERSION +INDICATOR_SET_NAME("dummy-indicator-null") + -- cgit v1.2.3 From ccc7f82c202d8f0691fbbfbdd36d08624ae44e0c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sun, 11 Oct 2009 21:50:46 -0500 Subject: using the blank dummy indicator --- tests/test-loader.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tests') diff --git a/tests/test-loader.c b/tests/test-loader.c index ecbf502..4b2b096 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -33,6 +33,14 @@ test_loader_filename_dummy_simple (void) return; } +void +test_loader_filename_dummy_blank (void) +{ + IndicatorObject * object = indicator_object_new_from_file(BUILD_DIR "/.libs/libdummy-indicator-blank.so"); + g_assert(object == NULL); + return; +} + void test_loader_filename_dummy_null (void) { @@ -78,6 +86,7 @@ test_loader_creation_deletion_suite (void) g_test_add_func ("/libindicator/loader/ref_and_unref", test_loader_refunref); g_test_add_func ("/libindicator/loader/filename_bad", test_loader_filename_bad); g_test_add_func ("/libindicator/loader/dummy/null_load", test_loader_filename_dummy_null); + g_test_add_func ("/libindicator/loader/dummy/blank_load", test_loader_filename_dummy_null); g_test_add_func ("/libindicator/loader/dummy/simple_load", test_loader_filename_dummy_simple); g_test_add_func ("/libindicator/loader/dummy/simple_accessors", test_loader_filename_dummy_simple_accessors); -- cgit v1.2.3