aboutsummaryrefslogtreecommitdiffstats
path: root/tests/serd_test.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/serd_test.c')
-rw-r--r--tests/serd_test.c28
1 files changed, 9 insertions, 19 deletions
diff --git a/tests/serd_test.c b/tests/serd_test.c
index 12899de2..23e1401a 100644
--- a/tests/serd_test.c
+++ b/tests/serd_test.c
@@ -159,7 +159,7 @@ main(void)
: ((const char*)node.buf == dbl_test_strs[i]);
assert(pass);
const size_t len = node.buf ? strlen((const char*)node.buf) : 0;
- assert(node.n_bytes == len && node.n_chars == len);
+ assert(node.n_bytes == len);
serd_node_free(&node);
}
@@ -177,7 +177,7 @@ main(void)
SerdNode node = serd_node_new_integer(int_test_nums[i]);
assert(!strcmp((const char*)node.buf, (const char*)int_test_strs[i]));
const size_t len = strlen((const char*)node.buf);
- assert(node.n_bytes == len && node.n_chars == len);
+ assert(node.n_bytes == len);
serd_node_free(&node);
}
@@ -190,7 +190,6 @@ main(void)
SerdNode blob = serd_node_new_blob(data, size, size % 5);
- assert(blob.n_bytes == blob.n_chars);
assert(blob.n_bytes == strlen((const char*)blob.buf));
size_t out_size;
@@ -211,15 +210,10 @@ main(void)
const uint8_t str[] = { '"', '5', 0xE2, 0x82, 0xAC, '"', '\n', 0 };
- size_t n_bytes;
SerdNodeFlags flags;
- size_t len = serd_strlen(str, &n_bytes, &flags);
- assert(len == 5 && n_bytes == 7 &&
- flags == (SERD_HAS_QUOTE | SERD_HAS_NEWLINE));
- len = serd_strlen(str, NULL, &flags);
- assert(len == 5);
-
- assert(serd_strlen(str, &n_bytes, NULL) == 5);
+ size_t n_bytes = serd_strlen(str, &flags);
+ assert(n_bytes == 7 && flags == (SERD_HAS_QUOTE|SERD_HAS_NEWLINE));
+ assert(serd_strlen(str, NULL) == 7);
// Test serd_strerror
@@ -298,8 +292,7 @@ main(void)
// Test serd_node_from_string
SerdNode node = serd_node_from_string(SERD_LITERAL, (const uint8_t*)"hello\"");
- assert(node.n_bytes == 6 && node.n_chars == 6 &&
- node.flags == SERD_HAS_QUOTE &&
+ assert(node.n_bytes == 6 && node.flags == SERD_HAS_QUOTE &&
!strcmp((const char*)node.buf, "hello\""));
node = serd_node_from_string(SERD_URI, NULL);
@@ -308,17 +301,14 @@ main(void)
// Test serd_node_from_substring
SerdNode empty = serd_node_from_substring(SERD_LITERAL, NULL, 32);
- assert(!empty.buf && !empty.n_bytes && !empty.n_chars && !empty.flags &&
- !empty.type);
+ assert(!empty.buf && !empty.n_bytes && !empty.flags && !empty.type);
SerdNode a_b = serd_node_from_substring(SERD_LITERAL, USTR("a\"bc"), 3);
- assert(a_b.n_bytes == 3 && a_b.n_chars == 3 &&
- a_b.flags == SERD_HAS_QUOTE &&
+ assert(a_b.n_bytes == 3 && a_b.flags == SERD_HAS_QUOTE &&
!strncmp((const char*)a_b.buf, "a\"b", 3));
a_b = serd_node_from_substring(SERD_LITERAL, USTR("a\"bc"), 10);
- assert(a_b.n_bytes == 4 && a_b.n_chars == 4 &&
- a_b.flags == SERD_HAS_QUOTE &&
+ assert(a_b.n_bytes == 4 && a_b.flags == SERD_HAS_QUOTE &&
!strncmp((const char*)a_b.buf, "a\"bc", 4));
// Test serd_node_new_uri_from_string