diff options
| author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2012-01-25 16:59:13 +0100 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2012-01-25 16:59:13 +0100 |
| commit | 3eacb1481796886a263e1f5407801953ae26767e (patch) | |
| tree | b39adcc3629edb9b896f0af0d8b75a38c94f5c24 /tests/unit | |
| parent | fad9c0444190f1ce7cb0f592d2465d54f2807cc9 (diff) | |
Tests, PanelService: re-enabled the test and fixed the compilation and execution.
(bzr r1858.9.12)
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/TestMain.cpp | 8 | ||||
| -rw-r--r-- | tests/unit/TestPanelService.cpp | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/tests/unit/TestMain.cpp b/tests/unit/TestMain.cpp index 19f35244a..76ad925ad 100644 --- a/tests/unit/TestMain.cpp +++ b/tests/unit/TestMain.cpp @@ -25,9 +25,9 @@ #include "Nux/Nux.h" #include "Nux/WindowThread.h" -//void TestPanelServiceCreateSuite (void); -void TestUBusCreateSuite(void); -void TestQuicklistMenuitemsCreateSuite(void); +void TestPanelServiceCreateSuite(); +void TestUBusCreateSuite(); +void TestQuicklistMenuitemsCreateSuite(); void TestStaticCairoTextCreateSuite(); nux::WindowThread* @@ -70,7 +70,7 @@ main(int argc, char** argv) g_test_init(&argc, &argv, NULL); //Keep alphabetical please - //TestPanelServiceCreateSuite (); + TestPanelServiceCreateSuite(); TestQuicklistMenuitemsCreateSuite(); TestStaticCairoTextCreateSuite(); TestUBusCreateSuite(); diff --git a/tests/unit/TestPanelService.cpp b/tests/unit/TestPanelService.cpp index 4e51adfc8..3a24f6d7b 100644 --- a/tests/unit/TestPanelService.cpp +++ b/tests/unit/TestPanelService.cpp @@ -177,6 +177,7 @@ get_n_indicators_in_result(GVariant* result) GVariantIter* iter; gchar* indicator_id; gchar* entry_id; + gchar* entry_name_hint; gchar* label; gboolean label_sensitive; gboolean label_visible; @@ -185,10 +186,11 @@ get_n_indicators_in_result(GVariant* result) gboolean image_sensitive; gboolean image_visible; - g_variant_get(result, "(a(sssbbusbb))", &iter); - while (g_variant_iter_loop(iter, "(sssbbusbb)", + g_variant_get(result, "(a(ssssbbusbbi))", &iter); + while (g_variant_iter_loop(iter, "(ssssbbusbbi)", &indicator_id, &entry_id, + &entry_name_hint, &label, &label_sensitive, &label_visible, @@ -215,8 +217,8 @@ get_n_entries_in_result(GVariant* result) guint ret = 0; GVariantIter* iter; gchar* indicator_id; - gchar* name_hint; gchar* entry_id; + gchar* entry_name_hint; gchar* label; gboolean label_sensitive; gboolean label_visible; @@ -229,8 +231,8 @@ get_n_entries_in_result(GVariant* result) g_variant_get(result, "(a(ssssbbusbbi))", &iter); while (g_variant_iter_loop(iter, "(ssssbbusbbi)", &indicator_id, - &name_hint, &entry_id, + &entry_name_hint, &label, &label_sensitive, &label_visible, |