3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[A] Added tests

Browse Source
This commit is contained in:
seleznevae 2018-01-02 22:48:38 +03:00
parent 033506e7a9
commit e52347948c
6 changed files with 305 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/fort.h
View File

@ -69,6 +69,10 @@ SOFTWARE.
#endif #endif
#ifndef FORT_EXTERN
#define FORT_EXTERN extern
#endif
/* /*
* libfort structures and functions declarations * libfort structures and functions declarations
*/ */
@ -78,23 +82,23 @@ FORT_BEGIN_DECLS
struct fort_table; struct fort_table;
typedef struct fort_table FTABLE; typedef struct fort_table FTABLE;
FTABLE * ft_create_table(void); FORT_EXTERN FTABLE * ft_create_table(void);
void ft_destroy_table(FTABLE *FORT_RESTRICT table); FORT_EXTERN void ft_destroy_table(FTABLE *FORT_RESTRICT table);
int ft_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...); //FORT_EXTERN int ft_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...);
int ft_hdr_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...); FORT_EXTERN int ft_hdr_printf(FTABLE *FORT_RESTRICT table, const char* FORT_RESTRICT fmt, ...);
int ft_row_printf(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...); FORT_EXTERN int ft_row_printf(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, ...);
int ft_cell_printf(FTABLE *FORT_RESTRICT table, size_t row, size_t col, const char* FORT_RESTRICT fmt, ...); //FORT_EXTERN int ft_cell_printf(FTABLE *FORT_RESTRICT table, size_t row, size_t col, const char* FORT_RESTRICT fmt, ...);
char* ft_to_string(const FTABLE *FORT_RESTRICT table); FORT_EXTERN char* ft_to_string(const FTABLE *FORT_RESTRICT table);
ssize_t ft_n_to_string(const FTABLE *FORT_RESTRICT table, char *FORT_RESTRICT dst, size_t dst_len); //FORT_EXTERN ssize_t ft_n_to_string(const FTABLE *FORT_RESTRICT table, char *FORT_RESTRICT dst, size_t dst_len);
char* ft_header_to_string(const FTABLE *FORT_RESTRICT table); //FORT_EXTERN char* ft_header_to_string(const FTABLE *FORT_RESTRICT table);
ssize_t ft_n_header_to_string(const FTABLE *FORT_RESTRICT table, char *FORT_RESTRICT dst, size_t dst_len); //FORT_EXTERN ssize_t ft_n_header_to_string(const FTABLE *FORT_RESTRICT table, char *FORT_RESTRICT dst, size_t dst_len);
char* ft_row_to_string(const FTABLE *FORT_RESTRICT table, size_t row); //FORT_EXTERN char* ft_row_to_string(const FTABLE *FORT_RESTRICT table, size_t row);
ssize_t ft_n_row_to_string(const FTABLE *FORT_RESTRICT table, size_t row, char *FORT_RESTRICT dst, size_t dst_len); //FORT_EXTERN ssize_t ft_n_row_to_string(const FTABLE *FORT_RESTRICT table, size_t row, char *FORT_RESTRICT dst, size_t dst_len);
FORT_END_DECLS FORT_END_DECLS

166
src/fort.c
View File

