diff options
Diffstat (limited to 'json-glib/tests/invalid.c')
| -rw-r--r-- | json-glib/tests/invalid.c | 47 |
1 files changed, 11 insertions, 36 deletions
diff --git a/json-glib/tests/invalid.c b/json-glib/tests/invalid.c index 3cab2c2..600031d 100644 --- a/json-glib/tests/invalid.c +++ b/json-glib/tests/invalid.c @@ -18,17 +18,12 @@ test_invalid_bareword (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); - g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_INVALID_BAREWORD); - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); - g_clear_error (&error); g_object_unref (parser); @@ -45,16 +40,13 @@ test_invalid_assignment (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_nonnull (error); - - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); + g_test_message ("error: %s", error->message); g_clear_error (&error); @@ -72,16 +64,13 @@ test_invalid_value (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_nonnull (error); - - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); + g_test_message ("error: %s", error->message); g_clear_error (&error); @@ -99,16 +88,13 @@ test_invalid_array (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_nonnull (error); - - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); + g_test_message ("error: %s", error->message); g_clear_error (&error); @@ -126,16 +112,13 @@ test_invalid_object (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_nonnull (error); - - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); + g_test_message ("error: %s", error->message); g_clear_error (&error); @@ -153,17 +136,13 @@ test_missing_comma (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_MISSING_COMMA); - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); - g_clear_error (&error); g_object_unref (parser); @@ -180,17 +159,13 @@ test_trailing_comma (gconstpointer user_data) parser = json_parser_new (); g_assert_true (JSON_IS_PARSER (parser)); - if (g_test_verbose ()) - g_print ("invalid data: '%s'...", json); + g_test_message ("invalid data: '%s'...", json); res = json_parser_load_from_data (parser, json, -1, &error); g_assert_false (res); g_assert_error (error, JSON_PARSER_ERROR, JSON_PARSER_ERROR_TRAILING_COMMA); - if (g_test_verbose ()) - g_print ("expected error: %s\n", error->message); - g_clear_error (&error); g_object_unref (parser); |