From c452f0c1051186b920fdbf9a1ee2d5ad159ebb68 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 15 Jun 2018 15:15:55 -0400 Subject: Make SerdSink opaque --- tests/serd_test.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/serd_test.c b/tests/serd_test.c index c68d2813..569b16a6 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -582,12 +582,12 @@ main(void) serd_writer_chop_blank_prefix(writer, NULL); const SerdSink* iface = serd_writer_get_sink(writer); - if (!iface->base(iface->handle, lit)) { + if (!serd_sink_set_base(iface, lit)) { FAILF("Set base URI to %s\n", serd_node_get_string(lit)); - } else if (!iface->prefix(iface->handle, lit, lit)) { + } else if (!serd_sink_set_prefix(iface, lit, lit)) { FAILF("Set prefix %s to %s\n", serd_node_get_string(lit), serd_node_get_string(lit)); - } else if (!iface->end(iface->handle, NULL)) { + } else if (!serd_sink_end(iface, NULL)) { FAIL("Ended non-existent anonymous node\n"); } else if (serd_writer_get_env(writer) != env) { FAIL("Writer has incorrect env\n"); @@ -688,9 +688,11 @@ main(void) // Rewind and test reader fseek(fd, 0, SEEK_SET); - ReaderTest rt = { 0, NULL }; - SerdSink sink = { &rt, NULL, NULL, test_sink, NULL }; - SerdReader* reader = serd_reader_new(world, SERD_TURTLE, &sink, 4096); + ReaderTest rt = { 0, NULL }; + SerdSink* sink = serd_sink_new(&rt); + serd_sink_set_statement_func(sink, test_sink); + + SerdReader* reader = serd_reader_new(world, SERD_TURTLE, sink, 4096); if (!reader) { FAIL("Failed to create reader\n"); } @@ -722,6 +724,7 @@ main(void) serd_reader_finish(reader); serd_reader_free(reader); + serd_sink_free(sink); fclose(fd); serd_env_free(env); -- cgit v1.2.1