aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_model.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_model.c')
-rw-r--r--test/test_model.c62
1 files changed, 35 insertions, 27 deletions
diff --git a/test/test_model.c b/test/test_model.c
index acefe05f..78372997 100644
--- a/test/test_model.c
+++ b/test/test_model.c
@@ -1052,10 +1052,12 @@ test_write_flat_range(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, s, p, b2, NULL);
serd_model_add(model, b2, p, o, NULL);
- SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
- SerdByteSink* out = serd_byte_sink_new_buffer(&buffer);
- SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
+ SerdBuffer buffer = {NULL, 0};
+ SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdOutputStream out = serd_open_output_buffer(&buffer);
+
+ SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
+ assert(writer);
SerdCursor* all = serd_model_begin(model);
for (const SerdStatement* t = NULL; (t = serd_cursor_get(all));
@@ -1065,7 +1067,7 @@ test_write_flat_range(SerdWorld* world, const unsigned n_quads)
serd_cursor_free(all);
serd_writer_finish(writer);
- serd_byte_sink_close(out);
+ serd_close_output(&out);
const char* const str = (const char*)buffer.buf;
static const char* const expected = "<urn:s>\n"
@@ -1078,11 +1080,11 @@ test_write_flat_range(SerdWorld* world, const unsigned n_quads)
"_:b2\n"
"\t<urn:p> <urn:o> .\n";
+ assert(str);
assert(!strcmp(str, expected));
- free(buffer.buf);
+ serd_free(buffer.buf);
serd_writer_free(writer);
- serd_byte_sink_free(out);
serd_model_free(model);
serd_env_free(env);
serd_nodes_free(nodes);
@@ -1121,17 +1123,19 @@ test_write_bad_list(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, list2, prest, norest, NULL);
serd_model_add(model, norest, pfirst, val2, NULL);
- SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
- SerdByteSink* out = serd_byte_sink_new_buffer(&buffer);
- SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
+ SerdBuffer buffer = {NULL, 0};
+ SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdOutputStream out = serd_open_output_buffer(&buffer);
+
+ SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
+ assert(writer);
SerdCursor* all = serd_model_begin(model);
serd_describe_range(all, serd_writer_sink(writer), 0);
serd_cursor_free(all);
serd_writer_finish(writer);
- serd_byte_sink_close(out);
+ serd_close_output(&out);
const char* str = (const char*)buffer.buf;
const char* expected = "<urn:s>\n"
@@ -1142,11 +1146,12 @@ test_write_bad_list(SerdWorld* world, const unsigned n_quads)
" \"b\"\n"
" ) .\n";
+ assert(str);
assert(!strcmp(str, expected));
free(buffer.buf);
serd_writer_free(writer);
- serd_byte_sink_free(out);
+ serd_close_output(&out);
serd_model_free(model);
serd_env_free(env);
serd_nodes_free(nodes);
@@ -1180,10 +1185,12 @@ test_write_infinite_list(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, list2, pfirst, val2, NULL);
serd_model_add(model, list2, prest, list1, NULL);
- SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
- SerdByteSink* out = serd_byte_sink_new_buffer(&buffer);
- SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
+ SerdBuffer buffer = {NULL, 0};
+ SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdOutputStream out = serd_open_output_buffer(&buffer);
+
+ SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
+ assert(writer);
serd_env_set_prefix(
env,
@@ -1195,7 +1202,7 @@ test_write_infinite_list(SerdWorld* world, const unsigned n_quads)
serd_cursor_free(all);
serd_writer_finish(writer);
- serd_byte_sink_close(out);
+ serd_close_output(&out);
const char* str = (const char*)buffer.buf;
const char* expected = "<urn:s>\n"
" <urn:p> _:l1 .\n"
@@ -1207,11 +1214,12 @@ test_write_infinite_list(SerdWorld* world, const unsigned n_quads)
" rdf:rest _:l1\n"
" ] .\n";
+ assert(str);
assert(!strcmp(str, expected));
free(buffer.buf);
serd_writer_free(writer);
- serd_byte_sink_free(out);
+ serd_close_output(&out);
serd_model_free(model);
serd_env_free(env);
serd_nodes_free(nodes);
@@ -1272,10 +1280,10 @@ test_write_error_in_list_subject(SerdWorld* world, const unsigned n_quads)
for (size_t max_successes = 0; max_successes < 18; ++max_successes) {
FailingWriteFuncState state = {0, max_successes};
- SerdByteSink* out =
- serd_byte_sink_new_function(failing_write_func, NULL, &state, 1);
+ SerdOutputStream out =
+ serd_open_output_stream(failing_write_func, NULL, &state);
- SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
+ SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
const SerdSink* const sink = serd_writer_sink(writer);
SerdCursor* const all = serd_model_begin(model);
@@ -1285,7 +1293,7 @@ test_write_error_in_list_subject(SerdWorld* world, const unsigned n_quads)
assert(st == SERD_ERR_BAD_WRITE);
serd_writer_free(writer);
- serd_byte_sink_free(out);
+ serd_close_output(&out);
}
serd_env_free(env);
@@ -1328,10 +1336,10 @@ test_write_error_in_list_object(SerdWorld* world, const unsigned n_quads)
for (size_t max_successes = 0; max_successes < 21; ++max_successes) {
FailingWriteFuncState state = {0, max_successes};
- SerdByteSink* out =
- serd_byte_sink_new_function(failing_write_func, NULL, &state, 1);
+ SerdOutputStream out =
+ serd_open_output_stream(failing_write_func, NULL, &state);
- SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, out);
+ SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
const SerdSink* const sink = serd_writer_sink(writer);
SerdCursor* const all = serd_model_begin(model);
@@ -1341,7 +1349,7 @@ test_write_error_in_list_object(SerdWorld* world, const unsigned n_quads)
assert(st == SERD_ERR_BAD_WRITE);
serd_writer_free(writer);
- serd_byte_sink_free(out);
+ serd_close_output(&out);
}
serd_env_free(env);
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-01 00:33:07 +0000