aboutsummaryrefslogtreecommitdiff
path: root/tests/test-indicator.cc
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-10-26 14:48:54 +0200
committerCharles Kerr <charles.kerr@canonical.com>2012-10-26 14:48:54 +0200
commit6d19670d7d438f2c58c9d819e87b72060af16bc5 (patch)
tree97a5d4f51d4dbe3f9a312c2c784c9c9b06b42713 /tests/test-indicator.cc
parent3a0758a29fdae434142e1a67329ff2b65fee3c6b (diff)
parente246512c0c503b9a80051ae96a9f48d5b7ddb733 (diff)
downloadayatana-indicator-power-6d19670d7d438f2c58c9d819e87b72060af16bc5.tar.gz
ayatana-indicator-power-6d19670d7d438f2c58c9d819e87b72060af16bc5.tar.bz2
ayatana-indicator-power-6d19670d7d438f2c58c9d819e87b72060af16bc5.zip
choose the correct primary device, and choose the correct icon for it.
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);
}