@ -7,6 +7,8 @@
#include "wchar.h" #include "wchar.h"
#define FORT_COL_SEPARATOR '|' #define FORT_COL_SEPARATOR '|'
#define FORT_HOR_CELL_SEPARATOR '='
#define FORT_VER_CELL_SEPARATOR '|'
#define FORT_UNUSED __attribute__((unused)) #define FORT_UNUSED __attribute__((unused))
#define F_CALLOC calloc #define F_CALLOC calloc
@ -52,7 +54,21 @@ typedef int fort_status_t;
/***************************************************************************** /*****************************************************************************
* UTILITIES * UTILITIES
* ***************************************************************************/ * ***************************************************************************/
static int snprint_n_chars(char *buf, size_t length, size_t n, char ch)
{
if (length <= n)
return -1;
int status = snprintf(buf, length, "%0*d", (int)n, 0);
if (status < 0)
return status;
for (size_t i = 0; i < n; ++i) {
*buf = ch;
buf++;
}
return n;
}
/***************************************************************************** /*****************************************************************************
@ -131,14 +147,15 @@ struct cell_options
int padding_right; int padding_right;
}; };
typedef struct cell_options cell_options_t; typedef struct cell_options cell_options_t;
static cell_options_t g_cell_options = {1, 1, 1, 1};
static void init_cell_options(cell_options_t *options) static void init_cell_options(cell_options_t *options)
{ {
assert(options); assert(options);
options->padding_top = 1; options->padding_top = g_cell_options.padding_top;
options->padding_bottom = 1; options->padding_bottom = g_cell_options.padding_bottom;
options->padding_left = 1; options->padding_left = g_cell_options.padding_left;
options->padding_right = 1; options->padding_right = g_cell_options.padding_right;
} }
struct fort_cell; struct fort_cell;
@ -219,25 +236,22 @@ static int cell_printf(fort_cell_t *cell, size_t row, char *buf, size_t buf_len)
return -1; return -1;
} }
if (row < cell->options.padding_top if (row < cell->options.padding_top
|| row >= (cell->options.padding_top + buffer_text_height(cell->str_buffer))) { || row >= (cell->options.padding_top + buffer_text_height(cell->str_buffer))) {
for (int i = 0; i < (buf_len - 1); ++i) { int k = snprint_n_chars(buf, buf_len, buf_len - 1, ' ');
snprintf(buf, buf_len, "%c", ' '); return k;
}
return buf_len - 1;
} else { } else {
int written = 0; int written = 0;
int left = cell->options.padding_left; int left = cell->options.padding_left;
int right = cell->options.padding_right;
for (int i = 0; i < left; ++i) { written += snprint_n_chars(buf + written, buf_len - written, left, ' ');
written += snprintf(buf + written, buf_len - written, "%c", ' ');
}
written += buffer_printf(cell->str_buffer, row - cell->options.padding_top, buf + written, buf_len - written); if (cell->str_buffer)
while (written < (buf_len - 1)) { written += buffer_printf(cell->str_buffer, row - cell->options.padding_top, buf + written, buf_len - written - right);
written += snprintf(buf + written, buf_len - written, "%c", ' '); else
} written += snprint_n_chars(buf + written, buf_len - written, buf_len - written - right, ' ');
written += snprint_n_chars(buf + written, buf_len - written, right, ' ');
return written; return written;
} }
@ -303,7 +317,7 @@ static fort_cell_t *get_cell(fort_row_t *row, size_t col)
} }
if (col < columns_in_row(row)) { if (col < columns_in_row(row)) {
return vector_at(row->cells, col); return *(fort_cell_t**)vector_at(row->cells, col);
} }
return NULL; return NULL;
} }
@ -336,7 +350,7 @@ static fort_row_t *get_row(fort_table_t *table, size_t row)
size_t rows = vector_size(table->rows); size_t rows = vector_size(table->rows);
if (row < rows) { if (row < rows) {
return vector_at(table->rows, row); return *(fort_row_t**)vector_at(table->rows, row);
} }
return NULL; return NULL;
} }
@ -414,7 +428,7 @@ void ft_destroy_table(FTABLE *FORT_RESTRICT table)
int ft_row_printf_impl(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, va_list *va) static int ft_row_printf_impl(FTABLE *FORT_RESTRICT table, size_t row, const char* FORT_RESTRICT fmt, va_list *va)
{ {
if (table == NULL) if (table == NULL)
return -1; return -1;
@ -784,12 +798,38 @@ clear:
return NULL; return NULL;
} }
static int snprintf_row(const fort_row_t *row, char *buffer, size_t buf_sz, size_t *col_width_arr, size_t col_width_arr_sz,
size_t row_height)
{
if (row == NULL)
return -1;
int cols_in_row = columns_in_row(row);
if (cols_in_row > col_width_arr_sz)
return -1;
int dev = 0;
for (size_t i = 0; i < row_height; ++i) {
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, FORT_VER_CELL_SEPARATOR);
for (size_t j = 0; j < col_width_arr_sz; ++j) {
if (j < cols_in_row) {
fort_cell_t *cell = *(fort_cell_t**)vector_at(row->cells, j);
dev += cell_printf(cell, i, buffer + dev, col_width_arr[j] + 1);
} else {
dev += snprint_n_chars(buffer + dev, buf_sz - dev, col_width_arr[j], ' ');
}
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, FORT_VER_CELL_SEPARATOR);
}
dev += snprint_n_chars(buffer + dev, buf_sz - dev, 1, '\n');
}
return dev;
}
/***************************************************************************** /*****************************************************************************
* TABLE * TABLE
* ***************************************************************************/ * ***************************************************************************/
static int print_row(char *buffer, const fort_row_t *row) static int print_row(char *buffer, size_t buf_len, const fort_row_t *row)
{ {
assert(row); assert(row);
ssize_t pos = 0; ssize_t pos = 0;
@ -810,6 +850,7 @@ static fort_status_t get_table_sizes(const FTABLE *table, size_t *rows, size_t *
*rows = 0; *rows = 0;
*cols = 0; *cols = 0;
if (table && table->rows) { if (table && table->rows) {
*rows = vector_size(table->rows);
fort_row_t *row = NULL; fort_row_t *row = NULL;
FOR_EACH(fort_row_t*, row, table->rows) { FOR_EACH(fort_row_t*, row, table->rows) {
size_t cols_in_row = columns_in_row(row); size_t cols_in_row = columns_in_row(row);
@ -895,37 +936,10 @@ static fort_status_t table_geometry(const FTABLE *table, size_t *height, size_t
} }
char* ft_to_string(const FTABLE *FORT_RESTRICT table)
{
assert(table);
char *dummy = F_MALLOC(2056);
int dev = 0;
size_t rows = vector_size(table->rows);
for (size_t i = 0; i < rows; ++i) {
fort_row_t *row = *(fort_row_t**)vector_at(table->rows, i);
dev += print_row(dummy + dev, row);
sprintf(dummy + dev , "\n");
dev += 1;
}
return dummy;
}
//char* ft_to_string(const FTABLE *FORT_RESTRICT table) //char* ft_to_string(const FTABLE *FORT_RESTRICT table)
//{ //{
// assert(table); // assert(table);
// char *dummy = F_MALLOC(2056);
// size_t height = 0;
// size_t width = 0;
// int status = table_geometry(table, &height, &width);
// if (IS_ERROR(status)) {
// return NULL;
// }
// fprintf(stderr, "width = %d ; height = %d\n", (int)width, (int)height);
// size_t sz = height * width + 10;
// char *dummy = F_MALLOC(sz);
// int dev = 0; // int dev = 0;
// size_t rows = vector_size(table->rows); // size_t rows = vector_size(table->rows);
@ -940,6 +954,62 @@ char* ft_to_string(const FTABLE *FORT_RESTRICT table)
//} //}
char* ft_to_string(const FTABLE *FORT_RESTRICT table)
{
#define CHECK_RESULT_AND_MOVE_DEV(statement) \
k = statement; \
if (k < 0) {\
goto clear; \
} \
dev += k;
assert(table);
size_t height = 0;
size_t width = 0;
int status = table_geometry(table, &height, &width);
if (IS_ERROR(status)) {
return NULL;
}
size_t sz = height * width + 1;
char *buffer = F_MALLOC(sz);
if (buffer == NULL)
return NULL;
size_t cols = 0;
size_t rows = 0;
size_t *col_width_arr = NULL;
size_t *row_height_arr = NULL;
status = table_rows_and_cols_geometry(table, &col_width_arr, &cols, &row_height_arr, &rows);
if (IS_ERROR(status))
return NULL;
int dev = 0;
int k = 0;
CHECK_RESULT_AND_MOVE_DEV(snprint_n_chars(buffer + dev, sz - dev, width - 1, FORT_HOR_CELL_SEPARATOR));
CHECK_RESULT_AND_MOVE_DEV(snprint_n_chars(buffer + dev, sz - dev, 1, '\n'));
for (size_t i = 0; i < rows; ++i) {
fort_row_t *row = *(fort_row_t**)vector_at(table->rows, i);
CHECK_RESULT_AND_MOVE_DEV(snprintf_row(row, buffer + dev, sz - dev, col_width_arr, cols, row_height_arr[i]));
CHECK_RESULT_AND_MOVE_DEV(snprint_n_chars(buffer + dev, sz - dev, width - 1, FORT_HOR_CELL_SEPARATOR));
CHECK_RESULT_AND_MOVE_DEV(snprint_n_chars(buffer + dev, sz - dev, 1, '\n'));
}
F_FREE(col_width_arr);
F_FREE(row_height_arr);
return buffer;
clear:
F_FREE(col_width_arr);
F_FREE(row_height_arr);
F_FREE(buffer);
return NULL;
}

11
src/fort_impl.h
View File

@ -1,11 +0,0 @@
#ifndef FORT_IMPL_H
#define FORT_IMPL_H
#include "fort.h"
#endif // FORT_IMPL_H

1
tests/test.c
View File

@ -4,6 +4,7 @@
int main(void) { int main(void) {
const struct CMUnitTest tests[] = { const struct CMUnitTest tests[] = {
cmocka_unit_test(test_vector_basic), cmocka_unit_test(test_vector_basic),
cmocka_unit_test(test_table_sizes),
cmocka_unit_test(test_table_geometry), cmocka_unit_test(test_table_geometry),
cmocka_unit_test(test_table_basic) cmocka_unit_test(test_table_basic)
}; };

185
tests/test_table.c
View File

@ -1,3 +1,4 @@
#define FORT_EXTERN static
#include "tests.h" #include "tests.h"
#include "fort.h" #include "fort.h"
#include <string.h> #include <string.h>
@ -5,19 +6,86 @@
#include <stdio.h> #include <stdio.h>
#include "fort.c" #include "fort.c"
void test_table_sizes(void **state)
{
(void)state;
FTABLE *table = ft_create_table();
size_t rows = 0;
size_t cols = 0;
int status = F_SUCCESS;
WHEN("Table is empty") {
status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) );
assert_true( rows == 0 );
assert_true( cols == 0 );
}
WHEN("Insert one cell") {
int n = ft_hdr_printf(table, "%c", 'c');
assert_true( n == 1 );
status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) );
assert_true( rows == 1 );
assert_true( cols == 1 );
}
WHEN("Insert two cells in the next row") {
int n = ft_row_printf(table, 1, "%c|%c", 'c', 'd');
assert_true( n == 2 );
status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) );
assert_true( rows == 2 );
assert_true( cols == 2 );
}
WHEN("Insert five cells in the next row") {
int n = ft_row_printf(table, 2, "%d|%d|%d|%d|%d", 1, 2, 3, 4, 5);
assert_true( n == 5 );
status = get_table_sizes(table, &rows, &cols);
assert_true( IS_SUCCESS(status) );
assert_true( rows == 3 );
assert_true( cols == 5 );
}
ft_destroy_table(table);
}
void test_table_geometry(void **state) void test_table_geometry(void **state)
{ {
(void)state; (void)state;
FTABLE *table = ft_create_table(); FTABLE *table = ft_create_table();
int n = ft_hdr_printf(table, "%c", 'c');
assert_true( n == 1 );
size_t height = 0; size_t height = 0;
size_t width = 0; size_t width = 0;
int status = table_geometry(table, &height, &width); int status = F_SUCCESS;
assert_true( IS_SUCCESS(status) );
WHEN("Table is empty") {
status = table_geometry(table, &height, &width);
assert_true( IS_SUCCESS(status) );
assert_true( height == 2 );
assert_true( width == 3 );
}
WHEN("Table has one cell") {
int n = ft_hdr_printf(table, "%c", 'c');
assert_true( n == 1 );
status = table_geometry(table, &height, &width);
assert_true( IS_SUCCESS(status) );
assert_true( height == 5 );
assert_true( width == 6 );
}
WHEN("Inserting 3 cells in the next row") {
int n = ft_row_printf(table, 1, "%c|%s|%c", 'c', "as", 'e');
assert_true( n == 3 );
status = table_geometry(table, &height, &width);
assert_true( IS_SUCCESS(status) );
assert_true( height == 9 );
assert_true( width == 15 );
}
ft_destroy_table(table); ft_destroy_table(table);
} }
@ -27,30 +95,107 @@ void test_table_basic(void **state)
(void)state; (void)state;
FTABLE *table = ft_create_table(); FTABLE *table = ft_create_table();
int n = ft_hdr_printf(table, "%d , %c|| %s|%f", 3, 'c', "234", 3.14); WHEN("All columns are equal and not empty") {
int n = ft_hdr_printf(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = ft_row_printf(table, 1, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
n = ft_row_printf(table, 1, "%d , %c|| %s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = ft_row_printf(table, 2, "%d , %c|| %s|%f", 3, 'c', "234", 3.14); n = ft_row_printf(table, 2, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 ); assert_true( n == 4 );
n = ft_row_printf(table, 4, "%d , %c|| %s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 );
char *table_str = ft_to_string(table); char *table_str = ft_to_string(table);
assert_true( table_str != NULL );
const char *table_str_etalon = const char *table_str_etalon =
"| 3 , c| | 234| 3.140000\n" "==========================\n"
"| 3 , c| | 234| 3.140000\n" "| | | | |\n"
"| 3 , c| | 234| 3.140000\n" "| 3 | c | 234 | 3.140000 |\n"
"\n" "| | | | |\n"
"| 3 , c| | 234| 3.140000\n"; "==========================\n"
fprintf(stderr, "%s", table_str); "| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n"
"==========================\n"
"| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n"
"==========================\n";
// fprintf(stderr, "content:\n%s", table_str);
assert_true( strcmp(table_str, table_str_etalon) == 0); assert_true( strcmp(table_str, table_str_etalon) == 0);
free(table_str); free(table_str);
ft_destroy_table(table); ft_destroy_table(table);
} }
WHEN("All columns are not equal and not empty") {
table = ft_create_table();
int n = ft_hdr_printf(table, "%d|%c|%s|%f", 3, 'c', "234", 3.14);
assert_true( n == 4 );
n = ft_row_printf(table, 1, "%c|%s|%f|%d", 'c', "234", 3.14, 3);
assert_true( n == 4 );
n = ft_row_printf(table, 2, "%s|%f|%d|%c", "234", 3.14, 3, 'c');
assert_true( n == 4 );
char *table_str = ft_to_string(table);
assert_true( table_str != NULL );
const char *table_str_etalon =
"========================================\n"
"| | | | |\n"
"| 3 | c | 234 | 3.140000 |\n"
"| | | | |\n"
"========================================\n"
"| | | | |\n"
"| c | 234 | 3.140000 | 3 |\n"
"| | | | |\n"
"========================================\n"
"| | | | |\n"
"| 234 | 3.140000 | 3 | c |\n"
"| | | | |\n"
"========================================\n";
// fprintf(stderr, "content:\n%s", table_str);
assert_true( strcmp(table_str, table_str_etalon) == 0);
free(table_str);
ft_destroy_table(table);
}
WHEN("All columns are not equal and some cells are empty") {
table = ft_create_table();
int n = ft_hdr_printf(table, "||%s|%f", "234", 3.14);
assert_true( n == 4 );
n = ft_row_printf(table, 1, "%c|%s|%f", 'c', "234", 3.14);
assert_true( n == 3 );
n = ft_row_printf(table, 2, "%s|%f||%c", "234", 3.14, 'c');
assert_true( n == 4 );
char *table_str = ft_to_string(table);
assert_true( table_str != NULL );
const char *table_str_etalon =
"========================================\n"
"| | | | |\n"
"| | | 234 | 3.140000 |\n"
"| | | | |\n"
"========================================\n"
"| | | | |\n"
"| c | 234 | 3.140000 | |\n"
"| | | | |\n"
"========================================\n"
"| | | | |\n"
"| 234 | 3.140000 | | c |\n"
"| | | | |\n"
"========================================\n";
// fprintf(stderr, "content:\n%s", table_str);
assert_true( strcmp(table_str, table_str_etalon) == 0);
free(table_str);
ft_destroy_table(table);
}
}

1
tests/tests.h
View File

@ -12,6 +12,7 @@
void test_vector_basic(void **state); void test_vector_basic(void **state);
void test_table_sizes(void **state);
void test_table_geometry(void **state); void test_table_geometry(void **state);
void test_table_basic(void **state); void test_table_basic(void **state);