Merge lp:~larsu/indicator-datetime/remove-test-warnings into lp:indicator-datetime/15.10

[Lars Karlitski]

Remove warnings from test logs

Swallow the ones that are expected and fail the test if they don't show up. In addition, fail tests if unexpected warnings show up again.

Also remove some dead code that dealt with counting log emissions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:421
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/328/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/18/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/328/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:427
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/329/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-wily-armhf-ci/19/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-ci/329/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larsu/indicator-datetime/remove-test-warnings]

426. By Lars Karlitski on 2015-09-03

timezone-timedated: subscribe to PropertiesChanged directly

This avoids some unnecessary calls that GDBusProxy makes and the name
watching.

427. By Lars Karlitski on 2015-09-09

test-utils: don't pass NULL as gsettings string value

NULL is not a valid string. Use the empty string instead.

428. By Lars Karlitski on 2015-09-09

glib-fixture: fail tests on unexpected warnings

This requires specifying which warnings are expected to be thrown (only
test-timezone-file needed this for now).

However, only fail on warnings in the Indicator-Datetime log domain so
that we don't fail on gstreamer (or other library) warnings for now.

429. By Lars Karlitski on 2015-09-09

state-fixture: use TestDBusFixture for system bus

Unmerged revisions

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2015-07-22 12:00:11 +0000
+++ tests/CMakeLists.txt	2015-09-03 15:12:23 +0000
@@ -38,6 +38,7 @@
 
 
 add_definitions (-DSANDBOX="${CMAKE_CURRENT_BINARY_DIR}")
+add_definitions (-DG_LOG_DOMAIN="Indicator-Datetime")
 
 function(add_test_by_name name)
   set (TEST_NAME ${name})

=== modified file 'tests/glib-fixture.h'
--- tests/glib-fixture.h	2014-09-17 16:51:51 +0000
+++ tests/glib-fixture.h	2015-09-03 15:12:23 +0000
@@ -36,34 +36,6 @@
 
     virtual ~GlibFixture() =default;
 
-  private:
-
-    //GLogFunc realLogHandler;
-
-  protected:
-
-    std::map<GLogLevelFlags,int> logCounts;
-
-    void testLogCount(GLogLevelFlags log_level, int /*expected*/)
-    {
-#if 0
-      EXPECT_EQ(expected, logCounts[log_level]);
-#endif
-
-      logCounts.erase(log_level);
-    }
-
-  private:
-
-    static void default_log_handler(const gchar    * log_domain,
-                                    GLogLevelFlags   log_level,
-                                    const gchar    * message,
-                                    gpointer         self)
-    {
-      g_print("%s - %d - %s\n", log_domain, (int)log_level, message);
-      static_cast<GlibFixture*>(self)->logCounts[log_level]++;
-    }
-
   protected:
 
     virtual void SetUp() override
@@ -72,34 +44,30 @@
 
       loop = g_main_loop_new(nullptr, false);
 
-      //g_log_set_default_handler(default_log_handler, this);
-
       // only use local, temporary settings
       g_assert(g_setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, true));
       g_assert(g_setenv("GSETTINGS_BACKEND", "memory", true));
       g_debug("SCHEMA_DIR is %s", SCHEMA_DIR);
 
+      // fail on unexpected messages from this domain
+      g_log_set_fatal_mask(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING);
+
       g_unsetenv("DISPLAY");
 
     }
 
     virtual void TearDown() override
     {
-#if 0
-      // confirm there aren't any unexpected log messages
-      EXPECT_EQ(0, logCounts[G_LOG_LEVEL_ERROR]);
-      EXPECT_EQ(0, logCounts[G_LOG_LEVEL_CRITICAL]);
-      EXPECT_EQ(0, logCounts[G_LOG_LEVEL_WARNING]);
-      EXPECT_EQ(0, logCounts[G_LOG_LEVEL_MESSAGE]);
-      EXPECT_EQ(0, logCounts[G_LOG_LEVEL_INFO]);
-#endif
-
-      // revert to glib's log handler
-      //g_log_set_default_handler(realLogHandler, this);
+      g_test_assert_expected_messages ();
 
       g_clear_pointer(&loop, g_main_loop_unref);
     }
 
+    void expectLogMessage (const gchar *domain, GLogLevelFlags level, const gchar *pattern)
+    {
+      g_test_expect_message (domain, level, pattern);
+    }
+
   private:
 
     static gboolean

=== modified file 'tests/test-timezone-file.cpp'
--- tests/test-timezone-file.cpp	2014-09-17 16:51:51 +0000
+++ tests/test-timezone-file.cpp	2015-09-03 15:12:23 +0000
@@ -83,11 +83,11 @@
   remove(TIMEZONE_FILE);
   ASSERT_FALSE(g_file_test(TIMEZONE_FILE, G_FILE_TEST_EXISTS));
 
+  expectLogMessage(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "*No such file or directory*");
+  expectLogMessage(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "*No such file or directory*");
   FileTimezone tz(TIMEZONE_FILE);
-  testLogCount(G_LOG_LEVEL_WARNING, 1);
 }
 
-
 /**
  * Test that timezone-file picks up the initial value
  */

=== modified file 'tests/test-utils.cpp'
--- tests/test-utils.cpp	2014-02-02 21:29:29 +0000
+++ tests/test-utils.cpp	2015-09-03 15:12:23 +0000
@@ -59,7 +59,7 @@
         const char* location;
         const char* expected_name;
     } beautify_timezone_test_cases[] = {
-        { "America/Chicago", nullptr, "Chicago" },
+        { "America/Chicago", "", "Chicago" },
         { "America/Chicago", "America/Chicago", "Chicago" },
         { "America/Chicago", "America/Chigago Chicago", "Chicago" },
         { "America/Chicago", "America/Chicago Oklahoma City", "Oklahoma City" },