Clean up node construction API

1 files changed, 17 insertions, 10 deletions

diff --git a/tests/env_test.c b/tests/env_test.c
index 8e0c9205..607b8763 100644
--- a/tests/env_test.c
+++ b/tests/env_test.c
@@ -36,13 +36,21 @@ test_env(void)
 {
 	SerdWorld* world = serd_world_new();
 
-	SerdNode* u   = serd_node_new_string(SERD_URI, "http://example.org/foo");
-	SerdNode* b   = serd_node_new_string(SERD_CURIE, "invalid");
-	SerdNode* c   = serd_node_new_string(SERD_CURIE, "eg.2:b");
-	SerdNode* s   = serd_node_new_string(SERD_LITERAL, "hello");
-	SerdEnv*  env = serd_env_new(NULL);
+	SerdNode* hello = serd_node_new_string("hello\"");
+	SerdNode* u     = serd_node_new_uri("http://example.org/foo");
+	SerdNode* b     = serd_node_new_curie("invalid");
+	SerdNode* c     = serd_node_new_curie("eg.2:b");
+	SerdNode* s     = serd_node_new_string("hello");
+	SerdEnv*  env   = serd_env_new(NULL);
 	serd_env_set_prefix_from_strings(env, "eg.2", "http://example.org/");
 
+	assert(!serd_env_base_uri(env));
+	assert(serd_env_set_base_uri(env, NULL));
+	assert(!serd_env_base_uri(env));
+	assert(serd_env_set_base_uri(env, hello));
+	assert(!serd_env_base_uri(env));
+	serd_node_free(hello);
+
 	SerdStringView prefix;
 	SerdStringView suffix;
 	assert(serd_env_expand(env, b, &prefix, &suffix));
@@ -57,7 +65,7 @@ test_env(void)
 	assert(!strcmp(serd_node_string(xu), "http://example.org/foo"));
 	serd_node_free(xu);
 
-	SerdNode* badpre  = serd_node_new_string(SERD_CURIE, "hm:what");
+	SerdNode* badpre = serd_node_new_curie("hm:what");
 	SerdNode* xbadpre = serd_env_expand_node(env, badpre);
 	assert(!xbadpre);
 
@@ -67,10 +75,10 @@ test_env(void)
 
 	assert(serd_env_set_prefix(env, NULL, NULL));
 
-	SerdNode* lit = serd_node_new_string(SERD_LITERAL, "hello");
+	SerdNode* lit = serd_node_new_string("hello");
 	assert(serd_env_set_prefix(env, b, lit));
 
-	SerdNode* blank = serd_node_new_string(SERD_BLANK, "b1");
+	SerdNode* blank = serd_node_new_blank("b1");
 	assert(!serd_env_expand_node(env, blank));
 	serd_node_free(blank);
 
@@ -79,10 +87,9 @@ test_env(void)
 	serd_env_foreach(env, count_prefixes, &n_prefixes);
 	assert(n_prefixes == 1);
 
-	SerdNode*       shorter_uri = serd_node_new_string(SERD_URI, "urn:foo");
+	SerdNode*       shorter_uri = serd_node_new_uri("urn:foo");
 	const SerdNode* prefix_name = NULL;
 	assert(!serd_env_qualify(env, shorter_uri, &prefix_name, &suffix));
-
 	serd_node_free(shorter_uri);
 	serd_node_free(lit);
 	serd_node_free(badpre);