diff options
Diffstat (limited to 'tests/blogc')
-rw-r--r-- | tests/blogc/check_datetime_parser.c | 336 | ||||
-rw-r--r-- | tests/blogc/check_funcvars.c | 33 | ||||
-rw-r--r-- | tests/blogc/check_loader.c | 919 | ||||
-rw-r--r-- | tests/blogc/check_renderer.c | 398 | ||||
-rw-r--r-- | tests/blogc/check_rusage.c | 15 | ||||
-rw-r--r-- | tests/blogc/check_source_parser.c | 376 | ||||
-rw-r--r-- | tests/blogc/check_sysinfo.c | 41 | ||||
-rw-r--r-- | tests/blogc/check_sysinfo2.c | 9 | ||||
-rw-r--r-- | tests/blogc/check_template_parser.c | 495 |
9 files changed, 1261 insertions, 1361 deletions
diff --git a/tests/blogc/check_datetime_parser.c b/tests/blogc/check_datetime_parser.c index 44c1af8..2a79bd4 100644 --- a/tests/blogc/check_datetime_parser.c +++ b/tests/blogc/check_datetime_parser.c @@ -12,14 +12,15 @@ #include <cmocka.h> #include <stdlib.h> #include <locale.h> -#include "../../src/common/error.h" +#include <squareball.h> + #include "../../src/blogc/datetime-parser.h" static void test_convert_datetime(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(err); @@ -31,7 +32,7 @@ test_convert_datetime(void **state) static void test_convert_datetime_implicit_seconds(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:13", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(err); @@ -43,7 +44,7 @@ test_convert_datetime_implicit_seconds(void **state) static void test_convert_datetime_implicit_minutes(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(err); @@ -55,7 +56,7 @@ test_convert_datetime_implicit_minutes(void **state) static void test_convert_datetime_implicit_hours(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(err); @@ -67,529 +68,491 @@ test_convert_datetime_implicit_hours(void **state) static void test_convert_datetime_invalid_formats(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("20", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '20', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '20', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("201", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '201', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '201', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-1", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-1', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-1', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-3", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-3', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-3', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-30 ", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-30 ', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-30 ', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-30 1", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-30 1', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-30 1', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-30 12:1", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-30 12:1', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-30 12:1', formats ""allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); err = NULL; dt = blogc_convert_datetime("2010-11-30 12:13:1", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid datetime string. Found '2010-11-30 12:13:1', formats allowed are: " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid datetime string. Found '2010-11-30 12:13:1', formats allowed are: " "'yyyy-mm-dd hh:mm:ss', 'yyyy-mm-dd hh:ss', 'yyyy-mm-dd hh' and " "'yyyy-mm-dd'."); - bc_error_free(err); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_year(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("a010-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of year. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of year. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_year(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2a10-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of year. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of year. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_3rd_year(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("20a0-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid third digit of year. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid third digit of year. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_4th_year(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("201a-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid fourth digit of year. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid fourth digit of year. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_year(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("1899-11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid year. Found 1899, must be >= 1900."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid year. Found 1899, must be >= 1900."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_hyphen(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010 11-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid separator between year and month. Found ' ', must be '-'."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid separator between year and month. Found ' ', must be '-'."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_month(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-a1-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of month. Found 'a', must be integer >= 0 and <= 1."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of month. Found 'a', must be integer >= 0 and <= 1."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_month(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-1a-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of month. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of month. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_month(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-13-30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid month. Found 13, must be >= 1 and <= 12."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid month. Found 13, must be >= 1 and <= 12."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_hyphen(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11 30 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid separator between month and day. Found ' ', must be '-'."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid separator between month and day. Found ' ', must be '-'."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_day(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-a0 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of day. Found 'a', must be integer >= 0 and <= 3."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of day. Found 'a', must be integer >= 0 and <= 3."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_day(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-3a 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of day. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of day. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_day(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-12-32 12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid day. Found 32, must be >= 1 and <= 31."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid day. Found 32, must be >= 1 and <= 31."); + sb_error_free(err); } static void test_convert_datetime_invalid_space(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30-12:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid separator between date and time. Found '-', must be ' ' " + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid separator between date and time. Found '-', must be ' ' " "(empty space)."); - bc_error_free(err); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_hours(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 a2:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of hours. Found 'a', must be integer >= 0 and <= 2."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of hours. Found 'a', must be integer >= 0 and <= 2."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_hours(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 1a:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of hours. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of hours. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_hours(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-12-30 24:13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid hours. Found 24, must be >= 0 and <= 23."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid hours. Found 24, must be >= 0 and <= 23."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_colon(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12 13:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid separator between hours and minutes. Found ' ', must be ':'."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid separator between hours and minutes. Found ' ', must be ':'."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_minutes(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:a3:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of minutes. Found 'a', must be integer >= 0 and <= 5."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of minutes. Found 'a', must be integer >= 0 and <= 5."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_minutes(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:1a:14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of minutes. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of minutes. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_colon(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:13 14", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid separator between minutes and seconds. Found ' ', must be ':'."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid separator between minutes and seconds. Found ' ', must be ':'."); + sb_error_free(err); } static void test_convert_datetime_invalid_1st_seconds(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:13:a4", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid first digit of seconds. Found 'a', must be integer >= 0 and <= 6."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid first digit of seconds. Found 'a', must be integer >= 0 and <= 6."); + sb_error_free(err); } static void test_convert_datetime_invalid_2nd_seconds(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-11-30 12:13:1a", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid second digit of seconds. Found 'a', must be integer >= 0 and <= 9."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid second digit of seconds. Found 'a', must be integer >= 0 and <= 9."); + sb_error_free(err); } static void test_convert_datetime_invalid_seconds(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-12-30 12:13:69", "%b %d, %Y, %I:%M:%S %p GMT", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Invalid seconds. Found 69, must be >= 0 and <= 60."); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "datetime: Invalid seconds. Found 69, must be >= 0 and <= 60."); + sb_error_free(err); } static void test_convert_datetime_invalid_format_long(void **state) { - bc_error_t *err = NULL; + sb_error_t *err = NULL; char *dt = blogc_convert_datetime("2010-12-30 12:13:14", "bovhsuhxwybfrxoluiejaoqpmoylgvkrjtnuntmcgtupwabexkapnklvkwmddmplfqopvb" "yjsiimtfdeveeeayqvvnthimbqotumngxxenurxhsvyaftwsfdtxqnjluvtcwfkomfffrk" @@ -608,9 +571,8 @@ test_convert_datetime_invalid_format_long(void **state) "jgipsincitulscikxviaruryfraeqssykeftcphtndlfhdxokg", &err); assert_null(dt); assert_non_null(err); - assert_int_equal(err->type, BLOGC_WARNING_DATETIME_PARSER); - assert_string_equal(err->msg, - "Failed to format DATE variable, FORMAT is too long: " + assert_string_equal(sb_error_to_string(err), + "datetime: Failed to format DATE variable, FORMAT is too long: " "bovhsuhxwybfrxoluiejaoqpmoylgvkrjtnuntmcgtupwabexkapnklvkwmddmplfqopvb" "yjsiimtfdeveeeayqvvnthimbqotumngxxenurxhsvyaftwsfdtxqnjluvtcwfkomfffrk" "tywccrvnraagtnedwdjtfobinobbymanppwqxubxeepotdyxuvircyshpmtrqyvbivtycs" @@ -626,7 +588,7 @@ test_convert_datetime_invalid_format_long(void **state) "uaeruwnphdjonqagjatjladqhvlxppyaqgvwpjqggnsccmkjvbxqykaejvgeajqpitkwsq" "gmjiaopomnnlewidhgbgqlblotrnuyokspuvbckqhwnhmgcwyyitmlelnehdvclojvyswj" "jgipsincitulscikxviaruryfraeqssykeftcphtndlfhdxokg"); - bc_error_free(err); + sb_error_free(err); } diff --git a/tests/blogc/check_funcvars.c b/tests/blogc/check_funcvars.c index 9d094d5..2c4acb0 100644 --- a/tests/blogc/check_funcvars.c +++ b/tests/blogc/check_funcvars.c @@ -13,16 +13,15 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/funcvars.h" char* -__wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err) +__wrap_sb_file_get_contents(const char *path, size_t *len, sb_error_t **err) { assert_string_equal(path, "/proc/1/cgroup"); - assert_false(utf8); char *rv = mock_type(char*); *len = strlen(rv); return rv; @@ -32,40 +31,40 @@ __wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t static void test_funcvars_eval(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); blogc_funcvars_eval(t, NULL); blogc_funcvars_eval(t, ""); blogc_funcvars_eval(t, "BOLA"); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); - bc_trie_insert(t, "BOLA", bc_strdup("GUDA")); + sb_trie_insert(t, "BOLA", sb_strdup("GUDA")); blogc_funcvars_eval(t, "BOLA"); - assert_int_equal(bc_trie_size(t), 1); + assert_int_equal(sb_trie_size(t), 1); - bc_trie_free(t); + sb_trie_free(t); } static void test_funcvars_eval_mocked(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); // this is the only function that isn't hidden behind conditional macros // as of when this test was written. the other functions should be tested // separately - will_return(__wrap_bc_file_get_contents, bc_strdup("asd/docker/asd")); + will_return(__wrap_sb_file_get_contents, sb_strdup("asd/docker/asd")); blogc_funcvars_eval(t, "BLOGC_SYSINFO_INSIDE_DOCKER"); - assert_string_equal(bc_trie_lookup(t, "BLOGC_SYSINFO_INSIDE_DOCKER"), "1"); - assert_int_equal(bc_trie_size(t), 1); + assert_string_equal(sb_trie_lookup(t, "BLOGC_SYSINFO_INSIDE_DOCKER"), "1"); + assert_int_equal(sb_trie_size(t), 1); // this specific function call is cached, so calling it again should not - // call bc_file_get_contents_again + // call sb_file_get_contents_again blogc_funcvars_eval(t, "BLOGC_SYSINFO_INSIDE_DOCKER"); - assert_string_equal(bc_trie_lookup(t, "BLOGC_SYSINFO_INSIDE_DOCKER"), "1"); - assert_int_equal(bc_trie_size(t), 1); + assert_string_equal(sb_trie_lookup(t, "BLOGC_SYSINFO_INSIDE_DOCKER"), "1"); + assert_int_equal(sb_trie_size(t), 1); - bc_trie_free(t); + sb_trie_free(t); } diff --git a/tests/blogc/check_loader.c b/tests/blogc/check_loader.c index d65f418..9510a3d 100644 --- a/tests/blogc/check_loader.c +++ b/tests/blogc/check_loader.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/template-parser.h" #include "../../src/blogc/loader.h" @@ -50,9 +50,8 @@ test_get_filename(void **state) char* -__wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err) +__wrap_sb_file_get_contents_utf8(const char *path, size_t *len, sb_error_t **err) { - assert_true(utf8); assert_null(*err); const char *_path = mock_type(const char*); if (_path != NULL) @@ -68,13 +67,13 @@ __wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t static void test_template_parse_from_file(void **state) { - bc_error_t *err = NULL; - will_return(__wrap_bc_file_get_contents, "bola"); - will_return(__wrap_bc_file_get_contents, bc_strdup("{{ BOLA }}\n")); - bc_slist_t *l = blogc_template_parse_from_file("bola", &err); + sb_error_t *err = NULL; + will_return(__wrap_sb_file_get_contents_utf8, "bola"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup("{{ BOLA }}\n")); + sb_slist_t *l = blogc_template_parse_from_file("bola", &err); assert_null(err); assert_non_null(l); - assert_int_equal(bc_slist_length(l), 2); + assert_int_equal(sb_slist_length(l), 2); blogc_template_free_ast(l); } @@ -82,10 +81,10 @@ test_template_parse_from_file(void **state) static void test_template_parse_from_file_null(void **state) { - bc_error_t *err = NULL; - will_return(__wrap_bc_file_get_contents, "bola"); - will_return(__wrap_bc_file_get_contents, NULL); - bc_slist_t *l = blogc_template_parse_from_file("bola", &err); + sb_error_t *err = NULL; + will_return(__wrap_sb_file_get_contents_utf8, "bola"); + will_return(__wrap_sb_file_get_contents_utf8, NULL); + sb_slist_t *l = blogc_template_parse_from_file("bola", &err); assert_null(err); assert_null(l); } @@ -94,33 +93,33 @@ test_template_parse_from_file_null(void **state) static void test_source_parse_from_file(void **state) { - bc_error_t *err = NULL; - will_return(__wrap_bc_file_get_contents, "bola.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + sb_error_t *err = NULL; + will_return(__wrap_sb_file_get_contents_utf8, "bola.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "--------\n" "bola")); - bc_trie_t *t = blogc_source_parse_from_file("bola.txt", &err); + sb_trie_t *t = blogc_source_parse_from_file("bola.txt", &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_trie_size(t), 6); - assert_string_equal(bc_trie_lookup(t, "ASD"), "123"); - assert_string_equal(bc_trie_lookup(t, "FILENAME"), "bola"); - assert_string_equal(bc_trie_lookup(t, "EXCERPT"), "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(t, "CONTENT"), "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(t, "RAW_CONTENT"), "bola"); - assert_string_equal(bc_trie_lookup(t, "DESCRIPTION"), "bola"); - bc_trie_free(t); + assert_int_equal(sb_trie_size(t), 6); + assert_string_equal(sb_trie_lookup(t, "ASD"), "123"); + assert_string_equal(sb_trie_lookup(t, "FILENAME"), "bola"); + assert_string_equal(sb_trie_lookup(t, "EXCERPT"), "<p>bola</p>\n"); + assert_string_equal(sb_trie_lookup(t, "CONTENT"), "<p>bola</p>\n"); + assert_string_equal(sb_trie_lookup(t, "RAW_CONTENT"), "bola"); + assert_string_equal(sb_trie_lookup(t, "DESCRIPTION"), "bola"); + sb_trie_free(t); } static void test_source_parse_from_file_null(void **state) { - bc_error_t *err = NULL; - will_return(__wrap_bc_file_get_contents, "bola.txt"); - will_return(__wrap_bc_file_get_contents, NULL); - bc_trie_t *t = blogc_source_parse_from_file("bola.txt", &err); + sb_error_t *err = NULL; + will_return(__wrap_sb_file_get_contents_utf8, "bola.txt"); + will_return(__wrap_sb_file_get_contents_utf8, NULL); + sb_trie_t *t = blogc_source_parse_from_file("bola.txt", &err); assert_null(err); assert_null(t); } @@ -129,813 +128,811 @@ test_source_parse_from_file_null(void **state) static void test_source_parse_from_files(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 4); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola3"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 4); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola3"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2003-02-03 04:05:06"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_sort(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-02 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2001-02-01 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_SORT", sb_strdup("1")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 5); - assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola3"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-01 04:05:06"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 5); + assert_string_equal(sb_trie_lookup(c, "FILTER_SORT"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola3"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2001-02-01 04:05:06"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_reverse(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "TAGS: chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "TAGS: bola, chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_REVERSE", bc_strdup("1")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_REVERSE", sb_strdup("1")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 5); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola3"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_REVERSE"), "1"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 5); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola3"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_REVERSE"), "1"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_sort_reverse(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-02 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2001-02-01 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); - bc_trie_insert(c, "FILTER_REVERSE", bc_strdup("1")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_SORT", sb_strdup("1")); + sb_trie_insert(c, "FILTER_REVERSE", sb_strdup("1")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 3); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 6); - assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILTER_REVERSE"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola3"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-01 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 3); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 6); + assert_string_equal(sb_trie_lookup(c, "FILTER_SORT"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILTER_REVERSE"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola3"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-01 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2001-02-03 04:05:06"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_tag(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "TAGS: chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "TAGS: bola, chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_TAG", bc_strdup("chunda")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_TAG", sb_strdup("chunda")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 5); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_TAG"), "chunda"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 5); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_TAG"), "chunda"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_page(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("1")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("1")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 10); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "CURRENT_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "NEXT_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "FIRST_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "LAST_PAGE"), "4"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 10); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_page2(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("3")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("3")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 11); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola5"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola6"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2006-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "3"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "CURRENT_PAGE"), "3"); - assert_string_equal(bc_trie_lookup(c, "PREVIOUS_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "NEXT_PAGE"), "4"); - assert_string_equal(bc_trie_lookup(c, "FIRST_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "LAST_PAGE"), "4"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 11); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola5"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola6"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2005-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2006-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "3"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "3"); + assert_string_equal(sb_trie_lookup(c, "PREVIOUS_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "4"); + assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_page3(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("1")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("1")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 10); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "CURRENT_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "NEXT_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "FIRST_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "LAST_PAGE"), "4"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 10); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_sort_and_by_page_and_tag(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "TAGS: chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "TAGS: chunda bola\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "TAGS: bola\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "TAGS: chunda\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "TAGS: yay chunda\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); - bc_trie_insert(c, "FILTER_TAG", bc_strdup("chunda")); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("2")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_SORT", sb_strdup("1")); + sb_trie_insert(c, "FILTER_TAG", sb_strdup("chunda")); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("2")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 12); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola3"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); - assert_string_equal(bc_trie_lookup(c, "FILTER_TAG"), "chunda"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "CURRENT_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "PREVIOUS_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "FIRST_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "LAST_PAGE"), "2"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 12); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola3"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2003-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_SORT"), "1"); + assert_string_equal(sb_trie_lookup(c, "FILTER_TAG"), "chunda"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "PREVIOUS_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "2"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_page_invalid(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("-1")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("-1")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_non_null(t); - assert_int_equal(bc_slist_length(t), 2); // it is enough, no need to look at the items - assert_int_equal(bc_trie_size(c), 10); - assert_string_equal(bc_trie_lookup(c, "FILENAME_FIRST"), "bola1"); - assert_string_equal(bc_trie_lookup(c, "FILENAME_LAST"), "bola2"); - assert_string_equal(bc_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PAGE"), "-1"); - assert_string_equal(bc_trie_lookup(c, "FILTER_PER_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "CURRENT_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "NEXT_PAGE"), "2"); - assert_string_equal(bc_trie_lookup(c, "FIRST_PAGE"), "1"); - assert_string_equal(bc_trie_lookup(c, "LAST_PAGE"), "4"); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 2); // it is enough, no need to look at the items + assert_int_equal(sb_trie_size(c), 10); + assert_string_equal(sb_trie_lookup(c, "FILENAME_FIRST"), "bola1"); + assert_string_equal(sb_trie_lookup(c, "FILENAME_LAST"), "bola2"); + assert_string_equal(sb_trie_lookup(c, "DATE_FIRST"), "2001-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "DATE_LAST"), "2002-02-03 04:05:06"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PAGE"), "-1"); + assert_string_equal(sb_trie_lookup(c, "FILTER_PER_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "CURRENT_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "NEXT_PAGE"), "2"); + assert_string_equal(sb_trie_lookup(c, "FIRST_PAGE"), "1"); + assert_string_equal(sb_trie_lookup(c, "LAST_PAGE"), "4"); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } static void test_source_parse_from_files_filter_by_page_invalid2(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2001-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola4.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola4.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7891\n" "DATE: 2004-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola5.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola5.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7892\n" "DATE: 2005-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola6.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola6.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7893\n" "DATE: 2006-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola7.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola7.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 7894\n" "DATE: 2007-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - s = bc_slist_append(s, bc_strdup("bola4.txt")); - s = bc_slist_append(s, bc_strdup("bola5.txt")); - s = bc_slist_append(s, bc_strdup("bola6.txt")); - s = bc_slist_append(s, bc_strdup("bola7.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_PAGE", bc_strdup("5")); - bc_trie_insert(c, "FILTER_PER_PAGE", bc_strdup("2")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + s = sb_slist_append(s, sb_strdup("bola4.txt")); + s = sb_slist_append(s, sb_strdup("bola5.txt")); + s = sb_slist_append(s, sb_strdup("bola6.txt")); + s = sb_slist_append(s, sb_strdup("bola7.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_PAGE", sb_strdup("5")); + sb_trie_insert(c, "FILTER_PER_PAGE", sb_strdup("2")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_null(t); - bc_trie_free(c); - bc_slist_free_full(s, free); + sb_trie_free(c); + sb_slist_free_full(s, free); } static void test_source_parse_from_files_without_all_dates(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola3.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola3.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 789\n" "DATE: 2003-02-03 04:05:06\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(t); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_LOADER); - assert_string_equal(err->msg, - "'DATE' variable provided for at least one source file, but not for " + assert_string_equal(sb_error_to_string(err), + "loader: 'DATE' variable provided for at least one source file, but not for " "all source files. It must be provided for all files."); - bc_error_free(err); - assert_int_equal(bc_trie_size(c), 0); - bc_trie_free(c); - bc_slist_free_full(s, free); + sb_error_free(err); + assert_int_equal(sb_trie_size(c), 0); + sb_trie_free(c); + sb_slist_free_full(s, free); } static void test_source_parse_from_files_filter_sort_without_all_dates(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2002-02-03 04:05:06\n" "--------\n" "bola")); - will_return(__wrap_bc_file_get_contents, "bola2.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola2.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 456\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_SORT", sb_strdup("1")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(t); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_LOADER); - assert_string_equal(err->msg, - "'FILTER_SORT' requires that 'DATE' variable is set for every source " + assert_string_equal(sb_error_to_string(err), + "loader: 'FILTER_SORT' requires that 'DATE' variable is set for every source " "file: bola2.txt"); - bc_error_free(err); - assert_int_equal(bc_trie_size(c), 1); - assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); - bc_trie_free(c); - bc_slist_free_full(s, free); + sb_error_free(err); + assert_int_equal(sb_trie_size(c), 1); + assert_string_equal(sb_trie_lookup(c, "FILTER_SORT"), "1"); + sb_trie_free(c); + sb_slist_free_full(s, free); } static void test_source_parse_from_files_filter_sort_with_wrong_date(void **state) { - will_return(__wrap_bc_file_get_contents, "bola1.txt"); - will_return(__wrap_bc_file_get_contents, bc_strdup( + will_return(__wrap_sb_file_get_contents_utf8, "bola1.txt"); + will_return(__wrap_sb_file_get_contents_utf8, sb_strdup( "ASD: 123\n" "DATE: 2002-02-03 04:05:ab\n" "--------\n" "bola")); - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_strdup("bola1.txt")); - s = bc_slist_append(s, bc_strdup("bola2.txt")); - s = bc_slist_append(s, bc_strdup("bola3.txt")); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "FILTER_SORT", bc_strdup("1")); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_strdup("bola1.txt")); + s = sb_slist_append(s, sb_strdup("bola2.txt")); + s = sb_slist_append(s, sb_strdup("bola3.txt")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "FILTER_SORT", sb_strdup("1")); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(t); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_LOADER); - assert_string_equal(err->msg, - "An error occurred while parsing 'DATE' variable: bola1.txt\n\nInvalid " - "first digit of seconds. Found 'a', must be integer >= 0 and <= 6."); - bc_error_free(err); - assert_int_equal(bc_trie_size(c), 1); - assert_string_equal(bc_trie_lookup(c, "FILTER_SORT"), "1"); - bc_trie_free(c); - bc_slist_free_full(s, free); + assert_string_equal(sb_error_to_string(err), + "loader: An error occurred while parsing 'DATE' variable: bola1.txt\n> " + "datetime: Invalid first digit of seconds. Found 'a', must be integer " + ">= 0 and <= 6."); + sb_error_free(err); + assert_int_equal(sb_trie_size(c), 1); + assert_string_equal(sb_trie_lookup(c, "FILTER_SORT"), "1"); + sb_trie_free(c); + sb_slist_free_full(s, free); } static void test_source_parse_from_files_null(void **state) { - bc_error_t *err = NULL; - bc_slist_t *s = NULL; - bc_trie_t *c = bc_trie_new(free); - bc_slist_t *t = blogc_source_parse_from_files(c, s, &err); + sb_error_t *err = NULL; + sb_slist_t *s = NULL; + sb_trie_t *c = sb_trie_new(free); + sb_slist_t *t = blogc_source_parse_from_files(c, s, &err); assert_null(err); assert_null(t); - assert_int_equal(bc_slist_length(t), 0); - assert_int_equal(bc_trie_size(c), 0); - bc_trie_free(c); - bc_slist_free_full(s, free); - bc_slist_free_full(t, (bc_free_func_t) bc_trie_free); + assert_int_equal(sb_slist_length(t), 0); + assert_int_equal(sb_trie_size(c), 0); + sb_trie_free(c); + sb_slist_free_full(s, free); + sb_slist_free_full(t, (sb_free_func_t) sb_trie_free); } diff --git a/tests/blogc/check_renderer.c b/tests/blogc/check_renderer.c index 479c239..63678b8 100644 --- a/tests/blogc/check_renderer.c +++ b/tests/blogc/check_renderer.c @@ -13,14 +13,14 @@ #include <stdbool.h> #include <stdlib.h> #include <string.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/renderer.h" #include "../../src/blogc/source-parser.h" #include "../../src/blogc/template-parser.h" -static bc_slist_t* +static sb_slist_t* create_sources(size_t count) { const char *s[] = { @@ -44,13 +44,13 @@ create_sources(size_t count) "ahahahahahahahaha3", }; assert_false(count > 3); - bc_error_t *err = NULL; - bc_slist_t *l = NULL; + sb_error_t *err = NULL; + sb_slist_t *l = NULL; for (size_t i = 0; i < count; i++) { - l = bc_slist_append(l, blogc_source_parse(s[i], strlen(s[i]), &err)); + l = sb_slist_append(l, blogc_source_parse(s[i], strlen(s[i]), &err)); assert_null(err); } - assert_int_equal(bc_slist_length(l), count); + assert_int_equal(sb_slist_length(l), count); return l; } @@ -76,11 +76,11 @@ test_render_entry(void **state) "{% if GUDA <= \"zxc\" %}LOL4{% endif %}\n" "{% foreach TAGS %}lol {{ FOREACH_ITEM }} haha {% endforeach %}\n" "{% foreach TAGS_ASD %}yay{% endforeach %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -102,7 +102,7 @@ test_render_entry(void **state) "lol foo haha lol bar haha lol baz haha \n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -123,11 +123,11 @@ test_render_listing(void **state) "{% foreach TAGS %}lol {{ FOREACH_ITEM }} haha {% endforeach %}\n" "{% foreach TAGS_ASD %}yay{% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(3); + sb_slist_t *s = create_sources(3); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, true); assert_string_equal(out, @@ -151,7 +151,7 @@ test_render_listing(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -173,11 +173,11 @@ test_render_listing_entry(void **state) "{% foreach TAGS %}lol {{ FOREACH_ITEM }} haha {% endforeach %}\n" "{% foreach TAGS_ASD %}yay{% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(3); + sb_slist_t *s = create_sources(3); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, true); assert_string_equal(out, @@ -202,7 +202,7 @@ test_render_listing_entry(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -225,17 +225,17 @@ test_render_listing_entry2(void **state) "{% foreach TAGS %}lol {{ FOREACH_ITEM }} haha {% endforeach %}\n" "{% foreach TAGS_ASD %}yay{% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(3); + sb_slist_t *s = create_sources(3); assert_non_null(s); - bc_trie_t *entry = bc_trie_new(free); - bc_trie_insert(entry, "FUUUUU", bc_strdup("XD")); - bc_trie_insert(entry, "BAAAAA", bc_strdup(":p")); + sb_trie_t *entry = sb_trie_new(free); + sb_trie_insert(entry, "FUUUUU", sb_strdup("XD")); + sb_trie_insert(entry, "BAAAAA", sb_strdup(":p")); char *out = blogc_render(l, s, entry, NULL, true); - bc_trie_free(entry); + sb_trie_free(entry); assert_string_equal(out, "foo\n" "fuuu\n" @@ -259,7 +259,7 @@ test_render_listing_entry2(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -279,8 +279,8 @@ test_render_listing_empty(void **state) "bola: {% ifdef BOLA %}{{ BOLA }}{% endif %}\n" "{% foreach TAGS %}lol {{ FOREACH_ITEM }} haha {% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); char *out = blogc_render(l, NULL, NULL, NULL, true); @@ -306,11 +306,11 @@ test_render_ifdef(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -318,7 +318,7 @@ test_render_ifdef(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -335,11 +335,11 @@ test_render_ifdef2(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -349,7 +349,7 @@ test_render_ifdef2(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -366,11 +366,11 @@ test_render_ifdef3(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -382,7 +382,7 @@ test_render_ifdef3(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -401,11 +401,11 @@ test_render_ifdef4(void **state) "{% else %}lol\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -418,7 +418,7 @@ test_render_ifdef4(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -437,11 +437,11 @@ test_render_ifdef5(void **state) "{% else %}lol\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -452,7 +452,7 @@ test_render_ifdef5(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -471,11 +471,11 @@ test_render_ifdef6(void **state) "{% else %}lol\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -484,7 +484,7 @@ test_render_ifdef6(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -504,11 +504,11 @@ test_render_ifdef7(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -522,7 +522,7 @@ test_render_ifdef7(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -540,11 +540,11 @@ test_render_ifndef(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -557,7 +557,7 @@ test_render_ifndef(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -576,11 +576,11 @@ test_render_if_eq(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -594,7 +594,7 @@ test_render_if_eq(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -613,11 +613,11 @@ test_render_if_neq(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -631,7 +631,7 @@ test_render_if_neq(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -650,11 +650,11 @@ test_render_if_lt(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -668,7 +668,7 @@ test_render_if_lt(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -687,11 +687,11 @@ test_render_if_gt(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -705,7 +705,7 @@ test_render_if_gt(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -726,11 +726,11 @@ test_render_if_lt_eq(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -746,7 +746,7 @@ test_render_if_lt_eq(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -767,11 +767,11 @@ test_render_if_gt_eq(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -787,7 +787,7 @@ test_render_if_gt_eq(void **state) "\n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -799,11 +799,11 @@ test_render_foreach(void **state) "{% block entry %}\n" "{% foreach TAGS %} {{ FOREACH_ITEM }} {% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -811,7 +811,7 @@ test_render_foreach(void **state) " foo bar baz \n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -824,11 +824,11 @@ test_render_foreach_if(void **state) "{% foreach TAGS %} {% if FOREACH_ITEM == \"bar\" %}{{ FOREACH_ITEM }}" "{% endif %} {% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -836,7 +836,7 @@ test_render_foreach_if(void **state) " bar \n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -850,11 +850,11 @@ test_render_foreach_if_else(void **state) "{% else %}{{ FOREACH_ITEM }}" "{% endif %} {% endforeach %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); char *out = blogc_render(l, s, NULL, NULL, false); assert_string_equal(out, @@ -862,7 +862,7 @@ test_render_foreach_if_else(void **state) "foo yay baz \n" "\n"); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -881,22 +881,22 @@ test_render_outside_block(void **state) "{% ifdef GUDA %}bola{% endif %}\n" "{{ BOLA }}\n" "{% ifndef CHUNDA %}lol{% endif %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "GUDA", bc_strdup("asd")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "GUDA", sb_strdup("asd")); char *out = blogc_render(l, s, NULL, c, false); assert_string_equal(out, "bola\n" "\n" "lol\n"); - bc_trie_free(c); + sb_trie_free(c); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -914,15 +914,15 @@ test_render_prefer_local_variable(void **state) "{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); - bc_trie_t *c = bc_trie_new(free); - bc_trie_insert(c, "GUDA", bc_strdup("hehe")); - bc_trie_insert(c, "LOL", bc_strdup("hmm")); + sb_trie_t *c = sb_trie_new(free); + sb_trie_insert(c, "GUDA", sb_strdup("hehe")); + sb_trie_insert(c, "LOL", sb_strdup("hmm")); char *out = blogc_render(l, s, NULL, c, false); assert_string_equal(out, "\n" @@ -933,9 +933,9 @@ test_render_prefer_local_variable(void **state) "\n" "\n" "\n"); - bc_trie_free(c); + sb_trie_free(c); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -950,13 +950,13 @@ test_render_respect_variable_scope(void **state) "{% ifdef LOL %}{{ LOL }}{% endif %}\n" "{% ifdef BOLA %}{{ BOLA }}{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = create_sources(1); + sb_slist_t *s = create_sources(1); assert_non_null(s); - bc_trie_t *c = bc_trie_new(free); + sb_trie_t *c = sb_trie_new(free); char *out = blogc_render(l, s, NULL, c, false); assert_string_equal(out, "\n" @@ -965,9 +965,9 @@ test_render_respect_variable_scope(void **state) "\n" "asd\n" "\n"); - bc_trie_free(c); + sb_trie_free(c); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -982,23 +982,23 @@ test_render_ifcount_bug(void **state) "{% ifdef ASD %}ASD{% endif %}\n" "{% endif %}\n" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *l = blogc_template_parse(str, strlen(str), &err); + sb_error_t *err = NULL; + sb_slist_t *l = blogc_template_parse(str, strlen(str), &err); assert_non_null(l); assert_null(err); - bc_slist_t *s = NULL; - s = bc_slist_append(s, bc_trie_new(free)); - bc_trie_insert(s->data, "TITLE", bc_strdup("bola")); - bc_trie_t *c = bc_trie_new(free); + sb_slist_t *s = NULL; + s = sb_slist_append(s, sb_trie_new(free)); + sb_trie_insert(s->data, "TITLE", sb_strdup("bola")); + sb_trie_t *c = sb_trie_new(free); char *out = blogc_render(l, s, NULL, c, false); assert_string_equal(out, "\n" "<h3>bola</h3>\n" "\n" "\n"); - bc_trie_free(c); + sb_trie_free(c); blogc_template_free_ast(l); - bc_slist_free_full(s, (bc_free_func_t) bc_trie_free); + sb_slist_free_full(s, (sb_free_func_t) sb_trie_free); free(out); } @@ -1006,100 +1006,100 @@ test_render_ifcount_bug(void **state) static void test_get_variable(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "NAME", bc_strdup("bola")); - bc_trie_insert(g, "TITLE", bc_strdup("bola2")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "NAME", bc_strdup("chunda")); - bc_trie_insert(l, "TITLE", bc_strdup("chunda2")); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "NAME", sb_strdup("bola")); + sb_trie_insert(g, "TITLE", sb_strdup("bola2")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "NAME", sb_strdup("chunda")); + sb_trie_insert(l, "TITLE", sb_strdup("chunda2")); assert_string_equal(blogc_get_variable("NAME", g, l), "chunda"); assert_string_equal(blogc_get_variable("TITLE", g, l), "chunda2"); assert_null(blogc_get_variable("BOLA", g, l)); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_get_variable_only_local(void **state) { - bc_trie_t *g = NULL; - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "NAME", bc_strdup("chunda")); - bc_trie_insert(l, "TITLE", bc_strdup("chunda2")); + sb_trie_t *g = NULL; + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "NAME", sb_strdup("chunda")); + sb_trie_insert(l, "TITLE", sb_strdup("chunda2")); assert_string_equal(blogc_get_variable("NAME", g, l), "chunda"); assert_string_equal(blogc_get_variable("TITLE", g, l), "chunda2"); assert_null(blogc_get_variable("BOLA", g, l)); - bc_trie_free(l); + sb_trie_free(l); } static void test_get_variable_only_global(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "NAME", bc_strdup("bola")); - bc_trie_insert(g, "TITLE", bc_strdup("bola2")); - bc_trie_t *l = NULL; + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "NAME", sb_strdup("bola")); + sb_trie_insert(g, "TITLE", sb_strdup("bola2")); + sb_trie_t *l = NULL; assert_string_equal(blogc_get_variable("NAME", g, l), "bola"); assert_string_equal(blogc_get_variable("TITLE", g, l), "bola2"); assert_null(blogc_get_variable("BOLA", g, l)); - bc_trie_free(g); + sb_trie_free(g); } static void test_format_date(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "DATE_FORMAT", bc_strdup("%H -- %M")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "DATE_FORMAT", bc_strdup("%R")); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "DATE_FORMAT", sb_strdup("%H -- %M")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "DATE_FORMAT", sb_strdup("%R")); char *date = blogc_format_date("2015-01-02 03:04:05", g, l); assert_string_equal(date, "03:04"); free(date); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_format_date_with_global_format(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "DATE_FORMAT", bc_strdup("%H -- %M")); - bc_trie_t *l = bc_trie_new(free); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "DATE_FORMAT", sb_strdup("%H -- %M")); + sb_trie_t *l = sb_trie_new(free); char *date = blogc_format_date("2015-01-02 03:04:05", g, l); assert_string_equal(date, "03 -- 04"); free(date); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_format_date_without_format(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_t *l = bc_trie_new(free); + sb_trie_t *g = sb_trie_new(free); + sb_trie_t *l = sb_trie_new(free); char *date = blogc_format_date("2015-01-02 03:04:05", g, l); assert_string_equal(date, "2015-01-02 03:04:05"); free(date); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_format_date_without_date(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_t *l = bc_trie_new(free); + sb_trie_t *g = sb_trie_new(free); + sb_trie_t *l = sb_trie_new(free); char *date = blogc_format_date(NULL, g, l); assert_null(date); free(date); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } @@ -1107,13 +1107,13 @@ static void test_format_variable(void **state) { // FIXME: test warnings - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "NAME", bc_strdup("bola")); - bc_trie_insert(g, "TITLE", bc_strdup("bola2")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "NAME", bc_strdup("chunda")); - bc_trie_insert(l, "TITLE", bc_strdup("chunda2")); - bc_trie_insert(l, "SIZE", bc_strdup("1234567890987654321")); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "NAME", sb_strdup("bola")); + sb_trie_insert(g, "TITLE", sb_strdup("bola2")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "NAME", sb_strdup("chunda")); + sb_trie_insert(l, "TITLE", sb_strdup("chunda2")); + sb_trie_insert(l, "SIZE", sb_strdup("1234567890987654321")); char *tmp = blogc_format_variable("NAME", g, l, NULL); assert_string_equal(tmp, "chunda"); free(tmp); @@ -1131,19 +1131,19 @@ test_format_variable(void **state) free(tmp); assert_null(blogc_format_variable("SIZE_", g, l, NULL)); assert_null(blogc_format_variable("BOLA", g, l, NULL)); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_format_variable_with_date(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "DATE", bc_strdup("2010-11-12 13:14:15")); - bc_trie_insert(g, "DATE_FORMAT", bc_strdup("%R")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "DATE", bc_strdup("2011-12-13 14:15:16")); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "DATE", sb_strdup("2010-11-12 13:14:15")); + sb_trie_insert(g, "DATE_FORMAT", sb_strdup("%R")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "DATE", sb_strdup("2011-12-13 14:15:16")); char *tmp = blogc_format_variable("DATE_FORMATTED", g, l, NULL); assert_string_equal(tmp, "14:15"); free(tmp); @@ -1153,18 +1153,18 @@ test_format_variable_with_date(void **state) tmp = blogc_format_variable("DATE_FORMATTED_10", g, l, NULL); assert_string_equal(tmp, "14:15"); free(tmp); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } static void test_format_variable_foreach(void **state) { - bc_slist_t *l = NULL; - l = bc_slist_append(l, bc_strdup("asd")); - l = bc_slist_append(l, bc_strdup("qwe")); - l = bc_slist_append(l, bc_strdup("zxcvbn")); + sb_slist_t *l = NULL; + l = sb_slist_append(l, sb_strdup("asd")); + l = sb_slist_append(l, sb_strdup("qwe")); + l = sb_slist_append(l, sb_strdup("zxcvbn")); char *tmp = blogc_format_variable("FOREACH_ITEM", NULL, NULL, l->next); assert_string_equal(tmp, "qwe"); free(tmp); @@ -1176,7 +1176,7 @@ test_format_variable_foreach(void **state) l->next->next); assert_string_equal(tmp, "zxcvbn"); free(tmp); - bc_slist_free_full(l, free); + sb_slist_free_full(l, free); } @@ -1191,31 +1191,31 @@ test_format_variable_foreach_empty(void **state) static void test_split_list_variable(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "TAGS", bc_strdup("asd lol hehe")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "TAGS", bc_strdup("asd lol XD")); - bc_slist_t *tmp = blogc_split_list_variable("TAGS", g, l); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "TAGS", sb_strdup("asd lol hehe")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "TAGS", sb_strdup("asd lol XD")); + sb_slist_t *tmp = blogc_split_list_variable("TAGS", g, l); assert_string_equal(tmp->data, "asd"); assert_string_equal(tmp->next->data, "lol"); assert_string_equal(tmp->next->next->data, "XD"); - bc_slist_free_full(tmp, free); - bc_trie_free(g); - bc_trie_free(l); + sb_slist_free_full(tmp, free); + sb_trie_free(g); + sb_trie_free(l); } static void test_split_list_variable_not_found(void **state) { - bc_trie_t *g = bc_trie_new(free); - bc_trie_insert(g, "TAGS", bc_strdup("asd lol hehe")); - bc_trie_t *l = bc_trie_new(free); - bc_trie_insert(l, "TAGS", bc_strdup("asd lol XD")); - bc_slist_t *tmp = blogc_split_list_variable("TAG", g, l); + sb_trie_t *g = sb_trie_new(free); + sb_trie_insert(g, "TAGS", sb_strdup("asd lol hehe")); + sb_trie_t *l = sb_trie_new(free); + sb_trie_insert(l, "TAGS", sb_strdup("asd lol XD")); + sb_slist_t *tmp = blogc_split_list_variable("TAG", g, l); assert_null(tmp); - bc_trie_free(g); - bc_trie_free(l); + sb_trie_free(g); + sb_trie_free(l); } diff --git a/tests/blogc/check_rusage.c b/tests/blogc/check_rusage.c index ff64297..7296c4d 100644 --- a/tests/blogc/check_rusage.c +++ b/tests/blogc/check_rusage.c @@ -15,7 +15,8 @@ #include <stdio.h> #include <sys/time.h> #include <sys/resource.h> -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/rusage.h" @@ -99,18 +100,18 @@ test_rusage_format_memory(void **state) static void test_rusage_inject(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); will_return(__wrap_getrusage, -1); blogc_rusage_inject(t); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); will_return(__wrap_getrusage, 0); blogc_rusage_inject(t); - assert_int_equal(bc_trie_size(t), 2); - assert_string_equal(bc_trie_lookup(t, "BLOGC_RUSAGE_CPU_TIME"), "4.000s"); - assert_string_equal(bc_trie_lookup(t, "BLOGC_RUSAGE_MEMORY"), "10.010MB"); - bc_trie_free(t); + assert_int_equal(sb_trie_size(t), 2); + assert_string_equal(sb_trie_lookup(t, "BLOGC_RUSAGE_CPU_TIME"), "4.000s"); + assert_string_equal(sb_trie_lookup(t, "BLOGC_RUSAGE_MEMORY"), "10.010MB"); + sb_trie_free(t); } diff --git a/tests/blogc/check_source_parser.c b/tests/blogc/check_source_parser.c index f758522..5aa7a91 100644 --- a/tests/blogc/check_source_parser.c +++ b/tests/blogc/check_source_parser.c @@ -11,8 +11,8 @@ #include <setjmp.h> #include <cmocka.h> #include <string.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/source-parser.h" @@ -26,26 +26,26 @@ test_source_parse(void **state) "# This is a test\n" "\n" "bola\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(bc_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd"); + assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" "bola\n"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "This is a test"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "bola"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "This is a test"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola"); + sb_trie_free(source); } @@ -59,26 +59,26 @@ test_source_parse_crlf(void **state) "# This is a test\r\n" "\r\n" "bola\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(bc_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd"); + assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n" "<p>bola</p>\r\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\r\n" "<p>bola</p>\r\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\r\n" "\r\n" "bola\r\n"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "This is a test"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "bola"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "This is a test"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola"); + sb_trie_free(source); } @@ -94,26 +94,26 @@ test_source_parse_with_spaces(void **state) "# This is a test\n" "\n" "bola\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "chunda"); - assert_string_equal(bc_trie_lookup(source, "BOLA"), "guda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "chunda"); + assert_string_equal(sb_trie_lookup(source, "BOLA"), "guda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" "bola\n"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "This is a test"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "bola"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "This is a test"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola"); + sb_trie_free(source); } @@ -132,22 +132,22 @@ test_source_parse_with_excerpt(void **state) "\n" "guda\n" "yay"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(bc_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd"); + assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n" "<p>guda\n" "yay</p>\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" "bola\n" @@ -156,9 +156,9 @@ test_source_parse_with_excerpt(void **state) "\n" "guda\n" "yay"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "This is a test"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "bola"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "This is a test"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola"); + sb_trie_free(source); } @@ -173,26 +173,26 @@ test_source_parse_with_first_header(void **state) "# This is a test\n" "\n" "bola\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(bc_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd"); + assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" "bola\n"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "THIS IS CHUNDA!"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "bola"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "THIS IS CHUNDA!"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "bola"); + sb_trie_free(source); } @@ -207,26 +207,26 @@ test_source_parse_with_description(void **state) "# This is a test\n" "\n" "bola\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(err); assert_non_null(source); - assert_int_equal(bc_trie_size(source), 7); - assert_string_equal(bc_trie_lookup(source, "VAR1"), "asd asd"); - assert_string_equal(bc_trie_lookup(source, "VAR2"), "123chunda"); - assert_string_equal(bc_trie_lookup(source, "EXCERPT"), + assert_int_equal(sb_trie_size(source), 7); + assert_string_equal(sb_trie_lookup(source, "VAR1"), "asd asd"); + assert_string_equal(sb_trie_lookup(source, "VAR2"), "123chunda"); + assert_string_equal(sb_trie_lookup(source, "EXCERPT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "CONTENT"), + assert_string_equal(sb_trie_lookup(source, "CONTENT"), "<h1 id=\"this-is-a-test\">This is a test</h1>\n" "<p>bola</p>\n"); - assert_string_equal(bc_trie_lookup(source, "RAW_CONTENT"), + assert_string_equal(sb_trie_lookup(source, "RAW_CONTENT"), "# This is a test\n" "\n" "bola\n"); - assert_string_equal(bc_trie_lookup(source, "FIRST_HEADER"), "This is a test"); - assert_string_equal(bc_trie_lookup(source, "DESCRIPTION"), "huehuehuebrbr"); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "FIRST_HEADER"), "This is a test"); + assert_string_equal(sb_trie_lookup(source, "DESCRIPTION"), "huehuehuebrbr"); + sb_trie_free(source); } @@ -234,14 +234,13 @@ static void test_source_parse_config_empty(void **state) { const char *a = ""; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, "Your source file is empty."); - bc_error_free(err); - bc_trie_free(source); + assert_string_equal(sb_error_to_string(err), "source: Your source file is empty."); + sb_error_free(err); + sb_trie_free(source); } @@ -249,15 +248,14 @@ static void test_source_parse_config_invalid_key(void **state) { const char *a = "bola: guda"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Can't find a configuration key or the content separator.\n" + assert_string_equal(sb_error_to_string(err), + "source: Can't find a configuration key or the content separator.\n" "Error occurred near line 1, position 1: bola: guda"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -265,15 +263,14 @@ static void test_source_parse_config_no_key(void **state) { const char *a = "BOLa"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Invalid configuration key.\n" + assert_string_equal(sb_error_to_string(err), + "source: Invalid configuration key.\n" "Error occurred near line 1, position 4: BOLa"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -281,15 +278,14 @@ static void test_source_parse_config_no_key2(void **state) { const char *a = "BOLA"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Your last configuration key is missing ':' and the value\n" + assert_string_equal(sb_error_to_string(err), + "source: Your last configuration key is missing ':' and the value\n" "Error occurred near line 1, position 5: BOLA"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -298,12 +294,12 @@ test_source_parse_config_no_value(void **state) { // this is a special case, not an error const char *a = "BOLA:\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_non_null(source); assert_null(err); - assert_string_equal(bc_trie_lookup(source, "BOLA"), ""); - bc_trie_free(source); + assert_string_equal(sb_trie_lookup(source, "BOLA"), ""); + sb_trie_free(source); } @@ -311,16 +307,15 @@ static void test_source_parse_config_no_value2(void **state) { const char *a = "BOLA:"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Configuration value not provided for 'BOLA'.\n" + assert_string_equal(sb_error_to_string(err), + "source: Configuration value not provided for 'BOLA'.\n" "Error occurred near line 1, position 6: BOLA:"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -328,16 +323,15 @@ static void test_source_parse_config_reserved_name(void **state) { const char *a = "FILENAME: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'FILENAME' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'FILENAME' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -345,16 +339,15 @@ static void test_source_parse_config_reserved_name2(void **state) { const char *a = "CONTENT: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'CONTENT' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'CONTENT' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -362,16 +355,15 @@ static void test_source_parse_config_reserved_name3(void **state) { const char *a = "DATE_FORMATTED: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'DATE_FORMATTED' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'DATE_FORMATTED' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -379,16 +371,15 @@ static void test_source_parse_config_reserved_name4(void **state) { const char *a = "DATE_FIRST_FORMATTED: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'DATE_FIRST_FORMATTED' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'DATE_FIRST_FORMATTED' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -396,16 +387,15 @@ static void test_source_parse_config_reserved_name5(void **state) { const char *a = "DATE_LAST_FORMATTED: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'DATE_LAST_FORMATTED' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'DATE_LAST_FORMATTED' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -413,16 +403,15 @@ static void test_source_parse_config_reserved_name6(void **state) { const char *a = "PAGE_FIRST: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'PAGE_FIRST' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'PAGE_FIRST' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -430,16 +419,15 @@ static void test_source_parse_config_reserved_name7(void **state) { const char *a = "PAGE_PREVIOUS: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'PAGE_PREVIOUS' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'PAGE_PREVIOUS' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -447,16 +435,15 @@ static void test_source_parse_config_reserved_name8(void **state) { const char *a = "PAGE_CURRENT: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'PAGE_CURRENT' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'PAGE_CURRENT' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -464,16 +451,15 @@ static void test_source_parse_config_reserved_name9(void **state) { const char *a = "PAGE_NEXT: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'PAGE_NEXT' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'PAGE_NEXT' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -481,16 +467,15 @@ static void test_source_parse_config_reserved_name10(void **state) { const char *a = "PAGE_LAST: asd\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'PAGE_LAST' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'PAGE_LAST' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -498,16 +483,15 @@ static void test_source_parse_config_reserved_name11(void **state) { const char *a = "BLOGC_VERSION: 1.0\r\n"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "'BLOGC_VERSION' variable is forbidden in source files. It will be set " + assert_string_equal(sb_error_to_string(err), + "source: 'BLOGC_VERSION' variable is forbidden in source files. It will be set " "for you by the compiler."); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -515,16 +499,15 @@ static void test_source_parse_config_value_no_line_ending(void **state) { const char *a = "BOLA: asd"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "No line ending after the configuration value for 'BOLA'.\n" + assert_string_equal(sb_error_to_string(err), + "source: No line ending after the configuration value for 'BOLA'.\n" "Error occurred near line 1, position 10: BOLA: asd"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } @@ -532,16 +515,15 @@ static void test_source_parse_invalid_separator(void **state) { const char *a = "BOLA: asd\n---#"; - bc_error_t *err = NULL; - bc_trie_t *source = blogc_source_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_trie_t *source = blogc_source_parse(a, strlen(a), &err); assert_null(source); assert_non_null(err); - assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER); - assert_string_equal(err->msg, - "Invalid content separator. Must be more than one '-' characters.\n" + assert_string_equal(sb_error_to_string(err), + "source: Invalid content separator. Must be more than one '-' characters.\n" "Error occurred near line 2, position 4: ---#"); - bc_error_free(err); - bc_trie_free(source); + sb_error_free(err); + sb_trie_free(source); } diff --git a/tests/blogc/check_sysinfo.c b/tests/blogc/check_sysinfo.c index 01b81b9..13fcb1e 100644 --- a/tests/blogc/check_sysinfo.c +++ b/tests/blogc/check_sysinfo.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/sysinfo.h" #ifdef HAVE_SYSINFO_DATETIME @@ -73,10 +73,9 @@ __wrap_gmtime(const time_t *timep) char* -__wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err) +__wrap_sb_file_get_contents(const char *path, size_t *len, sb_error_t **err) { assert_string_equal(path, "/proc/1/cgroup"); - assert_false(utf8); char *rv = mock_type(char*); *len = strlen(rv); return rv; @@ -103,19 +102,19 @@ test_sysinfo_get_hostname(void **state) static void test_sysinfo_inject_hostname(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); will_return(__wrap_gethostname, NULL); will_return(__wrap_gethostname, -1); blogc_sysinfo_inject_hostname(t); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); will_return(__wrap_gethostname, "bola"); will_return(__wrap_gethostname, 0); blogc_sysinfo_inject_hostname(t); - assert_int_equal(bc_trie_size(t), 1); - assert_string_equal(bc_trie_lookup(t, "BLOGC_SYSINFO_HOSTNAME"), "bola"); - bc_trie_free(t); + assert_int_equal(sb_trie_size(t), 1); + assert_string_equal(sb_trie_lookup(t, "BLOGC_SYSINFO_HOSTNAME"), "bola"); + sb_trie_free(t); } @@ -137,17 +136,17 @@ test_sysinfo_get_username(void **state) static void test_sysinfo_inject_username(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); will_return(__wrap_getenv, NULL); blogc_sysinfo_inject_username(t); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); will_return(__wrap_getenv, "bola"); blogc_sysinfo_inject_username(t); - assert_int_equal(bc_trie_size(t), 1); - assert_string_equal(bc_trie_lookup(t, "BLOGC_SYSINFO_USERNAME"), "bola"); - bc_trie_free(t); + assert_int_equal(sb_trie_size(t), 1); + assert_string_equal(sb_trie_lookup(t, "BLOGC_SYSINFO_USERNAME"), "bola"); + sb_trie_free(t); } @@ -173,21 +172,21 @@ test_sysinfo_get_datetime(void **state) static void test_sysinfo_inject_datetime(void **state) { - bc_trie_t *t = bc_trie_new(free); + sb_trie_t *t = sb_trie_new(free); will_return(__wrap_time, -1); blogc_sysinfo_inject_datetime(t); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); will_return(__wrap_time, 2); blogc_sysinfo_inject_datetime(t); - assert_int_equal(bc_trie_size(t), 0); + assert_int_equal(sb_trie_size(t), 0); will_return(__wrap_time, 1); blogc_sysinfo_inject_datetime(t); - assert_int_equal(bc_trie_size(t), 1); - assert_string_equal(bc_trie_lookup(t, "BLOGC_SYSINFO_DATETIME"), "1906-06-04 03:02:01"); - bc_trie_free(t); + assert_int_equal(sb_trie_size(t), 1); + assert_string_equal(sb_trie_lookup(t, "BLOGC_SYSINFO_DATETIME"), "1906-06-04 03:02:01"); + sb_trie_free(t); } @@ -196,7 +195,7 @@ test_sysinfo_get_inside_docker(void **state) { // the "positive" case was already tested in check_funcvars. this is done // this way because this function caches the results in a global variable. - will_return(__wrap_bc_file_get_contents, bc_strdup("bola")); + will_return(__wrap_sb_file_get_contents, sb_strdup("bola")); assert_false(blogc_sysinfo_get_inside_docker()); } diff --git a/tests/blogc/check_sysinfo2.c b/tests/blogc/check_sysinfo2.c index 2bb4273..9a70059 100644 --- a/tests/blogc/check_sysinfo2.c +++ b/tests/blogc/check_sysinfo2.c @@ -13,8 +13,8 @@ #include <stdlib.h> #include <string.h> #include <stdio.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/sysinfo.h" // this test exists because we can't test more than one return values for @@ -23,11 +23,10 @@ char* -__wrap_bc_file_get_contents(const char *path, bool utf8, size_t *len, bc_error_t **err) +__wrap_sb_file_get_contents(const char *path, size_t *len, sb_error_t **err) { assert_string_equal(path, "/proc/1/cgroup"); - assert_false(utf8); - *err = bc_error_new(0, ""); + *err = sb_strerror_new(""); return NULL; } diff --git a/tests/blogc/check_template_parser.c b/tests/blogc/check_template_parser.c index 15ef7c4..e3a3bd0 100644 --- a/tests/blogc/check_template_parser.c +++ b/tests/blogc/check_template_parser.c @@ -11,13 +11,13 @@ #include <setjmp.h> #include <cmocka.h> #include <string.h> -#include "../../src/common/error.h" -#include "../../src/common/utils.h" +#include <squareball.h> + #include "../../src/blogc/template-parser.h" static void -blogc_assert_template_node(bc_slist_t *l, const char *data, +blogc_assert_template_node(sb_slist_t *l, const char *data, const blogc_template_node_type_t type) { blogc_template_node_t *node = l->data; @@ -30,7 +30,7 @@ blogc_assert_template_node(bc_slist_t *l, const char *data, static void -blogc_assert_template_if_node(bc_slist_t *l, const char *variable, +blogc_assert_template_if_node(sb_slist_t *l, const char *variable, blogc_template_operator_t operator, const char *operand) { blogc_template_node_t *node = l->data; @@ -60,8 +60,8 @@ test_template_parse(void **state) "{%- foreach BOLA %}hahaha{% endforeach %}\n" "{% if BOLA == \"1\\\"0\" %}aee{% else %}fffuuuuuuu{% endif %}\n" "{% block listing_entry %}lol{% endblock %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "Test", @@ -78,7 +78,7 @@ test_template_parse(void **state) BLOGC_TEMPLATE_NODE_ENDIF); blogc_assert_template_node(ast->next->next->next->next->next->next, "\n", BLOGC_TEMPLATE_NODE_CONTENT); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, "BOLA", BLOGC_TEMPLATE_NODE_IFNDEF); blogc_assert_template_node(tmp->next, "\nbolao", BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(tmp->next->next, NULL, BLOGC_TEMPLATE_NODE_ENDIF); @@ -149,8 +149,8 @@ test_template_parse_crlf(void **state) "{% block listing_once %}asd{% endblock %}\r\n" "{%- foreach BOLA %}hahaha{% endforeach %}\r\n" "{% if BOLA == \"1\\\"0\" %}aee{% else %}fffuuuuuuu{% endif %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "Test", @@ -167,7 +167,7 @@ test_template_parse_crlf(void **state) BLOGC_TEMPLATE_NODE_ENDIF); blogc_assert_template_node(ast->next->next->next->next->next->next, "\r\n", BLOGC_TEMPLATE_NODE_CONTENT); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, "BOLA", BLOGC_TEMPLATE_NODE_IFNDEF); blogc_assert_template_node(tmp->next, "\r\nbolao", BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(tmp->next->next, NULL, BLOGC_TEMPLATE_NODE_ENDIF); @@ -241,8 +241,8 @@ test_template_parse_html(void **state) " {% block listing_once %}</ul>{% endblock %}\n" " </body>\n" "</html>\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "<html>\n <head>\n ", @@ -261,7 +261,7 @@ test_template_parse_html(void **state) "\n ", BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(ast->next->next->next->next->next->next->next, "listing_once", BLOGC_TEMPLATE_NODE_BLOCK); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, "\n <title>My cool blog - Main page</title>\n ", BLOGC_TEMPLATE_NODE_CONTENT); @@ -370,8 +370,8 @@ test_template_parse_html_whitespace(void **state) " {%\tblock\tlisting_once\t%}</ul>{%\nendblock\n%}\n" " </body>\n" "</html>\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "<html>\n <head>\n ", @@ -390,7 +390,7 @@ test_template_parse_html_whitespace(void **state) "\n ", BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(ast->next->next->next->next->next->next->next, "listing_once", BLOGC_TEMPLATE_NODE_BLOCK); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, "\n <title>My cool blog - Main page</title>\n ", BLOGC_TEMPLATE_NODE_CONTENT); @@ -480,8 +480,8 @@ test_template_parse_ifdef_and_var_outside_block(void **state) "{% ifdef GUDA %}bola{% endif %}\n" "{{ BOLA }}\n" "{% ifndef CHUNDA %}{{ CHUNDA }}{% endif %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "GUDA", BLOGC_TEMPLATE_NODE_IFDEF); @@ -497,7 +497,7 @@ test_template_parse_ifdef_and_var_outside_block(void **state) BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(ast->next->next->next->next->next->next, "CHUNDA", BLOGC_TEMPLATE_NODE_IFNDEF); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, "CHUNDA", BLOGC_TEMPLATE_NODE_VARIABLE); blogc_assert_template_node(tmp->next, NULL, BLOGC_TEMPLATE_NODE_ENDIF); blogc_assert_template_node(tmp->next->next, "\n", @@ -527,8 +527,8 @@ test_template_parse_nested_else(void **state) "bnm\n" "{% endif %}\n" "{% endif %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_null(err); assert_non_null(ast); blogc_assert_template_node(ast, "GUDA", BLOGC_TEMPLATE_NODE_IFDEF); @@ -544,7 +544,7 @@ test_template_parse_nested_else(void **state) "CHUNDA", BLOGC_TEMPLATE_NODE_IFDEF); blogc_assert_template_node(ast->next->next->next->next->next->next->next, "\nqwe\n", BLOGC_TEMPLATE_NODE_CONTENT); - bc_slist_t *tmp = ast->next->next->next->next->next->next->next->next; + sb_slist_t *tmp = ast->next->next->next->next->next->next->next->next; blogc_assert_template_node(tmp, NULL, BLOGC_TEMPLATE_NODE_ELSE); blogc_assert_template_node(tmp->next, "\nrty\n", BLOGC_TEMPLATE_NODE_CONTENT); blogc_assert_template_node(tmp->next->next, NULL, @@ -579,35 +579,32 @@ static void test_template_parse_invalid_block_start(void **state) { const char *a = "{% ASD %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Must begin with lowercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Must begin with lowercase letter.\n" "Error occurred near line 1, position 4: {% ASD %}"); - bc_error_free(err); + sb_error_free(err); a = "{%-- block entry %}\n"; err = NULL; ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Duplicated whitespace cleaner before statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Duplicated whitespace cleaner before statement.\n" "Error occurred near line 1, position 4: {%-- block entry %}"); - bc_error_free(err); + sb_error_free(err); a = "{% block entry --%}\n"; err = NULL; ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Duplicated whitespace cleaner after statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Duplicated whitespace cleaner after statement.\n" "Error occurred near line 1, position 17: {% block entry --%}"); - bc_error_free(err); + sb_error_free(err); } @@ -617,15 +614,14 @@ test_template_parse_invalid_block_nested(void **state) const char *a = "{% block entry %}\n" "{% block listing %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Blocks can't be nested.\n" + assert_string_equal(sb_error_to_string(err), + "template: Blocks can't be nested.\n" "Error occurred near line 2, position 9: {% block listing %}"); - bc_error_free(err); + sb_error_free(err); } @@ -635,15 +631,14 @@ test_template_parse_invalid_foreach_nested(void **state) const char *a = "{% foreach A %}\n" "{% foreach B %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'foreach' statements can't be nested.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'foreach' statements can't be nested.\n" "Error occurred near line 2, position 11: {% foreach B %}"); - bc_error_free(err); + sb_error_free(err); } @@ -651,15 +646,14 @@ static void test_template_parse_invalid_block_not_open(void **state) { const char *a = "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endblock' statement without an open 'block' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endblock' statement without an open 'block' statement.\n" "Error occurred near line 1, position 12: {% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -667,16 +661,15 @@ static void test_template_parse_invalid_endif_not_open(void **state) { const char *a = "{% block listing %}{% endif %}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endif' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endif' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" "Error occurred near line 1, position 28: " "{% block listing %}{% endif %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -684,16 +677,15 @@ static void test_template_parse_invalid_endif_not_open_inside_block(void **state) { const char *a = "{% ifdef BOLA %}{% block listing %}{% endif %}{% endblock %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endif' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endif' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" "Error occurred near line 1, position 44: {% ifdef BOLA %}{% block " "listing %}{% endif %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -701,16 +693,15 @@ static void test_template_parse_invalid_else_not_open_inside_block(void **state) { const char *a = "{% ifdef BOLA %}{% block listing %}{% else %}{% endif %}{% endblock %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'else' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'else' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" "Error occurred near line 1, position 43: {% ifdef BOLA %}" "{% block listing %}{% else %}{% endif %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -718,15 +709,14 @@ static void test_template_parse_invalid_endforeach_not_open(void **state) { const char *a = "{% endforeach %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endforeach' statement without an open 'foreach' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endforeach' statement without an open 'foreach' statement.\n" "Error occurred near line 1, position 14: {% endforeach %}"); - bc_error_free(err); + sb_error_free(err); } @@ -735,16 +725,15 @@ test_template_parse_invalid_endforeach_not_open_inside_block(void **state) { const char *a = "{% foreach TAGS %}{% block entry %}{% endforeach %}" "{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endforeach' statement without an open 'foreach' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endforeach' statement without an open 'foreach' statement.\n" "Error occurred near line 1, position 49: {% foreach TAGS %}" "{% block entry %}{% endforeach %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -753,16 +742,15 @@ test_template_parse_invalid_endforeach_not_open_inside_block2(void **state) { const char *a = "{% block entry %}{% foreach TAGS %}" "{% endforeach %}{% endforeach %}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'endforeach' statement without an open 'foreach' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'endforeach' statement without an open 'foreach' statement.\n" "Error occurred near line 1, position 65: {% block entry %}" "{% foreach TAGS %}{% endforeach %}{% endforeach %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -771,14 +759,13 @@ test_template_parse_invalid_endforeach_not_closed_inside_block(void **state) { const char *a = "{% block entry %}{% foreach TAGS %}{% endblock %}" "{% endforeach %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "An open 'foreach' statement was not closed inside a 'entry' block!"); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "template: An open 'foreach' statement was not closed inside a 'entry' block!"); + sb_error_free(err); } @@ -787,14 +774,13 @@ test_template_parse_invalid_endforeach_not_closed_inside_block2(void **state) { const char *a = "{% block entry %}{% foreach TAGS %}{% endforeach %}" "{% foreach TAGS %}{% endblock %}{% endforeach %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "An open 'foreach' statement was not closed inside a 'entry' block!"); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "template: An open 'foreach' statement was not closed inside a 'entry' block!"); + sb_error_free(err); } @@ -802,16 +788,15 @@ static void test_template_parse_invalid_block_name(void **state) { const char *a = "{% chunda %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement type: Allowed types are: 'block', 'endblock', 'if', " + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement type: Allowed types are: 'block', 'endblock', 'if', " "'ifdef', 'ifndef', 'else', 'endif', 'foreach' and 'endforeach'.\n" "Error occurred near line 1, position 10: {% chunda %}"); - bc_error_free(err); + sb_error_free(err); } @@ -819,15 +804,14 @@ static void test_template_parse_invalid_block_type_start(void **state) { const char *a = "{% block ENTRY %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid block syntax. Must begin with lowercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid block syntax. Must begin with lowercase letter.\n" "Error occurred near line 1, position 10: {% block ENTRY %}"); - bc_error_free(err); + sb_error_free(err); } @@ -835,16 +819,15 @@ static void test_template_parse_invalid_block_type(void **state) { const char *a = "{% block chunda %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid block type. Allowed types are: 'entry', 'listing', 'listing_once' " + assert_string_equal(sb_error_to_string(err), + "template: Invalid block type. Allowed types are: 'entry', 'listing', 'listing_once' " "and 'listing_entry'.\n" "Error occurred near line 1, position 16: {% block chunda %}"); - bc_error_free(err); + sb_error_free(err); } @@ -852,16 +835,15 @@ static void test_template_parse_invalid_ifdef_start(void **state) { const char *a = "{% block entry %}{% ifdef guda %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 27: " "{% block entry %}{% ifdef guda %}"); - bc_error_free(err); + sb_error_free(err); } @@ -869,16 +851,15 @@ static void test_template_parse_invalid_foreach_start(void **state) { const char *a = "{% block entry %}{% foreach guda %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid foreach variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid foreach variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 29: " "{% block entry %}{% foreach guda %}"); - bc_error_free(err); + sb_error_free(err); } @@ -886,16 +867,15 @@ static void test_template_parse_invalid_ifdef_variable(void **state) { const char *a = "{% block entry %}{% ifdef BoLA %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must be uppercase letter, number or '_'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must be uppercase letter, number or '_'.\n" "Error occurred near line 1, position 28: " "{% block entry %}{% ifdef BoLA %}"); - bc_error_free(err); + sb_error_free(err); } @@ -903,16 +883,15 @@ static void test_template_parse_invalid_ifdef_variable2(void **state) { const char *a = "{% block entry %}{% ifdef 0123 %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 27: " "{% block entry %}{% ifdef 0123 %}"); - bc_error_free(err); + sb_error_free(err); } @@ -920,16 +899,15 @@ static void test_template_parse_invalid_foreach_variable(void **state) { const char *a = "{% block entry %}{% foreach BoLA %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid foreach variable name. Must be uppercase letter, number or '_'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid foreach variable name. Must be uppercase letter, number or '_'.\n" "Error occurred near line 1, position 30: " "{% block entry %}{% foreach BoLA %}"); - bc_error_free(err); + sb_error_free(err); } @@ -937,16 +915,15 @@ static void test_template_parse_invalid_foreach_variable2(void **state) { const char *a = "{% block entry %}{% foreach 0123 %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid foreach variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid foreach variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 29: {% block entry %}" "{% foreach 0123 %}"); - bc_error_free(err); + sb_error_free(err); } @@ -954,16 +931,15 @@ static void test_template_parse_invalid_if_operator(void **state) { const char *a = "{% block entry %}{% if BOLA = \"asd\" %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid 'if' operator. Must be '<', '>', '<=', '>=', '==' or '!='.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid 'if' operator. Must be '<', '>', '<=', '>=', '==' or '!='.\n" "Error occurred near line 1, position 29: " "{% block entry %}{% if BOLA = \"asd\" %}"); - bc_error_free(err); + sb_error_free(err); } @@ -971,16 +947,15 @@ static void test_template_parse_invalid_if_operand(void **state) { const char *a = "{% block entry %}{% if BOLA == asd %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid 'if' operand. Must be double-quoted static string or variable.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid 'if' operand. Must be double-quoted static string or variable.\n" "Error occurred near line 1, position 32: " "{% block entry %}{% if BOLA == asd %}"); - bc_error_free(err); + sb_error_free(err); } @@ -988,16 +963,15 @@ static void test_template_parse_invalid_if_operand2(void **state) { const char *a = "{% block entry %}{% if BOLA == \"asd %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Found an open double-quoted string.\n" + assert_string_equal(sb_error_to_string(err), + "template: Found an open double-quoted string.\n" "Error occurred near line 1, position 32: " "{% block entry %}{% if BOLA == \"asd %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1005,16 +979,15 @@ static void test_template_parse_invalid_if_operand3(void **state) { const char *a = "{% block entry %}{% if BOLA == 0123 %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid 'if' operand. Must be double-quoted static string or variable.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid 'if' operand. Must be double-quoted static string or variable.\n" "Error occurred near line 1, position 32: " "{% block entry %}{% if BOLA == 0123 %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1022,15 +995,14 @@ static void test_template_parse_invalid_else1(void **state) { const char *a = "{% else %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "'else' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" + assert_string_equal(sb_error_to_string(err), + "template: 'else' statement without an open 'if', 'ifdef' or 'ifndef' statement.\n" "Error occurred near line 1, position 8: {% else %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1038,16 +1010,15 @@ static void test_template_parse_invalid_else2(void **state) { const char *a = "{% if BOLA == \"123\" %}{% if GUDA == \"1\" %}{% else %}{% else %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "More than one 'else' statement for an open 'if', 'ifdef' or 'ifndef' " + assert_string_equal(sb_error_to_string(err), + "template: More than one 'else' statement for an open 'if', 'ifdef' or 'ifndef' " "statement.\nError occurred near line 1, position 60: {% if BOLA == \"123\" " "%}{% if GUDA == \"1\" %}{% else %}{% else %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1062,15 +1033,14 @@ test_template_parse_invalid_else3(void **state) "{% endif %}\n" "{% else %}\n" "{% else %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "More than one 'else' statement for an open 'if', 'ifdef' or 'ifndef' " + assert_string_equal(sb_error_to_string(err), + "template: More than one 'else' statement for an open 'if', 'ifdef' or 'ifndef' " "statement.\nError occurred near line 7, position 8: {% else %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1078,15 +1048,14 @@ static void test_template_parse_invalid_block_end(void **state) { const char *a = "{% block entry }}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Must end with '%}'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Must end with '%}'.\n" "Error occurred near line 1, position 16: {% block entry }}"); - bc_error_free(err); + sb_error_free(err); } @@ -1094,16 +1063,15 @@ static void test_template_parse_invalid_variable_name(void **state) { const char *a = "{% block entry %}{{ bola }}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 21: " "{% block entry %}{{ bola }}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1111,16 +1079,15 @@ static void test_template_parse_invalid_variable_name2(void **state) { const char *a = "{% block entry %}{{ Bola }}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must be uppercase letter, number or '_'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must be uppercase letter, number or '_'.\n" "Error occurred near line 1, position 22: " "{% block entry %}{{ Bola }}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1128,16 +1095,15 @@ static void test_template_parse_invalid_variable_name3(void **state) { const char *a = "{% block entry %}{{ 0123 }}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid variable name. Must begin with uppercase letter.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid variable name. Must begin with uppercase letter.\n" "Error occurred near line 1, position 21: {% block entry %}{{ 0123 }}" "{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1145,16 +1111,15 @@ static void test_template_parse_invalid_variable_end(void **state) { const char *a = "{% block entry %}{{ BOLA %}{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Must end with '}}'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Must end with '}}'.\n" "Error occurred near line 1, position 26: " "{% block entry %}{{ BOLA %}{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1162,15 +1127,14 @@ static void test_template_parse_invalid_close(void **state) { const char *a = "{% block entry %%\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Must end with '}'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Must end with '}'.\n" "Error occurred near line 1, position 17: {% block entry %%"); - bc_error_free(err); + sb_error_free(err); } @@ -1178,16 +1142,15 @@ static void test_template_parse_invalid_close2(void **state) { const char *a = "{% block entry %}{{ BOLA }%{% endblock %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "Invalid statement syntax. Must end with '}'.\n" + assert_string_equal(sb_error_to_string(err), + "template: Invalid statement syntax. Must end with '}'.\n" "Error occurred near line 1, position 27: " "{% block entry %}{{ BOLA }%{% endblock %}"); - bc_error_free(err); + sb_error_free(err); } @@ -1195,14 +1158,14 @@ static void test_template_parse_invalid_endif_not_closed(void **state) { const char *a = "{% block entry %}{% endblock %}{% ifdef BOLA %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, "1 open 'if', 'ifdef' and/or 'ifndef' statements " + assert_string_equal(sb_error_to_string(err), + "template: 1 open 'if', 'ifdef' and/or 'ifndef' statements " "were not closed!"); - bc_error_free(err); + sb_error_free(err); } @@ -1210,15 +1173,14 @@ static void test_template_parse_invalid_endif_not_closed_inside_block(void **state) { const char *a = "{% block listing %}{% ifdef BOLA %}{% endblock %}{% endif %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "1 open 'if', 'ifdef' and/or 'ifndef' statements were not closed inside " + assert_string_equal(sb_error_to_string(err), + "template: 1 open 'if', 'ifdef' and/or 'ifndef' statements were not closed inside " "a 'listing' block!"); - bc_error_free(err); + sb_error_free(err); } @@ -1226,15 +1188,14 @@ static void test_template_parse_invalid_else_not_closed_inside_block(void **state) { const char *a = "{% block listing %}{% ifdef BOLA %}{% else %}{% endblock %}{% endif %}"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, - "1 open 'if', 'ifdef' and/or 'ifndef' statements were not closed inside " + assert_string_equal(sb_error_to_string(err), + "template: 1 open 'if', 'ifdef' and/or 'ifndef' statements were not closed inside " "a 'listing' block!"); - bc_error_free(err); + sb_error_free(err); } @@ -1242,13 +1203,13 @@ static void test_template_parse_invalid_block_not_closed(void **state) { const char *a = "{% block entry %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, "An open block was not closed!"); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "template: An open block was not closed!"); + sb_error_free(err); } @@ -1256,13 +1217,13 @@ static void test_template_parse_invalid_foreach_not_closed(void **state) { const char *a = "{% foreach ASD %}\n"; - bc_error_t *err = NULL; - bc_slist_t *ast = blogc_template_parse(a, strlen(a), &err); + sb_error_t *err = NULL; + sb_slist_t *ast = blogc_template_parse(a, strlen(a), &err); assert_non_null(err); assert_null(ast); - assert_int_equal(err->type, BLOGC_ERROR_TEMPLATE_PARSER); - assert_string_equal(err->msg, "An open 'foreach' statement was not closed!"); - bc_error_free(err); + assert_string_equal(sb_error_to_string(err), + "template: An open 'foreach' statement was not closed!"); + sb_error_free(err); } |