2020-10-10 21:50:14

by Arpitha Raghunandan

Subject: [PATCH 2/2] fs: ext4: Modify inode-test.c to use KUnit parameterized testing feature

Modifies fs/ext4/inode-test.c to use the parameterized testing
feature of KUnit.

Signed-off-by: Arpitha Raghunandan <[email protected]>
---
fs/ext4/inode-test.c | 64 +++++++++++++++++++++++++-------------------
1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/fs/ext4/inode-test.c b/fs/ext4/inode-test.c
index d62d802c9c12..691ef0a4ffe1 100644
--- a/fs/ext4/inode-test.c
+++ b/fs/ext4/inode-test.c
@@ -72,6 +72,8 @@
#define UPPER_BOUND_NONNEG_EXTRA_BITS_1_CASE\
"2446-05-10 Upper bound of 32bit >=0 timestamp. All extra sec bits on"

+#define NUMBER_OF_TESTCASES 16
+
struct timestamp_expectation {
const char *test_case_name;
struct timespec64 expected;
@@ -101,7 +103,36 @@ static time64_t get_32bit_time(const struct timestamp_expectation * const test)
*/
static void inode_test_xtimestamp_decoding(struct kunit *test)
{
- const struct timestamp_expectation test_data[] = {
+ struct timespec64 timestamp;
+
+ struct timestamp_expectation *test_data =
+ (struct timestamp_expectation *)get_test_case_parameters(test);
+
+ timestamp.tv_sec = get_32bit_time(test_data);
+ ext4_decode_extra_time(&timestamp,
+ cpu_to_le32(test_data->extra_bits));
+
+ KUNIT_EXPECT_EQ_MSG(test,
+ test_data->expected.tv_sec,
+ timestamp.tv_sec,
+ CASE_NAME_FORMAT,
+ test_data->test_case_name,
+ test_data->msb_set,
+ test_data->lower_bound,
+ test_data->extra_bits);
+ KUNIT_EXPECT_EQ_MSG(test,
+ test_data->expected.tv_nsec,
+ timestamp.tv_nsec,
+ CASE_NAME_FORMAT,
+ test_data->test_case_name,
+ test_data->msb_set,
+ test_data->lower_bound,
+ test_data->extra_bits);
+}
+
+struct timestamp_expectation *get_test_parameters(void)
+{
+ static struct timestamp_expectation test_data[] = {
{
.test_case_name = LOWER_BOUND_NEG_NO_EXTRA_BITS_CASE,
.msb_set = true,
@@ -231,36 +262,13 @@ static void inode_test_xtimestamp_decoding(struct kunit *test)
.expected = {.tv_sec = 0x37fffffffLL, .tv_nsec = 0L},
}
};
-
- struct timespec64 timestamp;
- int i;
-
- for (i = 0; i < ARRAY_SIZE(test_data); ++i) {
- timestamp.tv_sec = get_32bit_time(&test_data[i]);
- ext4_decode_extra_time(&timestamp,
- cpu_to_le32(test_data[i].extra_bits));
-
- KUNIT_EXPECT_EQ_MSG(test,
- test_data[i].expected.tv_sec,
- timestamp.tv_sec,
- CASE_NAME_FORMAT,
- test_data[i].test_case_name,
- test_data[i].msb_set,
- test_data[i].lower_bound,
- test_data[i].extra_bits);
- KUNIT_EXPECT_EQ_MSG(test,
- test_data[i].expected.tv_nsec,
- timestamp.tv_nsec,
- CASE_NAME_FORMAT,
- test_data[i].test_case_name,
- test_data[i].msb_set,
- test_data[i].lower_bound,
- test_data[i].extra_bits);
- }
+ return test_data;
}

static struct kunit_case ext4_inode_test_cases[] = {
- KUNIT_CASE(inode_test_xtimestamp_decoding),
+ KUNIT_CASE_PARAM(inode_test_xtimestamp_decoding,
+ get_test_parameters, NUMBER_OF_TESTCASES,
+ sizeof(struct timestamp_expectation)),
{}
};

--
2.25.1