1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-30 19:23:04 +03:00

Cleanup pgPageChecksum() test in postgres/interface module.

Some of the comments were wrong or inconsistent.

Update TEST_RESULT_U16_HEX() to the less-specific TEST_RESULT_UINT_HEX().
This commit is contained in:
David Steele
2020-03-06 15:01:50 -05:00
parent 438b957f9c
commit 54bc3b454a
2 changed files with 4 additions and 8 deletions

View File

@ -347,15 +347,14 @@ Macros to ease the use of common data types
#define TEST_RESULT_Z_STR(statement, resultExpected, ...) \ #define TEST_RESULT_Z_STR(statement, resultExpected, ...) \
TEST_RESULT_Z(statement, strPtr(resultExpected), __VA_ARGS__); TEST_RESULT_Z(statement, strPtr(resultExpected), __VA_ARGS__);
#define TEST_RESULT_U16_HEX(statement, resultExpected, ...) \
TEST_RESULT(statement, resultExpected, uint16_t, "%04X", TEST_TYPE_FORMAT, ==, TEST_TYPE_COMPARE, __VA_ARGS__);
#define TEST_RESULT_UINT_PARAM(statement, resultExpected, typeOp, ...) \ #define TEST_RESULT_UINT_PARAM(statement, resultExpected, typeOp, ...) \
TEST_RESULT(statement, resultExpected, uint64_t, "%" PRIu64, TEST_TYPE_FORMAT, typeOp, TEST_TYPE_COMPARE, __VA_ARGS__); TEST_RESULT(statement, resultExpected, uint64_t, "%" PRIu64, TEST_TYPE_FORMAT, typeOp, TEST_TYPE_COMPARE, __VA_ARGS__);
#define TEST_RESULT_UINT(statement, resultExpected, ...) \ #define TEST_RESULT_UINT(statement, resultExpected, ...) \
TEST_RESULT_UINT_PARAM(statement, resultExpected, ==, __VA_ARGS__); TEST_RESULT_UINT_PARAM(statement, resultExpected, ==, __VA_ARGS__);
#define TEST_RESULT_UINT_NE(statement, resultExpected, ...) \ #define TEST_RESULT_UINT_NE(statement, resultExpected, ...) \
TEST_RESULT_UINT_PARAM(statement, resultExpected, !=, __VA_ARGS__); TEST_RESULT_UINT_PARAM(statement, resultExpected, !=, __VA_ARGS__);
#define TEST_RESULT_UINT_HEX(statement, resultExpected, ...) \
TEST_RESULT(statement, resultExpected, uint64_t, "%" PRIx64, TEST_TYPE_FORMAT, ==, TEST_TYPE_COMPARE, __VA_ARGS__);
/*********************************************************************************************************************************** /***********************************************************************************************************************************
Test system calls Test system calls

View File

@ -182,13 +182,10 @@ testRun(void)
if (testBegin("pgPageChecksum()")) if (testBegin("pgPageChecksum()"))
{ {
unsigned char page[PG_PAGE_SIZE_DEFAULT]; unsigned char page[PG_PAGE_SIZE_DEFAULT];
// Checksum for 0xFF fill, page 0x00
memset(page, 0xFF, PG_PAGE_SIZE_DEFAULT); memset(page, 0xFF, PG_PAGE_SIZE_DEFAULT);
TEST_RESULT_U16_HEX(pgPageChecksum(page, 0), 0x0E1C, "check for 0xFF filled page, block 0");
// Checksum for 0xFF fill, page 0xFF TEST_RESULT_UINT_HEX(pgPageChecksum(page, 0), 0x0E1C, "check 0xFF filled page, block 0");
TEST_RESULT_U16_HEX(pgPageChecksum(page, 999), 0x0EC3, "check for 0xFF filled page, block 999"); TEST_RESULT_UINT_HEX(pgPageChecksum(page, 999), 0x0EC3, "check 0xFF filled page, block 999");
} }
// ***************************************************************************************************************************** // *****************************************************************************************************************************