From 384a498762dada6a7a3b1d3c91beaa8db412eb5a Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Tue, 18 Apr 2023 14:55:43 -0500 Subject: [PATCH] Extend dir seek tests to include seeking to end of directory --- tests/test_dirs.toml | 99 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 91 insertions(+), 8 deletions(-) diff --git a/tests/test_dirs.toml b/tests/test_dirs.toml index 6300f8c1..7ff46e61 100644 --- a/tests/test_dirs.toml +++ b/tests/test_dirs.toml @@ -727,7 +727,8 @@ code = ''' } lfs_unmount(&lfs) => 0; - for (int j = 2; j < COUNT + 2; j++) { + // try seeking to each dir entry + for (int j = 0; j < COUNT; j++) { lfs_mount(&lfs, &cfg) => 0; lfs_dir_open(&lfs, &dir, "hello") => 0; lfs_dir_read(&lfs, &dir, &info) => 1; @@ -737,15 +738,14 @@ code = ''' assert(strcmp(info.name, "..") == 0); assert(info.type == LFS_TYPE_DIR); - lfs_soff_t pos; for (int i = 0; i < j; i++) { sprintf(path, "kitty%03d", i); lfs_dir_read(&lfs, &dir, &info) => 1; assert(strcmp(info.name, path) == 0); assert(info.type == LFS_TYPE_DIR); - pos = lfs_dir_tell(&lfs, &dir); - assert(pos >= 0); } + lfs_soff_t pos = lfs_dir_tell(&lfs, &dir); + assert(pos >= 0); lfs_dir_seek(&lfs, &dir, pos) => 0; sprintf(path, "kitty%03d", j); @@ -774,6 +774,48 @@ code = ''' lfs_dir_close(&lfs, &dir) => 0; lfs_unmount(&lfs) => 0; } + + // try seeking to end of dir + lfs_mount(&lfs, &cfg) => 0; + lfs_dir_open(&lfs, &dir, "hello") => 0; + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, ".") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, "..") == 0); + assert(info.type == LFS_TYPE_DIR); + + for (int i = 0; i < COUNT; i++) { + sprintf(path, "kitty%03d", i); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, path) == 0); + assert(info.type == LFS_TYPE_DIR); + } + lfs_soff_t pos = lfs_dir_tell(&lfs, &dir); + assert(pos >= 0); + + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_seek(&lfs, &dir, pos) => 0; + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_rewind(&lfs, &dir) => 0; + sprintf(path, "kitty%03d", 0); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, ".") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, "..") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, path) == 0); + assert(info.type == LFS_TYPE_DIR); + + lfs_dir_seek(&lfs, &dir, pos) => 0; + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_close(&lfs, &dir) => 0; + lfs_unmount(&lfs) => 0; ''' [[case]] # root seek @@ -787,7 +829,7 @@ code = ''' } lfs_unmount(&lfs) => 0; - for (int j = 2; j < COUNT + 2; j++) { + for (int j = 0; j < COUNT; j++) { lfs_mount(&lfs, &cfg) => 0; lfs_dir_open(&lfs, &dir, "/") => 0; lfs_dir_read(&lfs, &dir, &info) => 1; @@ -797,15 +839,14 @@ code = ''' assert(strcmp(info.name, "..") == 0); assert(info.type == LFS_TYPE_DIR); - lfs_soff_t pos; for (int i = 0; i < j; i++) { sprintf(path, "hi%03d", i); lfs_dir_read(&lfs, &dir, &info) => 1; assert(strcmp(info.name, path) == 0); assert(info.type == LFS_TYPE_DIR); - pos = lfs_dir_tell(&lfs, &dir); - assert(pos >= 0); } + lfs_soff_t pos = lfs_dir_tell(&lfs, &dir); + assert(pos >= 0); lfs_dir_seek(&lfs, &dir, pos) => 0; sprintf(path, "hi%03d", j); @@ -834,5 +875,47 @@ code = ''' lfs_dir_close(&lfs, &dir) => 0; lfs_unmount(&lfs) => 0; } + + // try seeking to end of dir + lfs_mount(&lfs, &cfg) => 0; + lfs_dir_open(&lfs, &dir, "/") => 0; + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, ".") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, "..") == 0); + assert(info.type == LFS_TYPE_DIR); + + for (int i = 0; i < COUNT; i++) { + sprintf(path, "hi%03d", i); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, path) == 0); + assert(info.type == LFS_TYPE_DIR); + } + lfs_soff_t pos = lfs_dir_tell(&lfs, &dir); + assert(pos >= 0); + + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_seek(&lfs, &dir, pos) => 0; + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_rewind(&lfs, &dir) => 0; + sprintf(path, "hi%03d", 0); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, ".") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, "..") == 0); + assert(info.type == LFS_TYPE_DIR); + lfs_dir_read(&lfs, &dir, &info) => 1; + assert(strcmp(info.name, path) == 0); + assert(info.type == LFS_TYPE_DIR); + + lfs_dir_seek(&lfs, &dir, pos) => 0; + lfs_dir_read(&lfs, &dir, &info) => 0; + + lfs_dir_close(&lfs, &dir) => 0; + lfs_unmount(&lfs) => 0; '''