aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2018-06-13 21:32:11 -0400
committerDavid Robillard <d@drobilla.net>2019-12-19 20:55:24 -0500
commit148fd83672c219138499380664d5e0fe37605ea7 (patch)
tree867e62b598fcc849b5c798e4b2c6a83bf13d0e4e /tests
parentfeb8de751a7f23cbd96ad4760dea68344ea3d0d7 (diff)
downloadserd-148fd83672c219138499380664d5e0fe37605ea7.tar.gz
serd-148fd83672c219138499380664d5e0fe37605ea7.tar.bz2
serd-148fd83672c219138499380664d5e0fe37605ea7.zip
Simplify SerdEnv API
Diffstat (limited to 'tests')
-rw-r--r--tests/serd_test.c49
1 files changed, 27 insertions, 22 deletions
diff --git a/tests/serd_test.c b/tests/serd_test.c
index caed7deb..942f36ad 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -543,40 +543,42 @@ test_env(void)
SerdWorld* world = serd_world_new();
SerdNode* hello = serd_new_string("hello\"");
- SerdNode* u = serd_new_uri("http://example.org/foo");
+ SerdNode* eg = serd_new_uri("http://example.org/");
+ SerdNode* foo_u = serd_new_uri("http://example.org/foo");
+ SerdNode* foo_c = serd_new_curie("eg.2:foo");
SerdNode* b = serd_new_curie("invalid");
- SerdNode* c = serd_new_curie("eg.2:b");
- SerdNode* s = serd_new_string("hello");
+ SerdNode* pre = serd_new_curie("eg.2");
SerdEnv* env = serd_env_new(NULL);
- serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
+ serd_env_set_prefix(env, pre, eg);
assert(!serd_env_get_base_uri(env));
assert(serd_env_set_base_uri(env, NULL));
assert(!serd_env_get_base_uri(env));
assert(serd_env_set_base_uri(env, hello));
assert(!serd_env_get_base_uri(env));
- serd_node_free(hello);
- SerdStringView prefix;
- SerdStringView suffix;
- assert(serd_env_expand(env, b, &prefix, &suffix));
+ SerdNode* xnode = serd_env_expand(env, hello);
+ assert(!xnode);
- assert(!serd_env_expand_node(env, b));
- assert(!serd_env_expand_node(env, s));
+ assert(!serd_env_expand(env, b));
+ assert(!serd_env_expand(env, hello));
- assert(serd_env_set_base_uri(NULL, u));
+ assert(serd_env_set_base_uri(NULL, eg));
assert(serd_env_set_base_uri(env, NULL));
- SerdNode* xu = serd_env_expand_node(env, u);
+ serd_node_free(hello);
+
+ SerdNode* xu = serd_env_expand(env, foo_c);
assert(!strcmp(serd_node_get_string(xu), "http://example.org/foo"));
serd_node_free(xu);
SerdNode* badpre = serd_new_curie("hm:what");
- SerdNode* xbadpre = serd_env_expand_node(env, badpre);
+ SerdNode* xbadpre = serd_env_expand(env, badpre);
assert(!xbadpre);
+ serd_node_free(badpre);
- SerdNode* xc = serd_env_expand_node(env, c);
- assert(!strcmp(serd_node_get_string(xc), "http://example.org/b"));
+ SerdNode* xc = serd_env_expand(env, foo_c);
+ assert(serd_node_equals(xc, foo_u));
serd_node_free(xc);
assert(serd_env_set_prefix(env, NULL, NULL));
@@ -585,20 +587,23 @@ test_env(void)
assert(serd_env_set_prefix(env, b, lit));
int n_prefixes = 0;
- serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
+ serd_env_set_prefix(env, pre, eg);
serd_env_foreach(env, count_prefixes, &n_prefixes);
assert(n_prefixes == 1);
SerdNode* shorter_uri = serd_new_uri("urn:foo");
- const SerdNode* prefix_name;
- assert(!serd_env_qualify(env, shorter_uri, &prefix_name, &suffix));
+ assert(!serd_env_qualify(env, shorter_uri));
serd_node_free(shorter_uri);
+
+ SerdNode* qualified = serd_env_qualify(env, foo_u);
+ assert(serd_node_equals(qualified, foo_c));
+ serd_node_free(qualified);
+ serd_node_free(foo_c);
+ serd_node_free(foo_u);
serd_node_free(lit);
- serd_node_free(badpre);
- serd_node_free(s);
- serd_node_free(c);
serd_node_free(b);
- serd_node_free(u);
+ serd_node_free(pre);
+ serd_node_free(eg);
serd_env_free(env);
serd_world_free(world);