reader: Do not wrap JsonParser

Since JsonParser has far more methods for parsing a JSON stream we
should just make JsonReader an API for reading an already parsed JSON
tree - in the same way that JsonBuilder does not generate the
stringified version of the JSON tree it builds.

1 files changed, 9 insertions, 2 deletions

diff --git a/json-glib/tests/reader-test.c b/json-glib/tests/reader-test.c
index 64d5fba..91b4783 100644
--- a/json-glib/tests/reader-test.c
+++ b/json-glib/tests/reader-test.c
@@ -14,12 +14,15 @@ static const gchar *test_base_object_data =
 static void
 test_base_object (void)
 {
+  JsonParser *parser = json_parser_new ();
   JsonReader *reader = json_reader_new ();
   GError *error = NULL;
 
-  json_reader_load_from_data (reader, test_base_object_data, -1, &error);
+  json_parser_load_from_data (parser, test_base_object_data, -1, &error);
   g_assert (error == NULL);
 
+  json_reader_set_root (reader, json_parser_get_root (parser));
+
   g_assert (json_reader_is_object (reader));
   g_assert_cmpint (json_reader_count_members (reader), ==, 3);
 
@@ -37,17 +40,21 @@ test_base_object (void)
   g_assert (json_reader_get_error (reader) == NULL);
 
   g_object_unref (reader);
+  g_object_unref (parser);
 }
 
 static void
 test_base_array (void)
 {
+  JsonParser *parser = json_parser_new ();
   JsonReader *reader = json_reader_new ();
   GError *error = NULL;
 
-  json_reader_load_from_data (reader, test_base_array_data, -1, &error);
+  json_parser_load_from_data (parser, test_base_array_data, -1, &error);
   g_assert (error == NULL);
 
+  json_reader_set_root (reader, json_parser_get_root (parser));
+
   g_assert (json_reader_is_array (reader));
   g_assert_cmpint (json_reader_count_elements (reader), ==, 7);