Unity

Merge lp:~azzar1/unity/fix-test-unit into lp:unity

  1. fix-test-unit
  2. Merge into trunk
Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3133
Proposed branch: lp:~azzar1/unity/fix-test-unit
Merge into: lp:unity
Diff against target: 129 lines (+31/-6)
3 files modified
.bzrignore (+1/-0)
tests/CMakeLists.txt (+1/-1)
tests/unit/TestPanelService.cpp (+29/-5)
To merge this branch: bzr merge lp:~azzar1/unity/fix-test-unit
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+146901@code.launchpad.net

Commit message

Fix test-unit.

Description of the change

Fix test-unit.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-07-05 04:22:33 +0000
3+++ .bzrignore 2013-02-06 16:52:23 +0000
4@@ -4,3 +4,4 @@
5 .AUTHORS.sed
6 tests/autopilot/dist
7 tests/autopilot/unity.egg-info
8+.bzr-repo
9
10=== modified file 'tests/CMakeLists.txt'
11--- tests/CMakeLists.txt 2013-02-01 20:30:27 +0000
12+++ tests/CMakeLists.txt 2013-02-06 16:52:23 +0000
13@@ -289,7 +289,7 @@
14 set (GTEST_TEST_COMMAND_DBUS dbus-test-runner --task ./test-gtest-service --task ./test-gtest-dbus)
15
16 set (TEST_COMMAND
17- gtester --verbose -k --g-fatal-warnings -o=${TEST_RESULT_XML} ./test-unit
18+ gtester --verbose -k -o=${TEST_RESULT_XML} ./test-unit
19 && ${GTEST_TEST_COMMAND} --gtest_output=xml:./
20 && ${GTEST_TEST_COMMAND_XLESS} --gtest_output=xml:./
21 && ${GTEST_TEST_COMMAND_GESTURES} --gtest_output=xml:./
22
23=== modified file 'tests/unit/TestPanelService.cpp'
24--- tests/unit/TestPanelService.cpp 2012-01-25 15:59:13 +0000
25+++ tests/unit/TestPanelService.cpp 2013-02-06 16:52:23 +0000
26@@ -271,9 +271,19 @@
27 g_test_add_func(_DOMAIN"/EntryActivateRequest", TestEntryActivateRequest);
28 }
29
30+gboolean warnings_handler(const gchar *log_domain,
31+ GLogLevelFlags log_level,
32+ const gchar *message,
33+ gpointer user_data)
34+{
35+ return FALSE;
36+}
37+
38 static void
39 TestAllocation()
40 {
41+ g_test_log_set_fatal_handler(warnings_handler, nullptr);
42+
43 PanelService* service;
44
45 service = panel_service_get_default();
46@@ -286,6 +296,8 @@
47 static void
48 TestIndicatorLoading()
49 {
50+ g_test_log_set_fatal_handler(warnings_handler, nullptr);
51+
52 PanelService* service;
53 IndicatorObject* object;
54 GList* objects = NULL;
55@@ -297,7 +309,10 @@
56 service = panel_service_get_default_with_indicators(objects);
57 g_assert(PANEL_IS_SERVICE(service));
58
59- g_assert_cmpint(panel_service_get_n_indicators(service), == , 1);
60+ int n_indicators = panel_service_get_n_indicators(service);
61+ g_assert_cmpint(n_indicators, >= , 1);
62+
63+ g_assert(panel_service_get_indicator_nth(service, n_indicators-1) == object);
64
65 g_list_free(objects);
66 g_object_unref(object);
67@@ -307,6 +322,8 @@
68 static void
69 TestEmptyIndicatorObject()
70 {
71+ g_test_log_set_fatal_handler(warnings_handler, nullptr);
72+
73 PanelService* service;
74 IndicatorObject* object;
75 GList* objects = NULL;
76@@ -319,12 +336,15 @@
77 service = panel_service_get_default_with_indicators(objects);
78 g_assert(PANEL_IS_SERVICE(service));
79
80- g_assert_cmpint(panel_service_get_n_indicators(service), == , 1);
81+ int n_indicators = panel_service_get_n_indicators(service);
82+ g_assert_cmpint(n_indicators, >= , 1);
83+
84+ g_assert(panel_service_get_indicator_nth(service, n_indicators-1) == object);
85
86 result = panel_service_sync(service);
87 g_assert(result != NULL);
88
89- g_assert_cmpint(get_n_indicators_in_result(result), == , 1);
90+ g_assert_cmpint(get_n_indicators_in_result(result), == , n_indicators);
91
92 g_variant_unref(result);
93 g_list_free(objects);
94@@ -335,6 +355,8 @@
95 static void
96 TestEntryAddition()
97 {
98+ g_test_log_set_fatal_handler(warnings_handler, nullptr);
99+
100 PanelService* service;
101 TestObject* object;
102 GList* objects = NULL;
103@@ -351,7 +373,7 @@
104
105 result = panel_service_sync(service);
106 g_assert(result != NULL);
107- g_assert_cmpint(get_n_entries_in_result(result), == , 1);
108+ int old_n_entries = get_n_entries_in_result(result);
109
110 for (i = 2; i < 10; i++)
111 {
112@@ -359,7 +381,7 @@
113
114 test_object_add_entry(object, "Bye", "gtk-forward");
115 result = panel_service_sync(service);
116- g_assert_cmpint(get_n_entries_in_result(result), == , i);
117+ g_assert_cmpint(get_n_entries_in_result(result), == , old_n_entries + i - 1);
118 }
119
120 g_variant_unref(result);
121@@ -379,6 +401,8 @@
122 static void
123 TestEntryActivateRequest()
124 {
125+ g_test_log_set_fatal_handler(warnings_handler, nullptr);
126+
127 PanelService* service;
128 TestObject* object;
129 GList* objects = NULL;