From 5e928c9ce0cbeaa1a1050a7c0e8f10fb7027514c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 20 Oct 2009 23:47:20 -0500 Subject: Now we're building a test, woot! --- tests/test-libcustomindicator.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 tests/test-libcustomindicator.c (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c new file mode 100644 index 0000000..fab411d --- /dev/null +++ b/tests/test-libcustomindicator.c @@ -0,0 +1,14 @@ + +#include +#include + +gint +main (gint argc, gchar * argv[]) +{ + g_type_init(); + g_test_init(&argc, &argv, NULL); + + /* Test suites */ + + return g_test_run (); +} -- cgit v1.2.3 From 10e95506d81335d394b9cd955b7728b528c0fe4e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 09:23:21 -0500 Subject: Woot! We can build a custom indicator, and it exists. --- tests/test-libcustomindicator.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index fab411d..6dc9fe9 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -2,6 +2,25 @@ #include #include +#include + +void +test_libcustomindicator_init (void) +{ + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, NULL)); + g_assert(ci != NULL); + g_object_unref(G_OBJECT(ci)); +} + +void +test_libcustomindicator_props_suite (void) +{ + g_test_add_func ("/indicator-custom/libcustomindicator/init", test_libcustomindicator_init); + + + return; +} + gint main (gint argc, gchar * argv[]) { @@ -9,6 +28,8 @@ main (gint argc, gchar * argv[]) g_test_init(&argc, &argv, NULL); /* Test suites */ + test_libcustomindicator_props_suite(); + return g_test_run (); } -- cgit v1.2.3 From 0093c378498e9d203012a143e49137f72d8168ce Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Wed, 21 Oct 2009 09:33:57 -0500 Subject: Ah, forgot a return. Cody would kill me! Oh, no. --- tests/test-libcustomindicator.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index 6dc9fe9..c264bfa 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -10,6 +10,7 @@ test_libcustomindicator_init (void) CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, NULL)); g_assert(ci != NULL); g_object_unref(G_OBJECT(ci)); + return; } void -- cgit v1.2.3 From 795f7d94377f9093e8b3b064e7e020c4f753293d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 11:14:09 -0500 Subject: Adding a test that sets a bunch of properties. --- tests/test-libcustomindicator.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index c264bfa..1736efa 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -4,6 +4,28 @@ #include +void +test_libcustomindicator_init_with_props (void) +{ + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, + "id", "my-id", + "category", CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS, + "status", CUSTOM_INDICATOR_STATUS_ON, + "icon-name", "my-name", + "attention-icon-name", "my-attention-name", + NULL)); + g_assert(ci != NULL); + + g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci))); + g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci))); + g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci))); + g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON); + g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_object_unref(G_OBJECT(ci)); + return; +} + void test_libcustomindicator_init (void) { @@ -16,7 +38,8 @@ test_libcustomindicator_init (void) void test_libcustomindicator_props_suite (void) { - g_test_add_func ("/indicator-custom/libcustomindicator/init", test_libcustomindicator_init); + g_test_add_func ("/indicator-custom/libcustomindicator/init", test_libcustomindicator_init); + g_test_add_func ("/indicator-custom/libcustomindicator/init_props", test_libcustomindicator_init_with_props); return; -- cgit v1.2.3 From dc43af9a9e3aa1965bf3d9994f8733cdaf588912 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 11:40:23 -0500 Subject: Checking all the set functions. --- tests/test-libcustomindicator.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index 1736efa..ecc187b 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -4,6 +4,28 @@ #include +void +test_libcustomindicator_init_set_props (void) +{ + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, NULL)); + g_assert(ci != NULL); + + custom_indicator_set_id(ci, "my-id"); + custom_indicator_set_category(ci, CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + custom_indicator_set_icon(ci, "my-name"); + custom_indicator_set_attention_icon(ci, "my-attention-name"); + + g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci))); + g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci))); + g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci))); + g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON); + g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); + + g_object_unref(G_OBJECT(ci)); + return; +} + void test_libcustomindicator_init_with_props (void) { @@ -40,6 +62,7 @@ test_libcustomindicator_props_suite (void) { g_test_add_func ("/indicator-custom/libcustomindicator/init", test_libcustomindicator_init); g_test_add_func ("/indicator-custom/libcustomindicator/init_props", test_libcustomindicator_init_with_props); + g_test_add_func ("/indicator-custom/libcustomindicator/init_set_props", test_libcustomindicator_init_set_props); return; -- cgit v1.2.3 From 5e1d1d9aee14f8771f89c98004299575a35e89b7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 12:06:19 -0500 Subject: Adding test to test the property change signals. --- tests/test-libcustomindicator.c | 83 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index ecc187b..1bda8b4 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -4,6 +4,87 @@ #include +void +test_libcustomindicator_prop_signals_status_helper (CustomIndicator * ci, CustomIndicatorStatus status, gboolean * signalactivated) +{ + *signalactivated = TRUE; + return; +} + +void +test_libcustomindicator_prop_signals_helper (CustomIndicator * ci, gboolean * signalactivated) +{ + *signalactivated = TRUE; + return; +} + +void +test_libcustomindicator_prop_signals (void) +{ + CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, NULL)); + g_assert(ci != NULL); + + gboolean signaled = FALSE; + gulong handlerid; + + handlerid = 0; + handlerid = g_signal_connect(G_OBJECT(ci), "new-icon", G_CALLBACK(test_libcustomindicator_prop_signals_helper), &signaled); + g_assert(handlerid != 0); + + handlerid = 0; + handlerid = g_signal_connect(G_OBJECT(ci), "new-attention-icon", G_CALLBACK(test_libcustomindicator_prop_signals_helper), &signaled); + g_assert(handlerid != 0); + + handlerid = 0; + handlerid = g_signal_connect(G_OBJECT(ci), "new-status", G_CALLBACK(test_libcustomindicator_prop_signals_status_helper), &signaled); + g_assert(handlerid != 0); + + + signaled = FALSE; + custom_indicator_set_icon(ci, "bob"); + g_assert(signaled); + + signaled = FALSE; + custom_indicator_set_icon(ci, "bob"); + g_assert(!signaled); + + signaled = FALSE; + custom_indicator_set_icon(ci, "al"); + g_assert(signaled); + + + signaled = FALSE; + custom_indicator_set_attention_icon(ci, "bob"); + g_assert(signaled); + + signaled = FALSE; + custom_indicator_set_attention_icon(ci, "bob"); + g_assert(!signaled); + + signaled = FALSE; + custom_indicator_set_attention_icon(ci, "al"); + g_assert(signaled); + + + signaled = FALSE; + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_OFF); + g_assert(!signaled); + + signaled = FALSE; + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + g_assert(signaled); + + signaled = FALSE; + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + g_assert(!signaled); + + signaled = FALSE; + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ATTENTION); + g_assert(signaled); + + return; +} + void test_libcustomindicator_init_set_props (void) { @@ -63,7 +144,7 @@ test_libcustomindicator_props_suite (void) g_test_add_func ("/indicator-custom/libcustomindicator/init", test_libcustomindicator_init); g_test_add_func ("/indicator-custom/libcustomindicator/init_props", test_libcustomindicator_init_with_props); g_test_add_func ("/indicator-custom/libcustomindicator/init_set_props", test_libcustomindicator_init_set_props); - + g_test_add_func ("/indicator-custom/libcustomindicator/prop_signals", test_libcustomindicator_prop_signals); return; } -- cgit v1.2.3 From 5aeff27144282c008771e3f049b2f5ba0398a532 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 13:24:21 -0500 Subject: Getting the prototype right. --- tests/test-libcustomindicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index 1bda8b4..b4b4084 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -5,7 +5,7 @@ #include void -test_libcustomindicator_prop_signals_status_helper (CustomIndicator * ci, CustomIndicatorStatus status, gboolean * signalactivated) +test_libcustomindicator_prop_signals_status_helper (CustomIndicator * ci, gchar * status, gboolean * signalactivated) { *signalactivated = TRUE; return; -- cgit v1.2.3 From 0df50d723494e795aa7447c02ac0f15611b2bfd8 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 21 Oct 2009 15:42:13 -0500 Subject: Change the enums to match the KDE ones to make life simpler even though I dislike the names. --- tests/test-libcustomindicator.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index b4b4084..b3ead63 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -67,15 +67,15 @@ test_libcustomindicator_prop_signals (void) signaled = FALSE; - custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_OFF); + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_PASSIVE); g_assert(!signaled); signaled = FALSE; - custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE); g_assert(signaled); signaled = FALSE; - custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE); g_assert(!signaled); signaled = FALSE; @@ -93,14 +93,14 @@ test_libcustomindicator_init_set_props (void) custom_indicator_set_id(ci, "my-id"); custom_indicator_set_category(ci, CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); - custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ON); + custom_indicator_set_status(ci, CUSTOM_INDICATOR_STATUS_ACTIVE); custom_indicator_set_icon(ci, "my-name"); custom_indicator_set_attention_icon(ci, "my-attention-name"); g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci))); g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci))); g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci))); - g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON); + g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ACTIVE); g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); g_object_unref(G_OBJECT(ci)); @@ -113,7 +113,7 @@ test_libcustomindicator_init_with_props (void) CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, "id", "my-id", "category", CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS, - "status", CUSTOM_INDICATOR_STATUS_ON, + "status", CUSTOM_INDICATOR_STATUS_ACTIVE, "icon-name", "my-name", "attention-icon-name", "my-attention-name", NULL)); @@ -122,7 +122,7 @@ test_libcustomindicator_init_with_props (void) g_assert(!g_strcmp0("my-id", custom_indicator_get_id(ci))); g_assert(!g_strcmp0("my-name", custom_indicator_get_icon(ci))); g_assert(!g_strcmp0("my-attention-name", custom_indicator_get_attention_icon(ci))); - g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ON); + g_assert(custom_indicator_get_status(ci) == CUSTOM_INDICATOR_STATUS_ACTIVE); g_assert(custom_indicator_get_category(ci) == CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS); g_object_unref(G_OBJECT(ci)); -- cgit v1.2.3 From 6a255c63e5030a5ab992184dec39f791eedaa3a7 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 22 Oct 2009 15:45:26 -0500 Subject: Changes due to the properties changes. --- tests/test-libcustomindicator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/test-libcustomindicator.c') diff --git a/tests/test-libcustomindicator.c b/tests/test-libcustomindicator.c index b3ead63..c4342e8 100644 --- a/tests/test-libcustomindicator.c +++ b/tests/test-libcustomindicator.c @@ -112,8 +112,8 @@ test_libcustomindicator_init_with_props (void) { CustomIndicator * ci = CUSTOM_INDICATOR(g_object_new(CUSTOM_INDICATOR_TYPE, "id", "my-id", - "category", CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS, - "status", CUSTOM_INDICATOR_STATUS_ACTIVE, + "category-enum", CUSTOM_INDICATOR_CATEGORY_APPLICATION_STATUS, + "status-enum", CUSTOM_INDICATOR_STATUS_ACTIVE, "icon-name", "my-name", "attention-icon-name", "my-attention-name", NULL)); -- cgit v1.2.3