aboutsummaryrefslogtreecommitdiff
path: root/tests/test-indicator.cc
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-11-05 12:38:14 +0100
committerSebastien Bacher <seb128@ubuntu.com>2012-11-05 12:38:14 +0100
commita3b85f41ef90ad23d9cbc943fd24856d2775cc7a (patch)
treeaa706529f79a52a8dc03d35d75530642ae60f157 /tests/test-indicator.cc
parent0fa9b264b7d79f9bb303b9383379635bb293cf3d (diff)
parent1e5b83de6bb681307aababbbdc1492e53885b843 (diff)
downloadayatana-indicator-power-a3b85f41ef90ad23d9cbc943fd24856d2775cc7a.tar.gz
ayatana-indicator-power-a3b85f41ef90ad23d9cbc943fd24856d2775cc7a.tar.bz2
ayatana-indicator-power-a3b85f41ef90ad23d9cbc943fd24856d2775cc7a.zip
Import upstream version 12.10.4
Diffstat (limited to 'tests/test-indicator.cc')
-rw-r--r--tests/test-indicator.cc14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/test-indicator.cc b/tests/test-indicator.cc
index b9f7321..824a5ac 100644
--- a/tests/test-indicator.cc
+++ b/tests/test-indicator.cc
@@ -29,6 +29,16 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
namespace
{
+ void quiet_log_func (const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *message,
+ gpointer user_data)
+ {
+ // instantiating an indicator w/o a window causes lots
+ // of glib/gtk warnings... silence them so that they don't
+ // obscure any other warnings generated by the tests.
+ }
+
void ensure_glib_initialized ()
{
static bool initialized = false;
@@ -37,6 +47,8 @@ namespace
{
initialized = true;
g_type_init();
+ g_log_set_handler ("Gtk", (GLogLevelFlags)(G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING), quiet_log_func, NULL);
+ g_log_set_handler ("GLib-GObject", (GLogLevelFlags)(G_LOG_LEVEL_CRITICAL|G_LOG_LEVEL_WARNING), quiet_log_func, NULL);
}
}
}
@@ -71,6 +83,8 @@ class IndicatorTest : public ::testing::Test
virtual void TearDown()
{
+ ASSERT_EQ (1, G_OBJECT(battery_device)->ref_count);
+ ASSERT_EQ (1, G_OBJECT(ac_device)->ref_count);
g_object_unref (battery_device);
g_object_unref (ac_device);
}