From 897590f6408b9b2b1aae2a060465da6d0faf42be Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 3 Jun 2018 19:47:07 +0200 Subject: Make statement sink take a statement rather than nodes This makes the interface more extensible, towards associating more information with statements. The serd_sink_write_nodes wrapper remains so that user code does not need to allocate in order to write statement. --- tests/read_chunk_test.c | 14 ++++---------- tests/serd_test.c | 31 ++++++++++++------------------- 2 files changed, 16 insertions(+), 29 deletions(-) (limited to 'tests') diff --git a/tests/read_chunk_test.c b/tests/read_chunk_test.c index 9fa40bab..7abd865f 100644 --- a/tests/read_chunk_test.c +++ b/tests/read_chunk_test.c @@ -48,19 +48,13 @@ on_prefix(void* handle, const SerdNode* name, const SerdNode* uri) } static SerdStatus -on_statement(void* handle, - SerdStatementFlags flags, - const SerdNode* graph, - const SerdNode* subject, - const SerdNode* predicate, - const SerdNode* object) +on_statement(void* handle, + SerdStatementFlags flags, + const SerdStatement* statement) { (void)handle; (void)flags; - (void)graph; - (void)subject; - (void)predicate; - (void)object; + (void)statement; ++n_statement; return SERD_SUCCESS; diff --git a/tests/serd_test.c b/tests/serd_test.c index 859ba088..2f0a3b07 100644 --- a/tests/serd_test.c +++ b/tests/serd_test.c @@ -56,21 +56,16 @@ typedef struct { } ReaderTest; static SerdStatus -test_sink(void* handle, - SerdStatementFlags flags, - const SerdNode* graph, - const SerdNode* subject, - const SerdNode* predicate, - const SerdNode* object) +test_sink(void* handle, + SerdStatementFlags flags, + const SerdStatement* statement) { (void)flags; - (void)subject; - (void)predicate; - (void)object; + (void)statement; ReaderTest* rt = (ReaderTest*)handle; ++rt->n_statements; - rt->graph = graph; + rt->graph = serd_statement_graph(statement); return SERD_SUCCESS; } @@ -615,9 +610,8 @@ test_writer(const char* const path) { s, p, NULL }, { NULL, NULL, NULL } }; for (size_t i = 0; i < sizeof(junk) / (sizeof(SerdNode*) * 5); ++i) { - assert(iface->statement( - iface->handle, 0, NULL, - junk[i][0], junk[i][1], junk[i][2])); + assert(serd_sink_write( + iface, 0, junk[i][0], junk[i][1], junk[i][2], 0)); } SerdNode* urn_Type = serd_node_new_uri("urn:Type"); @@ -635,24 +629,23 @@ test_writer(const char* const path) { s, p, o }, { s, p, o } }; for (size_t i = 0; i < sizeof(good) / (sizeof(SerdNode*) * 5); ++i) { - assert(!iface->statement( - iface->handle, 0, NULL, good[i][0], good[i][1], good[i][2])); + assert(!serd_sink_write( + iface, 0, good[i][0], good[i][1], good[i][2], 0)); } // Write statements with bad UTF-8 (should be replaced) const char bad_str[] = { (char)0xFF, (char)0x90, 'h', 'i', 0 }; SerdNode* bad_lit = serd_node_new_string(bad_str); SerdNode* bad_uri = serd_node_new_uri(bad_str); - assert(!iface->statement(iface->handle, 0, NULL, s, p, bad_lit)); - assert(!iface->statement(iface->handle, 0, NULL, s, p, bad_uri)); - + assert(!serd_sink_write(iface, 0, s, p, bad_lit, 0)); + assert(!serd_sink_write(iface, 0, s, p, bad_uri, 0)); serd_node_free(bad_uri); serd_node_free(bad_lit); // Write 1 valid statement serd_node_free(o); o = serd_node_new_string("hello"); - assert(!iface->statement(iface->handle, 0, NULL, s, p, o)); + assert(!serd_sink_write(iface, 0, s, p, o, 0)); serd_writer_free(writer); serd_node_free(lit); -- cgit v1.2.1