From db6807fd6644b1e129008ff9622384cef4e48654 Mon Sep 17 00:00:00 2001 From: Thomas Schmucker Date: Sun, 5 Jul 2020 11:54:28 +0200 Subject: Formatiere den Quellcode mit clang-format --- csv-test.c | 496 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 248 insertions(+), 248 deletions(-) (limited to 'csv-test.c') diff --git a/csv-test.c b/csv-test.c index 8fbcf42..238bf74 100644 --- a/csv-test.c +++ b/csv-test.c @@ -1,19 +1,19 @@ #undef NDEBUG +#include +#include #include #include #include -#include -#include #include "csv.h" -#define FMEMOPEN(f, data) \ - f = fmemopen(data, sizeof(data)-1, "r"); \ +#define FMEMOPEN(f, data) \ + f = fmemopen(data, sizeof(data) - 1, "r"); \ assert(f != NULL) #define FMEMCLOSE(f) \ - fclose(f); \ + fclose(f); \ f = NULL void @@ -21,13 +21,13 @@ test_empty_object(void) { { csv_t csv = { 0 }; - assert( csv_nfields(&csv) == 0 ); + assert(csv_nfields(&csv) == 0); } { csv_t csv; csv_init(&csv); - assert( csv_nfields(&csv) == 0 ); + assert(csv_nfields(&csv) == 0); } } @@ -42,19 +42,19 @@ test_line_endings1(void) FMEMOPEN(f, data); - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ), - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ), - assert( strcmp(csv_field(&csv, 0), "D") == 0 ); - assert( strcmp(csv_field(&csv, 1), "E") == 0 ); - assert( strcmp(csv_field(&csv, 2), "F") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "D") == 0); + assert(strcmp(csv_field(&csv, 1), "E") == 0); + assert(strcmp(csv_field(&csv, 2), "F") == 0); - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -70,19 +70,19 @@ test_line_endings2(void) FMEMOPEN(f, data); - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ), - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ), - assert( strcmp(csv_field(&csv, 0), "D") == 0 ); - assert( strcmp(csv_field(&csv, 1), "E") == 0 ); - assert( strcmp(csv_field(&csv, 2), "F") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "D") == 0); + assert(strcmp(csv_field(&csv, 1), "E") == 0); + assert(strcmp(csv_field(&csv, 2), "F") == 0); - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -95,143 +95,143 @@ test_empty_fields(void) char data[] = "\n" "\r" - "\r\n" - "\"\"\n" - "\"\"\r" - "\"\"\r\n" - ",\n" - ",\r" - ",\r\n" - "\"\",\"\"\n" - "\"\",\"\"\r" - "\"\",\"\"\r\n" - ",,\n" - ",,\r" - ",,\r\n" - "\"\",\"\",\n" - "\"\",\"\",\r" - "\"\",\"\",\r\n" - ",,"; + "\r\n" + "\"\"\n" + "\"\"\r" + "\"\"\r\n" + ",\n" + ",\r" + ",\r\n" + "\"\",\"\"\n" + "\"\",\"\"\r" + "\"\",\"\"\r\n" + ",,\n" + ",,\r" + ",,\r\n" + "\"\",\"\",\n" + "\"\",\"\",\r" + "\"\",\"\",\r\n" + ",,"; FMEMOPEN(f, data); // Line 1 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 2 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 3 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 4 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 5 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 6 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "") == 0); // Line 7 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 8 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 9 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 10 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 11 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 12 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); // Line 13 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 14 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 15 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 16 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 17 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 18 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // Line 19 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "") == 0 ); - assert( strcmp(csv_field(&csv, 1), "") == 0 ); - assert( strcmp(csv_field(&csv, 2), "") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "") == 0); + assert(strcmp(csv_field(&csv, 1), "") == 0); + assert(strcmp(csv_field(&csv, 2), "") == 0); // EOF - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -244,143 +244,143 @@ test_simple_fields(void) char data[] = "A\n" "A\r" - "A\r\n" - "\"A\"\n" - "\"A\"\r" - "\"A\"\r\n" - "A,B\n" - "A,B\r" - "A,B\r\n" - "\"A\",\"B\"\n" - "\"A\",\"B\"\r" - "\"A\",\"B\"\r\n" - "A,B,C\n" - "A,B,C\r" - "A,B,C\r\n" - "\"A\",\"B\",C\n" - "\"A\",\"B\",C\r" - "\"A\",\"B\",C\r\n" - "A,B,C"; + "A\r\n" + "\"A\"\n" + "\"A\"\r" + "\"A\"\r\n" + "A,B\n" + "A,B\r" + "A,B\r\n" + "\"A\",\"B\"\n" + "\"A\",\"B\"\r" + "\"A\",\"B\"\r\n" + "A,B,C\n" + "A,B,C\r" + "A,B,C\r\n" + "\"A\",\"B\",C\n" + "\"A\",\"B\",C\r" + "\"A\",\"B\",C\r\n" + "A,B,C"; FMEMOPEN(f, data); // Line 1 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 2 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 3 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 4 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 5 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 6 - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "A") == 0); // Line 7 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 8 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 9 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 10 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 11 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 12 - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); // Line 13 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 14 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 15 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 16 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 17 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 18 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // Line 19 - assert( csv_read(&csv, f) == 3 ); - assert( csv_nfields(&csv) == 3 ); - assert( strcmp(csv_field(&csv, 0), "A") == 0 ); - assert( strcmp(csv_field(&csv, 1), "B") == 0 ); - assert( strcmp(csv_field(&csv, 2), "C") == 0 ); + assert(csv_read(&csv, f) == 3); + assert(csv_nfields(&csv) == 3); + assert(strcmp(csv_field(&csv, 0), "A") == 0); + assert(strcmp(csv_field(&csv, 1), "B") == 0); + assert(strcmp(csv_field(&csv, 2), "C") == 0); // EOF - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -395,15 +395,15 @@ test_quoted_fields(void) FMEMOPEN(f, data); - assert( csv_read(&csv, f) == 5 ); - assert( csv_nfields(&csv) == 5 ), - assert( strcmp(csv_field(&csv, 0), "foo \"baz\" bar") == 0 ); - assert( strcmp(csv_field(&csv, 1), "foo \"\"baz\"\" bar") == 0 ); - assert( strcmp(csv_field(&csv, 2), "foo \"baz\" bar") == 0 ); - assert( strcmp(csv_field(&csv, 3), "foo \"baz\" bar") == 0 ); - assert( strcmp(csv_field(&csv, 4), "foo \"baz\", bar") == 0 ); + assert(csv_read(&csv, f) == 5); + assert(csv_nfields(&csv) == 5); + assert(strcmp(csv_field(&csv, 0), "foo \"baz\" bar") == 0); + assert(strcmp(csv_field(&csv, 1), "foo \"\"baz\"\" bar") == 0); + assert(strcmp(csv_field(&csv, 2), "foo \"baz\" bar") == 0); + assert(strcmp(csv_field(&csv, 3), "foo \"baz\" bar") == 0); + assert(strcmp(csv_field(&csv, 4), "foo \"baz\", bar") == 0); - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -418,11 +418,11 @@ test_wrong_quoted_field(void) FMEMOPEN(f, data); - assert( csv_read(&csv, f) == 1 ); - assert( csv_nfields(&csv) == 1 ), - assert( strcmp(csv_field(&csv, 0), "foo") == 0 ); + assert(csv_read(&csv, f) == 1); + assert(csv_nfields(&csv) == 1); + assert(strcmp(csv_field(&csv, 0), "foo") == 0); - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); FMEMCLOSE(f); } @@ -436,26 +436,26 @@ cb_error(csv_err_t err, void *cb_arg) void test_out_of_range_error(void) { - jmp_buf env; + jmp_buf env; csv_options_t csv_options = csv_default_options; - csv_options.cb_error = cb_error; - csv_options.cb_error_arg = &env; + csv_options.cb_error = cb_error; + csv_options.cb_error_arg = &env; csv_t csv; csv_init_opt(&csv, &csv_options); FILE *f; - char data[] = ","; + char data[] = ","; FMEMOPEN(f, data); switch ( setjmp(env) ) { case CSV_ERR_OK: - assert( csv_read(&csv, f) == 2 ); - assert( csv_nfields(&csv) == 2 ); + assert(csv_read(&csv, f) == 2); + assert(csv_nfields(&csv) == 2); // force an "out of range"-Exception! - assert( strcmp(csv_field(&csv, 2), "will fail") == 0 ); + assert(strcmp(csv_field(&csv, 2), "will fail") == 0); break; case CSV_ERR_OUT_OF_RANGE: @@ -472,21 +472,21 @@ test_out_of_range_error(void) void test_read_error(void) { - jmp_buf env; + jmp_buf env; csv_options_t csv_options = csv_default_options; - csv_options.cb_error = cb_error; - csv_options.cb_error_arg = &env; + csv_options.cb_error = cb_error; + csv_options.cb_error_arg = &env; csv_t csv; csv_init_opt(&csv, &csv_options); FILE *f = fopen("/dev/null", "r"); assert(f != NULL); - fputc('T', f); // Set Error-Flag! + fputc('T', f); // Set Error-Flag! switch ( setjmp(env) ) { case CSV_ERR_OK: - assert( csv_read(&csv, f) == EOF ); + assert(csv_read(&csv, f) == EOF); break; case CSV_ERR_IO_READ: @@ -546,11 +546,11 @@ test_allocation_error1(void) jmp_buf env; csv_options_t csv_options = csv_default_options; - csv_options.cb_error = cb_error; - csv_options.cb_error_arg = &env; - csv_options.cb_allocate = my_allocate; + csv_options.cb_error = cb_error; + csv_options.cb_error_arg = &env; + csv_options.cb_allocate = my_allocate; csv_options.cb_reallocate = my_reallocate; - csv_options.cb_free = my_free; + csv_options.cb_free = my_free; csv_t csv; csv_init_opt(&csv, &csv_options); @@ -563,7 +563,7 @@ test_allocation_error1(void) switch ( setjmp(env) ) { case CSV_ERR_OK: - assert( csv_read(&csv, f) == 20 ); + assert(csv_read(&csv, f) == 20); assert(!"this should not be happen!"); break; -- cgit v1.3