From ad7e36a6ba35d46128f1bc8d74fa1ad4c979e5ea Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 26 Dec 2018 19:25:51 -0500 Subject: Hide fopen wrapper and use reader interface consistently --- tests/serd_test.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/serd_test.c b/tests/serd_test.c index 5d5633b3..ffca3c49 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -533,8 +533,8 @@ main(void) // Rewind and test reader fseek(fd, 0, SEEK_SET); - 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); @@ -544,20 +544,18 @@ main(void) 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); fclose(fd); serd_env_free(env); -- cgit v1.2.1