Merge branch 'feature/drop_raw_g_assert' into 'master'json-glib-1-6

Drop usage of raw g_assert in reader test in favor of g_assert_*()

See merge request GNOME/json-glib!54

1 files changed, 34 insertions, 33 deletions

diff --git a/json-glib/tests/reader.c b/json-glib/tests/reader.c
index 67a81c3..947fbc9 100644
--- a/json-glib/tests/reader.c
+++ b/json-glib/tests/reader.c
@@ -30,15 +30,15 @@ test_base_object (void)
   gsize n_members, i;
 
   json_parser_load_from_data (parser, test_base_object_data, -1, &error);
-  g_assert (error == NULL);
+  g_assert_no_error (error);
 
   json_reader_set_root (reader, json_parser_get_root (parser));
 
-  g_assert (json_reader_is_object (reader));
+  g_assert_true (json_reader_is_object (reader));
   g_assert_cmpint (json_reader_count_members (reader), ==, 4);
 
   members = json_reader_list_members (reader);
-  g_assert (members != NULL);
+  g_assert_nonnull (members);
 
   n_members = g_strv_length (members);
   g_assert_cmpint (n_members, ==, json_reader_count_members (reader));
@@ -48,29 +48,29 @@ test_base_object (void)
 
   g_strfreev (members);
 
-  g_assert (json_reader_read_member (reader, "text"));
-  g_assert (json_reader_is_value (reader));
+  g_assert_true (json_reader_read_member (reader, "text"));
+  g_assert_true (json_reader_is_value (reader));
   g_assert_cmpstr (json_reader_get_string_value (reader), ==, "hello, world!");
   json_reader_end_member (reader);
 
-  g_assert (json_reader_read_member (reader, "foo"));
-  g_assert (json_reader_get_null_value (reader));
+  g_assert_true (json_reader_read_member (reader, "foo"));
+  g_assert_true (json_reader_get_null_value (reader));
   json_reader_end_member (reader);
 
-  g_assert (!json_reader_read_member (reader, "bar"));
-  g_assert (json_reader_get_error (reader) != NULL);
+  g_assert_false (json_reader_read_member (reader, "bar"));
+  g_assert_nonnull (json_reader_get_error (reader));
   g_assert_error ((GError *) json_reader_get_error (reader),
                   JSON_READER_ERROR,
                   JSON_READER_ERROR_INVALID_MEMBER);
   json_reader_end_member (reader);
-  g_assert (json_reader_get_error (reader) == NULL);
+  g_assert_no_error (json_reader_get_error (reader));
 
-  g_assert (json_reader_read_element (reader, 2));
+  g_assert_true (json_reader_read_element (reader, 2));
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, "blah");
-  g_assert (json_reader_is_value (reader));
+  g_assert_true (json_reader_is_value (reader));
   g_assert_cmpint (json_reader_get_int_value (reader), ==, 47);
   json_reader_end_element (reader);
-  g_assert (json_reader_get_error (reader) == NULL);
+  g_assert_no_error (json_reader_get_error (reader));
 
   json_reader_read_member (reader, "double");
   json_assert_fuzzy_equals (json_reader_get_double_value (reader), 42.47, 0.01);
@@ -88,49 +88,50 @@ test_base_array (void)
   GError *error = NULL;
 
   json_parser_load_from_data (parser, test_base_array_data, -1, &error);
-  g_assert (error == NULL);
+  g_assert_no_error (error);
 
   json_reader_set_root (reader, json_parser_get_root (parser));
 
-  g_assert (json_reader_is_array (reader));
+  g_assert_true (json_reader_is_array (reader));
   g_assert_cmpint (json_reader_count_elements (reader), ==, 7);
 
   json_reader_read_element (reader, 0);
-  g_assert (json_reader_is_value (reader));
+  g_assert_true (json_reader_is_value (reader));
   g_assert_cmpint (json_reader_get_int_value (reader), ==, 0);
   json_reader_end_element (reader);
 
   json_reader_read_element (reader, 1);
-  g_assert (json_reader_is_value (reader));
-  g_assert (json_reader_get_boolean_value (reader));
+  g_assert_true (json_reader_is_value (reader));
+  g_assert_true (json_reader_get_boolean_value (reader));
   json_reader_end_element (reader);
 
   json_reader_read_element (reader, 3);
-  g_assert (json_reader_is_value (reader));
+  g_assert_true (json_reader_is_value (reader));
   g_assert_cmpstr (json_reader_get_string_value (reader), ==, "foo");
   json_reader_end_element (reader);
 
   json_reader_read_element (reader, 5);
-  g_assert (!json_reader_is_value (reader));
-  g_assert (json_reader_is_array (reader));
+  g_assert_false (json_reader_is_value (reader));
+  g_assert_true (json_reader_is_array (reader));
   json_reader_end_element (reader);
 
   json_reader_read_element (reader, 6);
-  g_assert (json_reader_is_object (reader));
+  g_assert_true (json_reader_is_object (reader));
 
   json_reader_read_member (reader, "bar");
-  g_assert (json_reader_is_value (reader));
+  g_assert_true (json_reader_is_value (reader));
   g_assert_cmpint (json_reader_get_int_value (reader), ==, 42);
   json_reader_end_member (reader);
 
   json_reader_end_element (reader);
 
-  g_assert (!json_reader_read_element (reader, 7));
+  g_assert_false (json_reader_read_element (reader, 7));
+  g_assert_nonnull (json_reader_get_error (reader));
   g_assert_error ((GError *) json_reader_get_error (reader),
                   JSON_READER_ERROR,
                   JSON_READER_ERROR_INVALID_INDEX);
   json_reader_end_element (reader);
-  g_assert (json_reader_get_error (reader) == NULL);
+  g_assert_no_error (json_reader_get_error (reader));
 
   g_object_unref (reader);
   g_object_unref (parser);
@@ -146,31 +147,31 @@ test_reader_level (void)
   char **members;
 
   json_parser_load_from_data (parser, test_reader_level_data, -1, &error);
-  g_assert (error == NULL);
+  g_assert_no_error (error);
 
   json_reader_set_root (reader, json_parser_get_root (parser));
 
-  g_assert (json_reader_count_members (reader) > 0);
+  g_assert_cmpint (json_reader_count_members (reader), >, 0);
 
   /* Grab the list */
-  g_assert (json_reader_read_member (reader, "list"));
+  g_assert_true (json_reader_read_member (reader, "list"));
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, "list");
 
   members = json_reader_list_members (reader);
-  g_assert (members != NULL);
+  g_assert_nonnull (members);
   g_strfreev (members);
 
-  g_assert (json_reader_read_member (reader, "181195771"));
+  g_assert_true (json_reader_read_member (reader, "181195771"));
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, "181195771");
 
-  g_assert (!json_reader_read_member (reader, "resolved_url"));
+  g_assert_false (json_reader_read_member (reader, "resolved_url"));
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, NULL);
-  g_assert (json_reader_get_error (reader) != NULL);
+  g_assert_nonnull (json_reader_get_error (reader));
   json_reader_end_member (reader);
 
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, "181195771");
 
-  g_assert (json_reader_read_member (reader, "given_url"));
+  g_assert_true (json_reader_read_member (reader, "given_url"));
   g_assert_cmpstr (json_reader_get_member_name (reader), ==, "given_url");
   g_assert_cmpstr (json_reader_get_string_value (reader), ==, "http://www.gnome.org/json-glib-test");
   json_reader_end_member (reader);