Shorten node constructor names

2 files changed, 13 insertions, 15 deletions

diff --git a/test/test_node.c b/test/test_node.c
index ac0a02ae..52a98740 100644
--- a/test/test_node.c
+++ b/test/test_node.c
@@ -91,7 +91,7 @@ test_double_to_node(void)
                                  NULL};
 
   for (size_t i = 0; i < sizeof(dbl_test_nums) / sizeof(double); ++i) {
-    SerdNode   node = serd_node_new_decimal(dbl_test_nums[i], 8);
+    SerdNode   node = serd_new_decimal(dbl_test_nums[i], 8);
     const bool pass = (node.buf && dbl_test_strs[i])
                         ? !strcmp(node.buf, dbl_test_strs[i])
                         : (node.buf == dbl_test_strs[i]);
@@ -111,7 +111,7 @@ test_integer_to_node(void)
     "0", "0", "-23", "23", "-12340", "1000", "-1000"};
 
   for (size_t i = 0; i < sizeof(int_test_nums) / sizeof(double); ++i) {
-    SerdNode node = serd_node_new_integer(int_test_nums[i]);
+    SerdNode node = serd_new_integer(int_test_nums[i]);
     assert(!strcmp(node.buf, int_test_strs[i]));
     assert(node.n_bytes == strlen(node.buf));
     serd_node_free(&node);
@@ -127,7 +127,7 @@ test_blob_to_node(void)
       data[i] = (uint8_t)((size + i) % 256);
     }
 
-    SerdNode blob = serd_node_new_blob(data, size, size % 5);
+    SerdNode blob = serd_new_blob(data, size, size % 5);
 
     assert(blob.n_bytes == strlen(blob.buf));
 
diff --git a/test/test_uri.c b/test/test_uri.c
index e6933759..8f3b559b 100644
--- a/test/test_uri.c
+++ b/test/test_uri.c
@@ -32,7 +32,7 @@ test_file_uri(const char* hostname,
     expected_path = path;
   }
 
-  SerdNode node         = serd_node_new_file_uri(path, hostname, 0);
+  SerdNode node         = serd_new_file_uri(path, hostname, 0);
   char*    out_hostname = NULL;
   char*    out_path     = serd_file_uri_parse(node.buf, &out_hostname);
   assert(!strcmp(node.buf, expected_uri));
@@ -66,14 +66,14 @@ test_uri_parsing(void)
 static void
 test_uri_from_string(void)
 {
-  SerdNode nonsense = serd_node_new_uri_from_string(NULL, NULL, NULL);
+  SerdNode nonsense = serd_new_uri_from_string(NULL, NULL, NULL);
   assert(nonsense.type == SERD_NOTHING);
 
   SerdURIView base_uri;
   SerdNode    base =
-    serd_node_new_uri_from_string("http://example.org/", NULL, &base_uri);
-  SerdNode nil  = serd_node_new_uri_from_string(NULL, &base_uri, NULL);
-  SerdNode nil2 = serd_node_new_uri_from_string("", &base_uri, NULL);
+    serd_new_uri_from_string("http://example.org/", NULL, &base_uri);
+  SerdNode nil  = serd_new_uri_from_string(NULL, &base_uri, NULL);
+  SerdNode nil2 = serd_new_uri_from_string("", &base_uri, NULL);
   assert(nil.type == SERD_URI);
   assert(!strcmp(nil.buf, base.buf));
   assert(nil2.type == SERD_URI);
@@ -89,29 +89,27 @@ test_relative_uri(void)
 {
   SerdURIView base_uri;
   SerdNode    base =
-    serd_node_new_uri_from_string("http://example.org/", NULL, &base_uri);
+    serd_new_uri_from_string("http://example.org/", NULL, &base_uri);
 
   SerdNode abs = serd_node_from_string(SERD_URI, "http://example.org/foo/bar");
   SerdURIView abs_uri;
   serd_uri_parse(abs.buf, &abs_uri);
 
   SerdURIView rel_uri;
-  SerdNode    rel =
-    serd_node_new_relative_uri(&abs_uri, &base_uri, NULL, &rel_uri);
+  SerdNode    rel = serd_new_relative_uri(&abs_uri, &base_uri, NULL, &rel_uri);
   assert(!strcmp(rel.buf, "/foo/bar"));
 
-  SerdNode up = serd_node_new_relative_uri(&base_uri, &abs_uri, NULL, NULL);
+  SerdNode up = serd_new_relative_uri(&base_uri, &abs_uri, NULL, NULL);
   assert(!strcmp(up.buf, "../"));
 
-  SerdNode noup =
-    serd_node_new_relative_uri(&base_uri, &abs_uri, &abs_uri, NULL);
+  SerdNode noup = serd_new_relative_uri(&base_uri, &abs_uri, &abs_uri, NULL);
   assert(!strcmp(noup.buf, "http://example.org/"));
 
   SerdNode    x = serd_node_from_string(SERD_URI, "http://example.org/foo/x");
   SerdURIView x_uri;
   serd_uri_parse(x.buf, &x_uri);
 
-  SerdNode x_rel = serd_node_new_relative_uri(&x_uri, &abs_uri, &abs_uri, NULL);
+  SerdNode x_rel = serd_new_relative_uri(&x_uri, &abs_uri, &abs_uri, NULL);
   assert(!strcmp(x_rel.buf, "x"));
 
   serd_node_free(&x_rel);