aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_env.c80
-rw-r--r--test/test_model.c10
-rw-r--r--test/test_node_syntax.c156
-rw-r--r--test/test_overflow.c4
-rw-r--r--test/test_read_chunk.c4
-rw-r--r--test/test_reader.c33
-rw-r--r--test/test_reader_writer.c17
-rw-r--r--test/test_sink.c14
-rw-r--r--test/test_terse_write.c2
-rw-r--r--test/test_writer.c18
10 files changed, 206 insertions, 132 deletions
diff --git a/test/test_env.c b/test/test_env.c
index 3b6e20c9..e2d53f6c 100644
--- a/test/test_env.c
+++ b/test/test_env.c
@@ -28,7 +28,10 @@ test_copy(void)
{
assert(!serd_env_copy(NULL));
- SerdEnv* const env = serd_env_new(SERD_STRING("http://example.org/base/"));
+ SerdWorld* const world = serd_world_new();
+
+ SerdEnv* const env =
+ serd_env_new(world, SERD_STRING("http://example.org/base/"));
serd_env_set_prefix(
env, SERD_STRING("eg"), SERD_STRING("http://example.org/"));
@@ -49,12 +52,14 @@ test_copy(void)
serd_env_free(env_copy);
serd_env_free(env);
+ serd_world_free(world);
}
static void
test_comparison(void)
{
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_equals(env, NULL));
assert(!serd_env_equals(NULL, env));
@@ -62,6 +67,7 @@ test_comparison(void)
assert(serd_env_equals(env, env));
serd_env_free(env);
+ serd_world_free(world);
}
static void
@@ -89,8 +95,9 @@ count_prefixes(void* handle, const SerdEvent* event)
static void
test_base_uri(void)
{
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
- SerdNode* const eg = serd_new_uri(SERD_STRING(NS_EG));
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
+ SerdNode* const eg = serd_new_uri(SERD_STRING(NS_EG));
// Test that invalid calls work as expected
assert(!serd_env_base_uri(env));
@@ -109,8 +116,9 @@ test_base_uri(void)
assert(!serd_env_set_base_uri(env, SERD_EMPTY_STRING()));
assert(!serd_env_base_uri(env));
- serd_env_free(env);
serd_node_free(eg);
+ serd_env_free(env);
+ serd_world_free(world);
}
static void
@@ -122,7 +130,8 @@ test_set_prefix(void)
static const SerdStringView rel = SERD_STRING("rel");
static const SerdStringView base = SERD_STRING("http://example.org/");
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
// Set a valid prefix
assert(!serd_env_set_prefix(env, name1, eg));
@@ -138,25 +147,28 @@ test_set_prefix(void)
size_t n_prefixes = 0;
SerdSink* const count_prefixes_sink =
- serd_sink_new(&n_prefixes, count_prefixes, NULL);
+ serd_sink_new(world, &n_prefixes, count_prefixes, NULL);
serd_env_write_prefixes(env, count_prefixes_sink);
serd_sink_free(count_prefixes_sink);
assert(n_prefixes == 3);
serd_env_free(env);
+ serd_world_free(world);
}
static void
test_expand_untyped_literal(void)
{
- SerdNode* const untyped = serd_new_string(SERD_STRING("data"));
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdNode* const untyped = serd_new_string(SERD_STRING("data"));
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_expand_node(env, untyped));
serd_env_free(env);
serd_node_free(untyped);
+ serd_world_free(world);
}
static void
@@ -164,17 +176,19 @@ test_expand_bad_uri_datatype(void)
{
static const SerdStringView type = SERD_STRING("Type");
+ SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_nodes_new();
const SerdNode* const typed =
serd_nodes_literal(nodes, SERD_STRING("data"), SERD_HAS_DATATYPE, type);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_expand_node(env, typed));
serd_env_free(env);
serd_nodes_free(nodes);
+ serd_world_free(world);
}
static void
@@ -182,11 +196,12 @@ test_expand_uri(void)
{
static const SerdStringView base = SERD_STRING("http://example.org/b/");
- SerdEnv* const env = serd_env_new(base);
- SerdNode* const rel = serd_new_uri(SERD_STRING("rel"));
- SerdNode* const rel_out = serd_env_expand_node(env, rel);
- SerdNode* const empty = serd_new_uri(SERD_EMPTY_STRING());
- SerdNode* const empty_out = serd_env_expand_node(env, empty);
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, base);
+ SerdNode* const rel = serd_new_uri(SERD_STRING("rel"));
+ SerdNode* const rel_out = serd_env_expand_node(env, rel);
+ SerdNode* const empty = serd_new_uri(SERD_EMPTY_STRING());
+ SerdNode* const empty_out = serd_env_expand_node(env, empty);
assert(!strcmp(serd_node_string(rel_out), "http://example.org/b/rel"));
assert(!strcmp(serd_node_string(empty_out), "http://example.org/b/"));
@@ -196,6 +211,7 @@ test_expand_uri(void)
serd_node_free(rel_out);
serd_node_free(rel);
serd_env_free(env);
+ serd_world_free(world);
}
static void
@@ -203,27 +219,31 @@ test_expand_empty_uri_ref(void)
{
static const SerdStringView base = SERD_STRING("http://example.org/b/");
- SerdNode* const rel = serd_new_uri(SERD_STRING("rel"));
- SerdEnv* const env = serd_env_new(base);
- SerdNode* const rel_out = serd_env_expand_node(env, rel);
+ SerdWorld* const world = serd_world_new();
+ SerdNode* const rel = serd_new_uri(SERD_STRING("rel"));
+ SerdEnv* const env = serd_env_new(world, base);
+ SerdNode* const rel_out = serd_env_expand_node(env, rel);
assert(!strcmp(serd_node_string(rel_out), "http://example.org/b/rel"));
serd_node_free(rel_out);
serd_env_free(env);
serd_node_free(rel);
+ serd_world_free(world);
}
static void
test_expand_bad_uri(void)
{
- SerdNode* const bad_uri = serd_new_uri(SERD_STRING("rel"));
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdNode* const bad_uri = serd_new_uri(SERD_STRING("rel"));
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_expand_node(env, bad_uri));
serd_env_free(env);
serd_node_free(bad_uri);
+ serd_world_free(world);
}
static void
@@ -232,7 +252,8 @@ test_expand_curie(void)
static const SerdStringView name = SERD_STRING("eg.1");
static const SerdStringView eg = SERD_STRING(NS_EG);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_set_prefix(env, name, eg));
@@ -244,12 +265,14 @@ test_expand_curie(void)
serd_node_free(expanded);
serd_env_free(env);
+ serd_world_free(world);
}
static void
test_expand_bad_curie(void)
{
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_expand_curie(NULL, SERD_EMPTY_STRING()));
assert(!serd_env_expand_curie(NULL, SERD_STRING("what:ever")));
@@ -257,18 +280,21 @@ test_expand_bad_curie(void)
assert(!serd_env_expand_curie(env, SERD_STRING("nocolon")));
serd_env_free(env);
+ serd_world_free(world);
}
static void
test_expand_blank(void)
{
- SerdNode* const blank = serd_new_token(SERD_BLANK, SERD_STRING("b1"));
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdWorld* const world = serd_world_new();
+ SerdNode* const blank = serd_new_token(SERD_BLANK, SERD_STRING("b1"));
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(!serd_env_expand_node(env, blank));
serd_env_free(env);
serd_node_free(blank);
+ serd_world_free(world);
}
static void
@@ -278,8 +304,9 @@ test_equals(void)
static const SerdStringView base1 = SERD_STRING(NS_EG "b1/");
static const SerdStringView base2 = SERD_STRING(NS_EG "b2/");
- SerdEnv* const env1 = serd_env_new(base1);
- SerdEnv* const env2 = serd_env_new(base2);
+ SerdWorld* const world = serd_world_new();
+ SerdEnv* const env1 = serd_env_new(world, base1);
+ SerdEnv* const env2 = serd_env_new(world, base2);
assert(!serd_env_equals(env1, NULL));
assert(!serd_env_equals(NULL, env1));
@@ -305,6 +332,7 @@ test_equals(void)
serd_env_free(env1);
serd_env_free(env2);
+ serd_world_free(world);
}
int
diff --git a/test/test_model.c b/test/test_model.c
index a64a7b7e..72db88ae 100644
--- a/test/test_model.c
+++ b/test/test_model.c
@@ -1053,7 +1053,7 @@ test_write_flat_range(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, b2, p, o, NULL);
SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdOutputStream out = serd_open_output_buffer(&buffer);
SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
@@ -1124,7 +1124,7 @@ test_write_bad_list(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, norest, pfirst, val2, NULL);
SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdOutputStream out = serd_open_output_buffer(&buffer);
SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
@@ -1186,7 +1186,7 @@ test_write_infinite_list(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, list2, prest, list1, NULL);
SerdBuffer buffer = {NULL, 0};
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdOutputStream out = serd_open_output_buffer(&buffer);
SerdWriter* writer = serd_writer_new(world, SERD_TURTLE, 0, env, &out, 1);
@@ -1276,7 +1276,7 @@ test_write_error_in_list_subject(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, l2, rdf_rest, rdf_nil, NULL);
serd_model_add(model, l1, p, o, NULL);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
for (size_t max_successes = 0; max_successes < 18; ++max_successes) {
FailingWriteFuncState state = {0, max_successes};
@@ -1332,7 +1332,7 @@ test_write_error_in_list_object(SerdWorld* world, const unsigned n_quads)
serd_model_add(model, l2, rdf_first, two, NULL);
serd_model_add(model, l2, rdf_rest, rdf_nil, NULL);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
for (size_t max_successes = 0; max_successes < 21; ++max_successes) {
FailingWriteFuncState state = {0, max_successes};
diff --git a/test/test_node_syntax.c b/test/test_node_syntax.c
index 9875e656..d9b0afbb 100644
--- a/test/test_node_syntax.c
+++ b/test/test_node_syntax.c
@@ -20,13 +20,17 @@
#include <assert.h>
#include <stdbool.h>
-#include <stdio.h>
#include <string.h>
static bool
-test(const SerdSyntax syntax, SerdNode* const node, const char* const expected)
+check(SerdWorld* const world,
+ const SerdSyntax syntax,
+ SerdNode* const node,
+ const char* const expected)
{
- SerdEnv* const env = serd_env_new(SERD_STRING("http://example.org/base/"));
+ SerdEnv* const env =
+ serd_env_new(world, SERD_STRING("http://example.org/base/"));
+
char* const str = serd_node_to_syntax(node, syntax, env);
SerdNode* const copy = serd_node_from_syntax(str, syntax, env);
@@ -40,7 +44,7 @@ test(const SerdSyntax syntax, SerdNode* const node, const char* const expected)
}
static void
-test_common(const SerdSyntax syntax)
+test_common(SerdWorld* const world, const SerdSyntax syntax)
{
static const int data[] = {4, 2};
@@ -50,51 +54,66 @@ test_common(const SerdSyntax syntax)
static const SerdStringView num_type =
SERD_STRING("http://example.org/Decimal");
- assert(test(syntax, serd_new_string(SERD_STRING("node")), "\"node\""));
-
- assert(test(syntax,
- serd_new_literal(
- SERD_STRING("hallo"), SERD_HAS_LANGUAGE, SERD_STRING("de")),
- "\"hallo\"@de"));
-
- assert(test(syntax,
- serd_new_literal(SERD_STRING("X"), SERD_HAS_DATATYPE, datatype),
- "\"X\"^^<http://example.org/Datatype>"));
-
assert(
- test(syntax, serd_new_token(SERD_BLANK, SERD_STRING("blank")), "_:blank"));
-
- assert(test(syntax, serd_new_token(SERD_BLANK, SERD_STRING("b0")), "_:b0"));
-
- assert(test(
- syntax, serd_new_token(SERD_BLANK, SERD_STRING("named1")), "_:named1"));
-
- assert(test(syntax,
- serd_new_uri(SERD_STRING("http://example.org/")),
- "<http://example.org/>"));
-
- assert(test(syntax,
- serd_new_double(1.25),
- "\"1.25E0\"^^<http://www.w3.org/2001/XMLSchema#double>"));
-
- assert(test(syntax,
- serd_new_float(1.25),
- "\"1.25E0\"^^<http://www.w3.org/2001/XMLSchema#float>"));
-
- assert(test(syntax,
- serd_new_integer(1234, num_type),
- "\"1234\"^^<http://example.org/Decimal>"));
+ check(world, syntax, serd_new_string(SERD_STRING("node")), "\"node\""));
+
+ assert(check(world,
+ syntax,
+ serd_new_literal(
+ SERD_STRING("hallo"), SERD_HAS_LANGUAGE, SERD_STRING("de")),
+ "\"hallo\"@de"));
+
+ assert(check(world,
+ syntax,
+ serd_new_literal(SERD_STRING("X"), SERD_HAS_DATATYPE, datatype),
+ "\"X\"^^<http://example.org/Datatype>"));
+
+ assert(check(world,
+ syntax,
+ serd_new_token(SERD_BLANK, SERD_STRING("blank")),
+ "_:blank"));
+
+ assert(check(
+ world, syntax, serd_new_token(SERD_BLANK, SERD_STRING("b0")), "_:b0"));
+
+ assert(check(world,
+ syntax,
+ serd_new_token(SERD_BLANK, SERD_STRING("named1")),
+ "_:named1"));
+
+ assert(check(world,
+ syntax,
+ serd_new_uri(SERD_STRING("http://example.org/")),
+ "<http://example.org/>"));
+
+ assert(check(world,
+ syntax,
+ serd_new_double(1.25),
+ "\"1.25E0\"^^<http://www.w3.org/2001/XMLSchema#double>"));
+
+ assert(check(world,
+ syntax,
+ serd_new_float(1.25),
+ "\"1.25E0\"^^<http://www.w3.org/2001/XMLSchema#float>"));
+
+ assert(check(world,
+ syntax,
+ serd_new_integer(1234, num_type),
+ "\"1234\"^^<http://example.org/Decimal>"));
assert(
- test(syntax,
- serd_new_base64(data, sizeof(data), SERD_EMPTY_STRING()),
- "\"BAAAAAIAAAA=\"^^<http://www.w3.org/2001/XMLSchema#base64Binary>"));
+ check(world,
+ syntax,
+ serd_new_base64(data, sizeof(data), SERD_EMPTY_STRING()),
+ "\"BAAAAAIAAAA=\"^^<http://www.w3.org/2001/XMLSchema#base64Binary>"));
}
static void
test_ntriples(void)
{
- test_common(SERD_NTRIPLES);
+ SerdWorld* const world = serd_world_new();
+
+ test_common(world, SERD_NTRIPLES);
{
// No relative URIs in NTriples, so converting one fails without an env
@@ -103,11 +122,13 @@ test_ntriples(void)
assert(!serd_node_from_syntax("<rel/uri>", SERD_NTRIPLES, NULL));
// If a relative URI can be expanded then all's well
- SerdEnv* const env = serd_env_new(SERD_STRING("http://example.org/base/"));
- char* const str = serd_node_to_syntax(rel, SERD_NTRIPLES, env);
+ SerdEnv* const env =
+ serd_env_new(world, SERD_STRING("http://example.org/base/"));
+ char* const str = serd_node_to_syntax(rel, SERD_NTRIPLES, env);
assert(!strcmp(str, "<http://example.org/base/rel/uri>"));
SerdNode* const copy = serd_node_from_syntax(str, SERD_NTRIPLES, env);
+
assert(!strcmp(serd_node_string(copy), "http://example.org/base/rel/uri"));
serd_node_free(copy);
@@ -116,21 +137,27 @@ test_ntriples(void)
serd_node_free(rel);
}
- assert(test(SERD_NTRIPLES,
- serd_new_decimal(1.25),
- "\"1.25\"^^<http://www.w3.org/2001/XMLSchema#decimal>"));
+ assert(check(world,
+ SERD_NTRIPLES,
+ serd_new_decimal(1.25),
+ "\"1.25\"^^<http://www.w3.org/2001/XMLSchema#decimal>"));
- assert(test(SERD_NTRIPLES,
- serd_new_integer(1234, SERD_EMPTY_STRING()),
- "\"1234\"^^<http://www.w3.org/2001/XMLSchema#integer>"));
+ assert(check(world,
+ SERD_NTRIPLES,
+ serd_new_integer(1234, SERD_EMPTY_STRING()),
+ "\"1234\"^^<http://www.w3.org/2001/XMLSchema#integer>"));
- assert(test(SERD_NTRIPLES,
- serd_new_boolean(true),
- "\"true\"^^<http://www.w3.org/2001/XMLSchema#boolean>"));
+ assert(check(world,
+ SERD_NTRIPLES,
+ serd_new_boolean(true),
+ "\"true\"^^<http://www.w3.org/2001/XMLSchema#boolean>"));
- assert(test(SERD_NTRIPLES,
- serd_new_boolean(false),
- "\"false\"^^<http://www.w3.org/2001/XMLSchema#boolean>"));
+ assert(check(world,
+ SERD_NTRIPLES,
+ serd_new_boolean(false),
+ "\"false\"^^<http://www.w3.org/2001/XMLSchema#boolean>"));
+
+ serd_world_free(world);
}
static void
@@ -139,19 +166,24 @@ test_turtle(void)
static const SerdStringView xsd_integer =
SERD_STRING("http://www.w3.org/2001/XMLSchema#integer");
- test_common(SERD_TURTLE);
+ SerdWorld* const world = serd_world_new();
+
+ test_common(world, SERD_TURTLE);
+
+ check(world, SERD_TURTLE, serd_new_uri(SERD_STRING("rel/uri")), "<rel/uri>");
- test(SERD_TURTLE, serd_new_uri(SERD_STRING("rel/uri")), "<rel/uri>");
+ assert(check(world, SERD_TURTLE, serd_new_decimal(1.25), "1.25"));
- assert(test(SERD_TURTLE, serd_new_decimal(1.25), "1.25"));
+ assert(check(
+ world, SERD_TURTLE, serd_new_integer(1234, SERD_EMPTY_STRING()), "1234"));
assert(
- test(SERD_TURTLE, serd_new_integer(1234, SERD_EMPTY_STRING()), "1234"));
+ check(world, SERD_TURTLE, serd_new_integer(1234, xsd_integer), "1234"));
- assert(test(SERD_TURTLE, serd_new_integer(1234, xsd_integer), "1234"));
+ assert(check(world, SERD_TURTLE, serd_new_boolean(true), "true"));
+ assert(check(world, SERD_TURTLE, serd_new_boolean(false), "false"));
- assert(test(SERD_TURTLE, serd_new_boolean(true), "true"));
- assert(test(SERD_TURTLE, serd_new_boolean(false), "false"));
+ serd_world_free(world);
}
int
diff --git a/test/test_overflow.c b/test/test_overflow.c
index 2aedc1bb..f7fdfa58 100644
--- a/test/test_overflow.c
+++ b/test/test_overflow.c
@@ -31,8 +31,8 @@ test_size(SerdWorld* const world,
const SerdReaderFlags flags,
const size_t stack_size)
{
- SerdSink* sink = serd_sink_new(NULL, NULL, NULL);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdSink* sink = serd_sink_new(world, NULL, NULL, NULL);
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, syntax, flags, env, sink, stack_size);
diff --git a/test/test_read_chunk.c b/test/test_read_chunk.c
index a956a07d..59f99910 100644
--- a/test/test_read_chunk.c
+++ b/test/test_read_chunk.c
@@ -92,7 +92,7 @@ int
main(void)
{
SerdWorld* world = serd_world_new();
- SerdSink* sink = serd_sink_new(NULL, on_event, NULL);
+ SerdSink* sink = serd_sink_new(world, NULL, on_event, NULL);
static const char* const string = "@prefix eg: <http://example.org/> .\n"
"@base <http://example.org/base> .\n"
@@ -104,7 +104,7 @@ main(void)
"eg:s3 eg:p1 eg:o1 .\n"
"eg:s4 eg:p1 [ eg:p3 eg:o1 ] .\n";
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* reader = serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
assert(reader);
diff --git a/test/test_reader.c b/test/test_reader.c
index d9edc294..80d9533b 100644
--- a/test/test_reader.c
+++ b/test/test_reader.c
@@ -62,10 +62,12 @@ test_prepare_error(void)
size_t n_statements = 0;
FILE* const f = tmpfile();
- SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+ SerdSink* const sink =
+ serd_sink_new(world, &n_statements, count_statements, NULL);
+
assert(sink);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
@@ -94,10 +96,10 @@ test_read_string(void)
SerdWorld* world = serd_world_new();
size_t n_statements = 0;
- SerdSink* sink = serd_sink_new(&n_statements, count_statements, NULL);
+ SerdSink* sink = serd_sink_new(world, &n_statements, count_statements, NULL);
assert(sink);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
@@ -196,8 +198,8 @@ test_read_eof_by_page(void)
SerdWorld* world = serd_world_new();
size_t ignored = 0u;
- SerdSink* sink = serd_sink_new(&ignored, count_statements, NULL);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdSink* sink = serd_sink_new(world, &ignored, count_statements, NULL);
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* reader = serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
@@ -224,8 +226,8 @@ test_read_eof_by_byte(void)
{
SerdWorld* world = serd_world_new();
size_t ignored = 0u;
- SerdSink* sink = serd_sink_new(&ignored, count_statements, NULL);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdSink* sink = serd_sink_new(world, &ignored, count_statements, NULL);
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* reader = serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
@@ -255,10 +257,12 @@ test_read_chunks(void)
FILE* const f = tmpfile();
static const char null = 0;
- SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+ SerdSink* const sink =
+ serd_sink_new(world, &n_statements, count_statements, NULL);
+
assert(sink);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, SERD_TURTLE, 0u, env, sink, 4096);
@@ -324,10 +328,11 @@ test_read_empty(void)
size_t n_statements = 0;
FILE* const f = tmpfile();
- SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+ SerdSink* const sink =
+ serd_sink_new(world, &n_statements, count_statements, NULL);
assert(sink);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, SERD_SYNTAX_EMPTY, 0, env, sink, 4096);
@@ -374,8 +379,8 @@ test_error_cursor(void)
{
SerdWorld* world = serd_world_new();
bool called = false;
- SerdSink* sink = serd_sink_new(&called, check_cursor, NULL);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdSink* sink = serd_sink_new(world, &called, check_cursor, NULL);
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
SerdReader* const reader =
serd_reader_new(world, SERD_TURTLE, 0, env, sink, 4096);
diff --git a/test/test_reader_writer.c b/test/test_reader_writer.c
index 8bb76083..52be8d74 100644
--- a/test/test_reader_writer.c
+++ b/test/test_reader_writer.c
@@ -36,11 +36,11 @@ count_statements(void* handle, const SerdEvent* event)
static void
test_writer(const char* const path)
{
- FILE* fd = fopen(path, "wb");
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ FILE* fd = fopen(path, "wb");
+ SerdWorld* world = serd_world_new();
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
assert(fd);
- SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
SerdOutputStream output = serd_open_output_file(path);
@@ -133,12 +133,15 @@ test_writer(const char* const path)
static void
test_reader(const char* path)
{
- SerdWorld* world = serd_world_new();
- size_t n_statements = 0;
- SerdSink* const sink = serd_sink_new(&n_statements, count_statements, NULL);
+ SerdWorld* world = serd_world_new();
+ size_t n_statements = 0;
+
+ SerdSink* const sink =
+ serd_sink_new(world, &n_statements, count_statements, NULL);
+
assert(sink);
- SerdEnv* const env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* const env = serd_env_new(world, SERD_EMPTY_STRING());
assert(env);
// Test that too little stack space fails gracefully
diff --git a/test/test_sink.c b/test/test_sink.c
index 8bbfbb2d..7c49cc04 100644
--- a/test/test_sink.c
+++ b/test/test_sink.c
@@ -97,6 +97,7 @@ on_event(void* const handle, const SerdEvent* const event)
static void
test_callbacks(void)
{
+ SerdWorld* const world = serd_world_new();
SerdNodes* const nodes = serd_nodes_new();
const SerdNode* base = serd_nodes_uri(nodes, SERD_STRING(NS_EG));
@@ -104,7 +105,7 @@ test_callbacks(void)
const SerdNode* uri = serd_nodes_uri(nodes, SERD_STRING(NS_EG "uri"));
const SerdNode* blank = serd_nodes_blank(nodes, SERD_STRING("b1"));
- SerdEnv* env = serd_env_new(serd_node_string_view(base));
+ SerdEnv* env = serd_env_new(world, serd_node_string_view(base));
SerdStatement* const statement =
serd_statement_new(base, uri, blank, NULL, NULL);
@@ -118,7 +119,7 @@ test_callbacks(void)
// Call functions on a sink with no functions set
- SerdSink* null_sink = serd_sink_new(&state, NULL, NULL);
+ SerdSink* null_sink = serd_sink_new(world, &state, NULL, NULL);
assert(!serd_sink_write_base(null_sink, base));
assert(!serd_sink_write_prefix(null_sink, name, uri));
@@ -141,7 +142,7 @@ test_callbacks(void)
// Try again with a sink that has the event handler set
- SerdSink* sink = serd_sink_new(&state, on_event, NULL);
+ SerdSink* sink = serd_sink_new(world, &state, on_event, NULL);
assert(!serd_sink_write_base(sink, base));
assert(serd_node_equals(state.last_base, base));
@@ -164,6 +165,7 @@ test_callbacks(void)
serd_statement_free(statement);
serd_env_free(env);
serd_nodes_free(nodes);
+ serd_world_free(world);
}
static void
@@ -172,12 +174,16 @@ test_free(void)
// Free of null should (as always) not crash
serd_sink_free(NULL);
+ SerdWorld* const world = serd_world_new();
+
// Set up a sink with dynamically allocated data and a free function
uintptr_t* data = (uintptr_t*)calloc(1, sizeof(uintptr_t));
- SerdSink* sink = serd_sink_new(data, NULL, free);
+ SerdSink* sink = serd_sink_new(world, data, NULL, free);
// Free the sink, which should free the data (rely on valgrind or sanitizers)
serd_sink_free(sink);
+
+ serd_world_free(world);
}
int
diff --git a/test/test_terse_write.c b/test/test_terse_write.c
index d9ce4d1b..02f6bebf 100644
--- a/test/test_terse_write.c
+++ b/test/test_terse_write.c
@@ -44,7 +44,7 @@ test(void)
{
SerdBuffer buffer = {NULL, 0};
SerdWorld* world = serd_world_new();
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdNodes* nodes = serd_nodes_new();
const SerdNode* b1 = serd_nodes_blank(nodes, SERD_STRING("b1"));
diff --git a/test/test_writer.c b/test/test_writer.c
index 6ffe5d0f..7e2386be 100644
--- a/test/test_writer.c
+++ b/test/test_writer.c
@@ -29,7 +29,7 @@ static void
test_writer_new(void)
{
SerdWorld* world = serd_world_new();
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdBuffer buffer = {NULL, 0};
SerdOutputStream output = serd_open_output_buffer(&buffer);
@@ -43,7 +43,7 @@ static void
test_write_bad_event(void)
{
SerdWorld* world = serd_world_new();
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdBuffer buffer = {NULL, 0};
SerdOutputStream output = serd_open_output_buffer(&buffer);
@@ -72,7 +72,7 @@ test_write_long_literal(void)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdBuffer buffer = {NULL, 0};
SerdOutputStream output = serd_open_output_buffer(&buffer);
@@ -128,7 +128,7 @@ test_writer_stack_overflow(void)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdOutputStream output =
serd_open_output_stream(null_sink, NULL, NULL, NULL);
@@ -180,7 +180,7 @@ test_strict_write(void)
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdOutputStream output = serd_open_output_file(path);
assert(output.stream);
@@ -233,7 +233,7 @@ test_write_error(void)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
const SerdNode* s =
serd_nodes_uri(nodes, SERD_STRING("http://example.org/s"));
@@ -279,7 +279,7 @@ test_write_empty_syntax(void)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
const SerdNode* s =
serd_nodes_uri(nodes, SERD_STRING("http://example.org/s"));
@@ -318,7 +318,7 @@ test_write_bad_uri(void)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
const SerdNode* s =
serd_nodes_uri(nodes, SERD_STRING("http://example.org/s"));
@@ -355,7 +355,7 @@ check_pname_escape(const char* const lname, const char* const expected)
{
SerdWorld* world = serd_world_new();
SerdNodes* nodes = serd_world_nodes(world);
- SerdEnv* env = serd_env_new(SERD_EMPTY_STRING());
+ SerdEnv* env = serd_env_new(world, SERD_EMPTY_STRING());
SerdBuffer buffer = {NULL, 0};
SerdOutputStream output = serd_open_output_buffer(&buffer);
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-02 03:42:40 +0000