[glib] Add a test for expected messages with structured logging

[Matthias Clasen <matthiasc src gnome org>]

commit bc40c7a05cbd0e7c9b97ce86cccb6a4b78c2e56a
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Aug 2 23:15:27 2016 -0400

    Add a test for expected messages with structured logging
    
    This tests the fix in the previous commit.

 glib/tests/testing.c |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/glib/tests/testing.c b/glib/tests/testing.c
index 3913506..e330d3e 100644
--- a/glib/tests/testing.c
+++ b/glib/tests/testing.c
@@ -369,6 +369,14 @@ test_expected_messages_warning (void)
 }
 
 static void
+test_expected_messages_warning_structured (void)
+{
+  g_log_structured (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+                    "MESSAGE", "This is a %d warning", g_random_int ());
+  g_return_if_reached ();
+}
+
+static void
 test_expected_messages_expect_warning (void)
 {
   g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
@@ -399,6 +407,20 @@ test_expected_messages_expected (void)
 }
 
 static void
+test_expected_messages_structured (void)
+{
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING,
+                         "This is a * warning");
+  g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL,
+                         "*should not be reached");
+
+  test_expected_messages_warning_structured ();
+
+  g_test_assert_expected_messages ();
+  exit (0);
+}
+
+static void
 test_expected_messages_null_domain (void)
 {
   g_test_expect_message (NULL, G_LOG_LEVEL_WARNING, "no domain");
@@ -469,6 +491,10 @@ test_expected_messages (void)
   g_test_trap_assert_passed ();
   g_test_trap_assert_stderr ("");
 
+  g_test_trap_subprocess ("/misc/expected-messages/subprocess/structured", 0, 7);
+  g_test_trap_assert_passed ();
+  g_test_trap_assert_stderr ("");
+
   g_test_trap_subprocess ("/misc/expected-messages/subprocess/null-domain", 0, 0);
   g_test_trap_assert_passed ();
   g_test_trap_assert_stderr ("");
@@ -769,6 +795,7 @@ main (int   argc,
   g_test_add_func ("/misc/expected-messages/subprocess/expect-warning", 
test_expected_messages_expect_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/wrong-warning", test_expected_messages_wrong_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/expected", test_expected_messages_expected);
+  g_test_add_func ("/misc/expected-messages/subprocess/structured", test_expected_messages_structured);
   g_test_add_func ("/misc/expected-messages/subprocess/null-domain", test_expected_messages_null_domain);
   g_test_add_func ("/misc/expected-messages/subprocess/extra-warning", test_expected_messages_extra_warning);
   g_test_add_func ("/misc/expected-messages/subprocess/unexpected-extra-warning", 
test_expected_messages_unexpected_extra_warning);