From 2db68cc29915e46b7b50c648191c440c3a67c9c7 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Sat, 28 Nov 2015 13:50:24 -0500 Subject: [PATCH] over-eager signed-char work was done on https://github.com/johnkerl/miller/commit/353a903646799f2eef373b401cbb604a4b86e9fb --- c/unit_test/test_byte_readers.c | 64 +++++++++++++++++---------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/c/unit_test/test_byte_readers.c b/c/unit_test/test_byte_readers.c index cc5a83005..0114b5400 100644 --- a/c/unit_test/test_byte_readers.c +++ b/c/unit_test/test_byte_readers.c @@ -17,16 +17,18 @@ static char* test_string_byte_reader() { int ok = pbr->popen_func(pbr, ""); mu_assert_lf(ok == TRUE); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); // char defaults to unsigned on some platforms - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + // char defaults to unsigned on some platforms -- but, byte_reader_t API is + // in terms of ints. + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); pbr->pclose_func(pbr); ok = pbr->popen_func(pbr, "a"); mu_assert_lf(ok == TRUE); mu_assert_lf(pbr->pread_func(pbr) == 'a'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); pbr->pclose_func(pbr); ok = pbr->popen_func(pbr, "abc"); @@ -34,8 +36,8 @@ static char* test_string_byte_reader() { mu_assert_lf(pbr->pread_func(pbr) == 'a'); mu_assert_lf(pbr->pread_func(pbr) == 'b'); mu_assert_lf(pbr->pread_func(pbr) == 'c'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); pbr->pclose_func(pbr); return NULL; @@ -49,9 +51,9 @@ static char* test_stdio_byte_reader_1() { char* path = write_temp_file_or_die(contents); int ok = pbr->popen_func(pbr, path); mu_assert_lf(ok == TRUE); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL; @@ -72,9 +74,9 @@ static char* test_stdio_byte_reader_2() { mu_assert_lf(pbr->pread_func(pbr) == 'e'); mu_assert_lf(pbr->pread_func(pbr) == 'f'); mu_assert_lf(pbr->pread_func(pbr) == 'g'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL; @@ -91,9 +93,9 @@ static char* test_stdio_byte_reader_reuse() { mu_assert_lf(pbr->pread_func(pbr) == 'a'); mu_assert_lf(pbr->pread_func(pbr) == 'b'); mu_assert_lf(pbr->pread_func(pbr) == 'c'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); contents = "defg"; @@ -104,9 +106,9 @@ static char* test_stdio_byte_reader_reuse() { mu_assert_lf(pbr->pread_func(pbr) == 'e'); mu_assert_lf(pbr->pread_func(pbr) == 'f'); mu_assert_lf(pbr->pread_func(pbr) == 'g'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL; @@ -120,9 +122,9 @@ static char* test_mmap_byte_reader_1() { char* path = write_temp_file_or_die(contents); int ok = pbr->popen_func(pbr, path); mu_assert_lf(ok == TRUE); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL; @@ -143,9 +145,9 @@ static char* test_mmap_byte_reader_2() { mu_assert_lf(pbr->pread_func(pbr) == 'e'); mu_assert_lf(pbr->pread_func(pbr) == 'f'); mu_assert_lf(pbr->pread_func(pbr) == 'g'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL; @@ -162,9 +164,9 @@ static char* test_mmap_byte_reader_reuse() { mu_assert_lf(pbr->pread_func(pbr) == 'a'); mu_assert_lf(pbr->pread_func(pbr) == 'b'); mu_assert_lf(pbr->pread_func(pbr) == 'c'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); contents = "defg"; @@ -175,9 +177,9 @@ static char* test_mmap_byte_reader_reuse() { mu_assert_lf(pbr->pread_func(pbr) == 'e'); mu_assert_lf(pbr->pread_func(pbr) == 'f'); mu_assert_lf(pbr->pread_func(pbr) == 'g'); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); - mu_assert_lf(pbr->pread_func(pbr) == (char)EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); + mu_assert_lf(pbr->pread_func(pbr) == EOF); unlink_file_or_die(path); return NULL;