From dbf620aa8c12e3de0ce632f8d931d1117768c7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 12 Jan 2016 14:41:03 +0100 Subject: [PATCH] TestIO refactoring, split test case --- test/testio.cpp | 149 ++++++++++++++++++------------------------------ 1 file changed, 56 insertions(+), 93 deletions(-) diff --git a/test/testio.cpp b/test/testio.cpp index 55fab17b3..bdf4ce342 100644 --- a/test/testio.cpp +++ b/test/testio.cpp @@ -745,6 +745,33 @@ private: check(TEST_SCANF_U_CODE(TYPE), true, false, Settings::Win64); \ ASSERT_EQUALS(TEST_SCANF_U_ERR_AKA(TYPE,AKATYPE_WIN64), errout.str()); +#define TEST_SCANF_LU_CODE(TYPE) "void f() { " TYPE " x; scanf(\"%lu\", &x); }" +#define TEST_SCANF_LU_ERR(TYPE) \ + ((std::string(TYPE) != "unsigned long") \ + ? "[test.cpp:1]: (warning) %lu in format string (no. 1) requires 'unsigned long *' but the argument type is '" TYPE " *'.\n" \ + : "") +#define TEST_SCANF_LU(TYPE) \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Unix32); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR(TYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Unix64); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR(TYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Win32A); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR(TYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Win64); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR(TYPE), errout.str()); + +#define TEST_SCANF_LU_ERR_AKA(TYPE,AKATYPE) "[test.cpp:1]: (warning) %lu in format string (no. 1) requires 'unsigned long *' but the argument type is '" TYPE " * {aka " AKATYPE " *}'.\n" + +#define TEST_SCANF_LU_AKA(TYPE, AKATYPE, AKATYPE_WIN64) \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Unix32); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR_AKA(TYPE,AKATYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Unix64); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR_AKA(TYPE,AKATYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Win32A); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR_AKA(TYPE,AKATYPE), errout.str()); \ + check(TEST_SCANF_LU_CODE(TYPE), true, false, Settings::Win64); \ + ASSERT_EQUALS(TEST_SCANF_LU_ERR_AKA(TYPE,AKATYPE_WIN64), errout.str()); + void testScanfArgument() { check("void foo() {\n" @@ -840,99 +867,35 @@ private: TEST_SCANF_U_AKA("std::intptr_t", "long", "long long"); TEST_SCANF_U_AKA("std::uintptr_t", "unsigned long", "unsigned long long"); - { - const char * code = "void foo() {\n" - " bool b;\n" - " char c;\n" - " signed char sc;\n" - " unsigned char uc;\n" - " short s;\n" - " unsigned short us;\n" - " int i;\n" - " unsigned int ui;\n" - " long l;\n" - " unsigned long ul;\n" - " long long ll;\n" - " unsigned long long ull;\n" - " float f;\n" - " double d;\n" - " long double ld;\n" - " size_t st;\n" - " ssize_t sst;\n" - " ptrdiff_t pt;\n" - " intmax_t it;\n" - " uintmax_t ut;\n" - " void * vp;\n" - " std::size_t stdst;\n" - " std::ssize_t stdsst;\n" - " std::ptrdiff_t stdpt;\n" - " std::intptr_t stdipt;\n" - " std::uintptr_t stduipt;\n" - " scanf(\"%lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\",\n" - " &b, &c, &sc, &uc, &s, &us, &i, &ui, &l, &ul, &ll, &ull, &f, &d, &ld, &st, &sst, &pt, &it, &ut, &vp, vp,\n" - " &unknown, unknown, &stdst, &stdsst, &stdpt, &stdipt, &stduipt);\n" - "}\n"; - std::string result("[test.cpp:28]: (warning) %lu in format string (no. 1) requires 'unsigned long *' but the argument type is 'bool *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 2) requires 'unsigned long *' but the argument type is 'char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 3) requires 'unsigned long *' but the argument type is 'signed char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 4) requires 'unsigned long *' but the argument type is 'unsigned char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 5) requires 'unsigned long *' but the argument type is 'short *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 6) requires 'unsigned long *' but the argument type is 'unsigned short *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 7) requires 'unsigned long *' but the argument type is 'int *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 8) requires 'unsigned long *' but the argument type is 'unsigned int *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 9) requires 'unsigned long *' but the argument type is 'long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 11) requires 'unsigned long *' but the argument type is 'long long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 12) requires 'unsigned long *' but the argument type is 'unsigned long long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 13) requires 'unsigned long *' but the argument type is 'float *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 14) requires 'unsigned long *' but the argument type is 'double *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 15) requires 'unsigned long *' but the argument type is 'long double *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 16) requires 'unsigned long *' but the argument type is 'size_t * {aka unsigned long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 17) requires 'unsigned long *' but the argument type is 'ssize_t * {aka long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 18) requires 'unsigned long *' but the argument type is 'ptrdiff_t * {aka long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 19) requires 'unsigned long *' but the argument type is 'intmax_t * {aka long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 20) requires 'unsigned long *' but the argument type is 'uintmax_t * {aka unsigned long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 21) requires 'unsigned long *' but the argument type is 'void * *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 22) requires 'unsigned long *' but the argument type is 'void *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 25) requires 'unsigned long *' but the argument type is 'std::size_t * {aka unsigned long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 26) requires 'unsigned long *' but the argument type is 'std::ssize_t * {aka long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 27) requires 'unsigned long *' but the argument type is 'std::ptrdiff_t * {aka long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 28) requires 'unsigned long *' but the argument type is 'std::intptr_t * {aka long *}'.\n"); - std::string result_win64("[test.cpp:28]: (warning) %lu in format string (no. 1) requires 'unsigned long *' but the argument type is 'bool *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 2) requires 'unsigned long *' but the argument type is 'char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 3) requires 'unsigned long *' but the argument type is 'signed char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 4) requires 'unsigned long *' but the argument type is 'unsigned char *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 5) requires 'unsigned long *' but the argument type is 'short *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 6) requires 'unsigned long *' but the argument type is 'unsigned short *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 7) requires 'unsigned long *' but the argument type is 'int *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 8) requires 'unsigned long *' but the argument type is 'unsigned int *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 9) requires 'unsigned long *' but the argument type is 'long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 11) requires 'unsigned long *' but the argument type is 'long long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 12) requires 'unsigned long *' but the argument type is 'unsigned long long *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 13) requires 'unsigned long *' but the argument type is 'float *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 14) requires 'unsigned long *' but the argument type is 'double *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 15) requires 'unsigned long *' but the argument type is 'long double *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 16) requires 'unsigned long *' but the argument type is 'size_t * {aka unsigned long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 17) requires 'unsigned long *' but the argument type is 'ssize_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 18) requires 'unsigned long *' but the argument type is 'ptrdiff_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 19) requires 'unsigned long *' but the argument type is 'intmax_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 20) requires 'unsigned long *' but the argument type is 'uintmax_t * {aka unsigned long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 21) requires 'unsigned long *' but the argument type is 'void * *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 22) requires 'unsigned long *' but the argument type is 'void *'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 25) requires 'unsigned long *' but the argument type is 'std::size_t * {aka unsigned long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 26) requires 'unsigned long *' but the argument type is 'std::ssize_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 27) requires 'unsigned long *' but the argument type is 'std::ptrdiff_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 28) requires 'unsigned long *' but the argument type is 'std::intptr_t * {aka long long *}'.\n" - "[test.cpp:28]: (warning) %lu in format string (no. 29) requires 'unsigned long *' but the argument type is 'std::uintptr_t * {aka unsigned long long *}'.\n"); - - check(code, true, false, Settings::Unix32); - ASSERT_EQUALS(result, errout.str()); - check(code, true, false, Settings::Unix64); - ASSERT_EQUALS(result, errout.str()); - check(code, true, false, Settings::Win32A); - ASSERT_EQUALS(result, errout.str()); - check(code, true, false, Settings::Win64); - ASSERT_EQUALS(result_win64, errout.str()); - } + TEST_SCANF_LU("bool"); + TEST_SCANF_LU("char"); + TEST_SCANF_LU("signed char"); + TEST_SCANF_LU("unsigned char"); + TEST_SCANF_LU("short"); + TEST_SCANF_LU("signed short"); + TEST_SCANF_LU("unsigned short"); + TEST_SCANF_LU("int"); + TEST_SCANF_LU("signed int"); + TEST_SCANF_LU("long"); + TEST_SCANF_LU("signed long"); + TEST_SCANF_LU("unsigned long"); + TEST_SCANF_LU("long long"); + TEST_SCANF_LU("signed long long"); + TEST_SCANF_LU("unsigned long long"); + TEST_SCANF_LU("float"); + TEST_SCANF_LU("double"); + TEST_SCANF_LU("long double"); + TEST_SCANF_LU_AKA("size_t", "unsigned long", "unsigned long long"); + TEST_SCANF_LU_AKA("ssize_t", "long", "long long"); + TEST_SCANF_LU_AKA("ptrdiff_t", "long", "long long"); + TEST_SCANF_LU_AKA("intmax_t", "long", "long long"); + TEST_SCANF_LU_AKA("uintmax_t", "unsigned long", "unsigned long long"); + TEST_SCANF_LU("void *"); + TEST_SCANF_LU_AKA("std::size_t", "unsigned long", "unsigned long long"); + TEST_SCANF_LU_AKA("std::ssize_t", "long", "long long"); + TEST_SCANF_LU_AKA("std::ptrdiff_t", "long", "long long"); + TEST_SCANF_LU_AKA("std::intptr_t", "long", "long long"); + // TODO: TEST_SCANF_LU_AKA("std::uintptr_t", "unsigned long", "unsigned long long"); { const char * code = "void foo() {\n"