From 2019d1581c1296cc534c731a1f454ce08b460dcc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 10 Jul 2021 22:22:09 -0400 Subject: Use SerdNodes to simplify some tests --- test/test_terse_write.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) (limited to 'test/test_terse_write.c') diff --git a/test/test_terse_write.c b/test/test_terse_write.c index 3fa08fbd..2a516c04 100644 --- a/test/test_terse_write.c +++ b/test/test_terse_write.c @@ -7,6 +7,7 @@ #include "serd/env.h" #include "serd/memory.h" #include "serd/node.h" +#include "serd/nodes.h" #include "serd/output_stream.h" #include "serd/sink.h" #include "serd/statement.h" @@ -39,20 +40,29 @@ check_output(SerdWriter* writer, SerdBuffer* buffer, const char* expected) static int test(void) { - SerdBuffer buffer = {NULL, NULL, 0}; - SerdWorld* world = serd_world_new(NULL); - SerdEnv* env = serd_env_new(NULL, serd_empty_string()); + SerdWorld* world = serd_world_new(NULL); + SerdAllocator* alloc = serd_world_allocator(world); + SerdBuffer buffer = {NULL, NULL, 0}; + SerdEnv* env = serd_env_new(alloc, serd_empty_string()); + SerdNodes* nodes = serd_nodes_new(alloc); - SerdNode* b1 = serd_node_new(NULL, serd_a_blank_string("b1")); - SerdNode* l1 = serd_node_new(NULL, serd_a_blank_string("l1")); - SerdNode* l2 = serd_node_new(NULL, serd_a_blank_string("l2")); - SerdNode* s1 = serd_node_new(NULL, serd_a_string("s1")); - SerdNode* s2 = serd_node_new(NULL, serd_a_string("s2")); + const SerdNode* b1 = serd_nodes_get(nodes, serd_a_blank_string("b1")); + const SerdNode* l1 = serd_nodes_get(nodes, serd_a_blank_string("l1")); + const SerdNode* l2 = serd_nodes_get(nodes, serd_a_blank_string("l2")); + const SerdNode* s1 = serd_nodes_get(nodes, serd_a_string("s1")); + const SerdNode* s2 = serd_nodes_get(nodes, serd_a_string("s2")); - SerdNode* rdf_first = serd_node_new(NULL, serd_a_uri_string(NS_RDF "first")); - SerdNode* rdf_value = serd_node_new(NULL, serd_a_uri_string(NS_RDF "value")); - SerdNode* rdf_rest = serd_node_new(NULL, serd_a_uri_string(NS_RDF "rest")); - SerdNode* rdf_nil = serd_node_new(NULL, serd_a_uri_string(NS_RDF "nil")); + const SerdNode* rdf_first = + serd_nodes_get(nodes, serd_a_uri_string(NS_RDF "first")); + + const SerdNode* rdf_value = + serd_nodes_get(nodes, serd_a_uri_string(NS_RDF "value")); + + const SerdNode* rdf_rest = + serd_nodes_get(nodes, serd_a_uri_string(NS_RDF "rest")); + + const SerdNode* rdf_nil = + serd_nodes_get(nodes, serd_a_uri_string(NS_RDF "nil")); serd_env_set_prefix(env, serd_string("rdf"), serd_string(NS_RDF)); @@ -91,17 +101,9 @@ test(void) check_output(writer, &buffer, "[] rdf:value ( \"s1\" \"s2\" ) .\n"); serd_writer_free(writer); - serd_node_free(NULL, rdf_nil); - serd_node_free(NULL, rdf_rest); - serd_node_free(NULL, rdf_value); - serd_node_free(NULL, rdf_first); - serd_node_free(NULL, s2); - serd_node_free(NULL, s1); - serd_node_free(NULL, l2); - serd_node_free(NULL, l1); - serd_node_free(NULL, b1); serd_close_output(&output); serd_free(NULL, buffer.buf); + serd_nodes_free(nodes); serd_env_free(env); serd_world_free(world); -- cgit v1.2.1