Hide fopen wrapper and use reader interface consistently

1 files changed, 11 insertions, 13 deletions

diff --git a/tests/serd_test.c b/tests/serd_test.c
index 76ba1966..be4afe19 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -659,8 +659,8 @@ static void
 test_reader(const char* path)
 {
 	SerdWorld*  world  = serd_world_new();
-	ReaderTest* rt     = (ReaderTest*)calloc(1, sizeof(ReaderTest));
-	SerdSink    sink   = { rt, NULL, NULL, test_sink, NULL };
+	ReaderTest  rt     = { 0, NULL };
+	SerdSink    sink   = { &rt, NULL, NULL, test_sink, NULL };
 	SerdReader* reader = serd_reader_new(world, SERD_TURTLE, &sink);
 	assert(reader);
 
@@ -670,20 +670,18 @@ test_reader(const char* path)
 	serd_reader_add_blank_prefix(reader, NULL);
 	serd_node_free(g);
 
-	assert(serd_reader_read_file(reader, "http://notafile"));
-	assert(serd_reader_read_file(reader, "file:///better/not/exist"));
-	assert(serd_reader_read_file(reader, "file://"));
+	assert(serd_reader_start_file(reader, "http://notafile", false));
+	assert(serd_reader_start_file(reader, "file://invalid", false));
+	assert(serd_reader_start_file(reader, "file:///nonexistant", false));
 
-	const SerdStatus st = serd_reader_read_file(reader, path);
-	assert(!st);
-	assert(rt->n_statements == 13);
-	assert(rt->graph && serd_node_get_string(rt->graph) &&
-	       !strcmp(serd_node_get_string(rt->graph), "http://example.org/"));
-
-	assert(serd_reader_read_string(reader, "This isn't Turtle at all."));
+	assert(!serd_reader_start_file(reader, path, true));
+	assert(!serd_reader_read_document(reader));
+	assert(rt.n_statements == 13);
+	assert(rt.graph && serd_node_get_string(rt.graph) &&
+	       !strcmp(serd_node_get_string(rt.graph), "http://example.org/"));
+	serd_reader_finish(reader);
 
 	serd_reader_free(reader);
-	free(rt);
 	serd_world_free(world);
 }